Altitude/AltitudeWeb
5
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Altitude:a390ef98e6f922efd19e5294182c45aaea4f7a8d
Branches Tags
Altitude:master
Altitude:edit-punishments
Altitude:bans
Altitude:textures
Altitude:particles
..
compare: Altitude:9e5148fa8c9105fffeef2ecc88ae44e5fedaa83a
Branches Tags
Altitude:master
Altitude:edit-punishments
Altitude:bans
Altitude:textures
Altitude:particles

No commits in common. "a390ef98e6f922efd19e5294182c45aaea4f7a8d" and "9e5148fa8c9105fffeef2ecc88ae44e5fedaa83a" have entirely different histories.
a390ef98e6 ... 9e5148fa8c

3 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

6
backend/src/main/java/com/alttd/altitudeweb/controllers/event/EventController.java
View File

@ -42,7 +42,7 @@ public class EventController {
} }
List<String> authorities = jwt.getClaimAsStringList("authorities"); List<String> authorities = jwt.getClaimAsStringList("authorities");
if (authorities == null || doesNotHavePermission(authorities)) { if (authorities == null || !authorities.contains(PermissionClaimDto.HEAD_MOD.getValue())) {
throw new ResponseStatusException(HttpStatus.FORBIDDEN); throw new ResponseStatusException(HttpStatus.FORBIDDEN);
} }
@ -64,8 +64,4 @@ public class EventController {
return eventPublisher.subscribe(new EventUser(subject, authorities), json); return eventPublisher.subscribe(new EventUser(subject, authorities), json);
} }
private static boolean doesNotHavePermission(List<String> authorities) {
return !authorities.contains(PermissionClaimDto.HEAD_MOD.getValue()) && !authorities.contains(PermissionClaimDto.MOD.getValue());
}
} }

2
frontend/src/app/pages/header/header/header.component.html
View File

@ -131,7 +131,7 @@
<li class="nav_li"><a class="nav_link2" [routerLink]="['/birthdays']">Famous Birthdays</a></li> <li class="nav_li"><a class="nav_link2" [routerLink]="['/birthdays']">Famous Birthdays</a></li>
<li class="nav_li"><a class="nav_link2" [routerLink]="['/community']">Community</a></li> <li class="nav_li"><a class="nav_link2" [routerLink]="['/community']">Community</a></li>
@if (isAuthenticated()) { @if (isAuthenticated()) {
@if (hasAccess([PermissionClaim.HEAD_MOD, PermissionClaim.MOD])) { @if (hasAccess([PermissionClaim.HEAD_MOD])) {
<li class="nav_li"><a class="nav_link2" [routerLink]="['/chat']">Chat</a></li> <li class="nav_li"><a class="nav_link2" [routerLink]="['/chat']">Chat</a></li>
} }
} }

4
open_api/src/main/resources/schemas/permissions/permissions.yml
View File

@ -2,7 +2,7 @@ components:
schemas: schemas:
PermissionClaim: PermissionClaim:
type: string type: string
enum: [ SCOPE_user, SCOPE_head_mod, SCOPE_mod ] enum: [ SCOPE_user, SCOPE_head_mod ]
description: Permission claims used for authorization description: Permission claims used for authorization
x-enum-varnames: [ USER, HEAD_MOD, MOD ] x-enum-varnames: [ USER, HEAD_MOD ]
x-enum-descriptions: [ "User permission", "Head moderator permission" ] x-enum-descriptions: [ "User permission", "Head moderator permission" ]