Skip to content

Commit abd1303

Browse files
authored
Merge pull request #1994 from bcgov/hotfix/ALCS-2396
HOTFIX: allow all roles but commissioner to fetch tags
2 parents 8b799c9 + 7014e3e commit abd1303

File tree

3 files changed

+7
-12
lines changed

3 files changed

+7
-12
lines changed

services/apps/alcs/src/alcs/tag/tag-category/tag-category.controller.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ApiOAuth2 } from '@nestjs/swagger';
33
import * as config from 'config';
44
import { RolesGuard } from '../../../common/authorization/roles-guard.service';
55
import { UserRoles } from '../../../common/authorization/roles.decorator';
6-
import { AUTH_ROLE } from '../../../common/authorization/roles';
6+
import { ANY_ROLE_BUT_COMMISSIONER, AUTH_ROLE } from '../../../common/authorization/roles';
77
import { TagCategoryDto } from './tag-category.dto';
88
import { TagCategoryService } from './tag-category.service';
99

@@ -14,7 +14,7 @@ export class TagCategoryController {
1414
constructor(private service: TagCategoryService) {}
1515

1616
@Get('')
17-
@UserRoles(AUTH_ROLE.ADMIN)
17+
@UserRoles(...ANY_ROLE_BUT_COMMISSIONER)
1818
async fetch(
1919
@Query('pageIndex') pageIndex: number,
2020
@Query('itemsPerPage') itemsPerPage: number,

services/apps/alcs/src/alcs/tag/tag.controller.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as config from 'config';
44
import { RolesGuard } from '../../common/authorization/roles-guard.service';
55
import { UserRoles } from '../../common/authorization/roles.decorator';
66
import { TagService } from './tag.service';
7-
import { AUTH_ROLE } from '../../common/authorization/roles';
7+
import { ANY_ROLE_BUT_COMMISSIONER, AUTH_ROLE } from '../../common/authorization/roles';
88
import { TagDto } from './tag.dto';
99

1010
@Controller('tag')
@@ -14,7 +14,7 @@ export class TagController {
1414
constructor(private service: TagService) {}
1515

1616
@Get('')
17-
@UserRoles(AUTH_ROLE.ADMIN)
17+
@UserRoles(...ANY_ROLE_BUT_COMMISSIONER)
1818
async fetch(
1919
@Query('pageIndex') pageIndex: number,
2020
@Query('itemsPerPage') itemsPerPage: number,

services/apps/alcs/src/common/authorization/roles.ts

+3-8
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@ export const ROLES_ALLOWED_APPLICATIONS = [
1818
];
1919

2020
export const ROLES_ALLOWED_BOARDS = ROLES_ALLOWED_APPLICATIONS;
21-
export const ROLES_ALLOWED_ARCHIVE = [
22-
AUTH_ROLE.ADMIN,
23-
AUTH_ROLE.APP_SPECIALIST,
24-
];
21+
export const ROLES_ALLOWED_ARCHIVE = [AUTH_ROLE.ADMIN, AUTH_ROLE.APP_SPECIALIST];
2522
export const ANY_AUTH_ROLE = Object.values(AUTH_ROLE);
26-
export const ROLES_ALLOWED_SEARCH = [
27-
...ROLES_ALLOWED_APPLICATIONS,
28-
AUTH_ROLE.COMMISSIONER,
29-
];
23+
export const ROLES_ALLOWED_SEARCH = [...ROLES_ALLOWED_APPLICATIONS, AUTH_ROLE.COMMISSIONER];
24+
export const ANY_ROLE_BUT_COMMISSIONER = Object.values(AUTH_ROLE).filter((role) => role !== AUTH_ROLE.COMMISSIONER);

0 commit comments

Comments
 (0)