From 219a21eb76d13a5d334ce8da160ff8e4341665bb Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Fri, 2 Jul 2021 15:17:26 +0200 Subject: [PATCH] Using window.location.origin to get redirect-uri for ciam --- apps/dafa-web/src/app/shared/guards/auth.guard.ts | 2 +- apps/dafa-web/src/environments/environment.api.ts | 1 - apps/dafa-web/src/environments/environment.ts | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/dafa-web/src/app/shared/guards/auth.guard.ts b/apps/dafa-web/src/app/shared/guards/auth.guard.ts index 1a6ebd0..a3101e2 100644 --- a/apps/dafa-web/src/app/shared/guards/auth.guard.ts +++ b/apps/dafa-web/src/app/shared/guards/auth.guard.ts @@ -21,7 +21,7 @@ export class AuthGuard implements CanActivate { if (environment.environment === 'local') { void this.router.navigateByUrl(environment.loginUrl); } else { - document.location.href = `${environment.loginUrl}&client_id=${environment.clientId}&redirect_uri=${environment.redirectUri}`; + document.location.href = `${environment.loginUrl}&client_id=${environment.clientId}&redirect_uri=${window.location.origin}`; } return of(false); }) diff --git a/apps/dafa-web/src/environments/environment.api.ts b/apps/dafa-web/src/environments/environment.api.ts index 6528973..84b9697 100644 --- a/apps/dafa-web/src/environments/environment.api.ts +++ b/apps/dafa-web/src/environments/environment.api.ts @@ -1,7 +1,6 @@ export const environment = { environment: 'api', clientId: '5d08c2e4-763e-42f6-b858-24e4773bb83d', - redirectUri: 'http://localhost:4200', loginUrl: 'https://ciam-test.arbetsformedlingen.se:8443/uas/oauth2/authorization?response_type=code&scope=openid', production: false, api: { diff --git a/apps/dafa-web/src/environments/environment.ts b/apps/dafa-web/src/environments/environment.ts index b77387e..e4d7a48 100644 --- a/apps/dafa-web/src/environments/environment.ts +++ b/apps/dafa-web/src/environments/environment.ts @@ -1,7 +1,6 @@ export const environment = { environment: 'local', clientId: '', - redirectUri: '', loginUrl: '/mock-login', production: false, api: {