From 6705e8ad7268f5dde49766ee6ed81e5c0db94e05 Mon Sep 17 00:00:00 2001 From: birkirkristmunds <142495885+birkirkristmunds@users.noreply.github.com> Date: Thu, 24 Oct 2024 08:50:35 +0000 Subject: [PATCH] chore(skilavottord): Disable IdsUserGuard for all environments except prod - more logs (#16544) * TS-930 disable for all environments except PROD * TS-930 Add more functions to get the environment --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com> --- .../ws/src/app/modules/auth/auth.guard.ts | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/apps/skilavottord/ws/src/app/modules/auth/auth.guard.ts b/apps/skilavottord/ws/src/app/modules/auth/auth.guard.ts index e63b768a315b..1c667edf14e4 100644 --- a/apps/skilavottord/ws/src/app/modules/auth/auth.guard.ts +++ b/apps/skilavottord/ws/src/app/modules/auth/auth.guard.ts @@ -22,6 +22,8 @@ import { RolesGuard } from './roles.guard' import { Role } from './user.model' import { logger } from '@island.is/logging' +import { isRunningOnEnvironment } from '@island.is/shared/utils' + type AuthorizeOptions = { roles?: Role[] } @@ -73,12 +75,18 @@ export class AuthGuard implements CanActivate { export const Authorize = ( { roles = [] }: AuthorizeOptions = { roles: [] }, ): MethodDecorator & ClassDecorator => { + logger.info(`car-recycling: AuthGuard environment #1`, { + environment: process.env.NODE_ENV, + isProduction: isRunningOnEnvironment('production'), + }) + // IdsUserGuard is causing constant reload on local and DEV in the skilavottord-web // To 'fix' it for now we just skip using it for non production - if (process.env.NODE_ENV !== 'production') { - logger.info(`AuthGuard environment`, { - environment: process.env.NODE_ENV, - }) + if ( + process.env.NODE_ENV !== 'production' || + !isRunningOnEnvironment('production') + ) { + logger.info('`car-recycling: AuthGuard - skipping IdsUserGuard') return applyDecorators( SetMetadata('roles', roles), UseGuards(AuthGuard, RolesGuard),