From dc8d4a609d52a60b67d8a9344dd4cfab8469445c Mon Sep 17 00:00:00 2001 From: Erik Tiekstra Date: Thu, 30 Sep 2021 15:18:49 +0200 Subject: [PATCH] Merge pull request #152 in TEA/mina-sidor-fa-web from feature/interceptor-ignores to develop Squashed commit of the following: commit 071f0cf45e90302b32544bfdd0764766f5a324bd Author: Erik Tiekstra Date: Tue Sep 28 20:08:22 2021 +0200 Now possible to ignore certain request url inside interceptor commit f909f601e7db0b40c492d6362dccc24c67ccc1ed Author: Erik Tiekstra Date: Tue Sep 28 19:51:10 2021 +0200 WIP --- .../src/app/shared/interceptors/auth.interceptor.ts | 5 +++++ .../mina-sidor-fa/src/app/shared/models/environment.model.ts | 1 + apps/mina-sidor-fa/src/environments/environment.acc.ts | 1 + apps/mina-sidor-fa/src/environments/environment.api.ts | 1 + apps/mina-sidor-fa/src/environments/environment.prod.ts | 1 + apps/mina-sidor-fa/src/environments/environment.ts | 1 + 6 files changed, 10 insertions(+) diff --git a/apps/mina-sidor-fa/src/app/shared/interceptors/auth.interceptor.ts b/apps/mina-sidor-fa/src/app/shared/interceptors/auth.interceptor.ts index bf172f5..53ccd8e 100644 --- a/apps/mina-sidor-fa/src/app/shared/interceptors/auth.interceptor.ts +++ b/apps/mina-sidor-fa/src/app/shared/interceptors/auth.interceptor.ts @@ -22,6 +22,11 @@ export class AuthInterceptor implements HttpInterceptor { } intercept(req: HttpRequest, next: HttpHandler): Observable> { + const shouldSkipHeaders = environment.api.skipHeadersOn.some(pattern => req.url.indexOf(pattern) > -1); + if (shouldSkipHeaders) { + return next.handle(req); + } + const clonedRequest: HttpRequest = req.clone({ setHeaders: { ...environment.api.headers, ...this.authorizationToken, ...this.selectedOrganizationNumber }, }); diff --git a/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts b/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts index 5f33498..65512e7 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/environment.model.ts @@ -10,6 +10,7 @@ export interface Environment { api: { url: string; headers: { [key: string]: string }; + skipHeadersOn: string[]; }; activeFeatures: Feature[]; } diff --git a/apps/mina-sidor-fa/src/environments/environment.acc.ts b/apps/mina-sidor-fa/src/environments/environment.acc.ts index 806fdad..44ac6a9 100644 --- a/apps/mina-sidor-fa/src/environments/environment.acc.ts +++ b/apps/mina-sidor-fa/src/environments/environment.acc.ts @@ -9,6 +9,7 @@ export const environment: Environment = { api: { url: '/api', headers: {}, + skipHeadersOn: ['assets/'], }, activeFeatures: [...ACTIVE_FEATURES_PROD], ...CIAM_TEST, diff --git a/apps/mina-sidor-fa/src/environments/environment.api.ts b/apps/mina-sidor-fa/src/environments/environment.api.ts index 4ead057..bde409d 100644 --- a/apps/mina-sidor-fa/src/environments/environment.api.ts +++ b/apps/mina-sidor-fa/src/environments/environment.api.ts @@ -9,6 +9,7 @@ export const environment: Environment = { api: { url: '/api', headers: {}, + skipHeadersOn: ['assets/'], }, activeFeatures: [...ACTIVE_FEATURES_TEST], ...CIAM_TEST, diff --git a/apps/mina-sidor-fa/src/environments/environment.prod.ts b/apps/mina-sidor-fa/src/environments/environment.prod.ts index 9f4fae2..ab88446 100644 --- a/apps/mina-sidor-fa/src/environments/environment.prod.ts +++ b/apps/mina-sidor-fa/src/environments/environment.prod.ts @@ -9,6 +9,7 @@ export const environment: Environment = { api: { url: '/api', headers: {}, + skipHeadersOn: ['assets/'], }, activeFeatures: [...ACTIVE_FEATURES_PROD], ...CIAM_PROD, diff --git a/apps/mina-sidor-fa/src/environments/environment.ts b/apps/mina-sidor-fa/src/environments/environment.ts index 44055eb..847e507 100644 --- a/apps/mina-sidor-fa/src/environments/environment.ts +++ b/apps/mina-sidor-fa/src/environments/environment.ts @@ -10,6 +10,7 @@ export const environment: Environment = { api: { url: '/api', headers: {}, + skipHeadersOn: [], }, activeFeatures: [...ACTIVE_FEATURES_TEST, Feature.MOCK_LOGIN], ...CIAM_MOCK,