Merge pull request #180 from bcgov/re-enable-role-guards

reenable role guards
bcgov · Apr 30, 2024 · 0a1e9da · 0a1e9da
2 parents 201defc + d15227d
commit 0a1e9da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/backend/src/admin/admin.controller.ts b/backend/src/admin/admin.controller.ts
@@ -35,8 +35,8 @@ let requestConfig: AxiosRequestConfig;
 
 @Controller('admin')
 @UseGuards(JwtAuthGuard)
-// @UseGuards(JwtRoleGuard)
-// @Roles(Role.TICDI_ADMIN)
+@UseGuards(JwtRoleGuard)
+@Roles(Role.TICDI_ADMIN)
 export class AdminController {
   constructor(private readonly adminService: AdminService) {
     const hostname = process.env.backend_url ? process.env.backend_url : `http://localhost`;

diff --git a/backend/src/report/report.controller.ts b/backend/src/report/report.controller.ts
@@ -80,8 +80,8 @@ export class ReportController {
 
   // remember to update
   @Post('generate-report')
-  // @UseGuards(JwtRoleGuard)
-  // @Roles(Role.GENERATE_DOCUMENTS)
+  @UseGuards(JwtRoleGuard)
+  @Roles(Role.GENERATE_DOCUMENTS)
   @Header('Content-Type', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')
   @Header('Content-Disposition', 'attachment; filename=report.docx')
   async generateReport(

diff --git a/frontend/src/app/content/display/Header.tsx b/frontend/src/app/content/display/Header.tsx
@@ -4,8 +4,7 @@ import UserService from '../../service/user-service';
 
 const Header: FC = () => {
   const username = UserService.getUsername();
-  // const isAdmin = UserService.hasRole([Roles.TICDI_ADMIN]);
-  const isAdmin = true;
+  const isAdmin = UserService.hasRole([Roles.TICDI_ADMIN]);
 
   return (
     <header className="header">