arbetsformedlingen/mina-sidor-fa-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #152 in TEA/mina-sidor-fa-web from feature/interceptor-ignores to develop

Browse Source 
Squashed commit of the following:

commit 071f0cf45e90302b32544bfdd0764766f5a324bd
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 20:08:22 2021 +0200

    Now possible to ignore certain request url inside interceptor

commit f909f601e7db0b40c492d6362dccc24c67ccc1ed
Author: Erik Tiekstra <erik.tiekstra@arbetsformedlingen.se>
Date:   Tue Sep 28 19:51:10 2021 +0200

    WIP
This commit is contained in:
Erik Tiekstra
2021-09-30 15:18:49 +02:00
parent 44f8197cfe
commit dc8d4a609d
6 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
apps/mina-sidor-fa/src/app/shared/interceptors/auth.interceptor.ts
View File

@@ -22,6 +22,11 @@ export class AuthInterceptor implements HttpInterceptor {
} }
intercept(req: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> { intercept(req: HttpRequest<unknown>, next: HttpHandler): Observable<HttpEvent<unknown>> {
const shouldSkipHeaders = environment.api.skipHeadersOn.some(pattern => req.url.indexOf(pattern) > -1);
if (shouldSkipHeaders) {
return next.handle(req);
}
const clonedRequest: HttpRequest<unknown> = req.clone({ const clonedRequest: HttpRequest<unknown> = req.clone({
setHeaders: { ...environment.api.headers, ...this.authorizationToken, ...this.selectedOrganizationNumber }, setHeaders: { ...environment.api.headers, ...this.authorizationToken, ...this.selectedOrganizationNumber },
}); });

1
apps/mina-sidor-fa/src/app/shared/models/environment.model.ts
View File

@@ -10,6 +10,7 @@ export interface Environment {
api: { api: {
url: string; url: string;
headers: { [key: string]: string }; headers: { [key: string]: string };
skipHeadersOn: string[];
}; };
activeFeatures: Feature[]; activeFeatures: Feature[];
} }

1
apps/mina-sidor-fa/src/environments/environment.acc.ts
View File

@@ -9,6 +9,7 @@ export const environment: Environment = {
api: { api: {
url: '/api', url: '/api',
headers: {}, headers: {},
skipHeadersOn: ['assets/'],
}, },
activeFeatures: [...ACTIVE_FEATURES_PROD], activeFeatures: [...ACTIVE_FEATURES_PROD],
...CIAM_TEST, ...CIAM_TEST,

1
apps/mina-sidor-fa/src/environments/environment.api.ts
View File

@@ -9,6 +9,7 @@ export const environment: Environment = {
api: { api: {
url: '/api', url: '/api',
headers: {}, headers: {},
skipHeadersOn: ['assets/'],
}, },
activeFeatures: [...ACTIVE_FEATURES_TEST], activeFeatures: [...ACTIVE_FEATURES_TEST],
...CIAM_TEST, ...CIAM_TEST,

1
apps/mina-sidor-fa/src/environments/environment.prod.ts
View File

@@ -9,6 +9,7 @@ export const environment: Environment = {
api: { api: {
url: '/api', url: '/api',
headers: {}, headers: {},
skipHeadersOn: ['assets/'],
}, },
activeFeatures: [...ACTIVE_FEATURES_PROD], activeFeatures: [...ACTIVE_FEATURES_PROD],
...CIAM_PROD, ...CIAM_PROD,

1
apps/mina-sidor-fa/src/environments/environment.ts
View File

@@ -10,6 +10,7 @@ export const environment: Environment = {
api: { api: {
url: '/api', url: '/api',
headers: {}, headers: {},
skipHeadersOn: [],
}, },
activeFeatures: [...ACTIVE_FEATURES_TEST, Feature.MOCK_LOGIN], activeFeatures: [...ACTIVE_FEATURES_TEST, Feature.MOCK_LOGIN],
...CIAM_MOCK, ...CIAM_MOCK,