Merge pull request #114 from GSA/bugfix/admin_guard

Bugfix/admin guard for analytics to be visible to only admin users
GSA · May 9, 2024 · c9d2986 · c9d2986
2 parents 90593a4 + 96f640b
commit c9d2986
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/src/app/admin-guard.service.ts b/src/app/admin-guard.service.ts
@@ -31,6 +31,10 @@ export class AdminGuard implements CanActivate {
    * @param state
    */
   canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot) {
+    if (!(this.authGuard.canActivate(route, state) && this.authGuard.isGSAAdmin)) {
+      this.router.navigate(['/auth']).catch(r => console.log(r));
+    }
+
     return this.authGuard.canActivate(route, state) && this.authGuard.isGSAAdmin;
   }
 }

diff --git a/src/app/auth-guard.service.ts b/src/app/auth-guard.service.ts
@@ -57,6 +57,7 @@ export class AuthGuard implements CanActivate {
           }
         });
     }
+    return false
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -57,6 +57,7 @@ export class AuthGuard implements CanActivate { @@
               }
             });
         }
+        return false
       }
       /**
@@ Expand Down @@