Added security flag in order to use different security systems

devonfw · May 17, 2018 · 09bc1b0 · 09bc1b0
1 parent a52b70f
commit 09bc1b0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 5 deletions.
diff --git a/src/app/core/security/httpRequestInterceptor.service.ts b/src/app/core/security/httpRequestInterceptor.service.ts
@@ -1,3 +1,4 @@
+import { environment } from '../../../environments/environment';
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import {
@@ -20,10 +21,22 @@ export class HttpRequestInterceptorService implements HttpInterceptor {
     // Get the auth header from the service.
     const authHeader: string = this.auth.getToken();
     if (authHeader) {
-      const authReq: HttpRequest<any> = req.clone({
-        withCredentials: true,
-        setHeaders: { 'x-csrf-token': authHeader },
-      });
+      let authReq: HttpRequest<any>;
+
+      // CSRF
+      if (environment.security === 'csrf') {
+        authReq = req.clone({
+          withCredentials: true,
+          setHeaders: { 'x-csrf-token': authHeader },
+        });
+      }
+
+      // JWT
+      if (environment.security === 'jwt') {
+        authReq = req.clone({
+          setHeaders: { Authorization: authHeader },
+        });
+      }
 
       return next.handle(authReq);
     } else {

diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts
@@ -2,8 +2,10 @@ export const environment: {
   production: boolean;
   restPathRoot: string;
   restServiceRoot: string;
+  security: 'csrf' | 'jwt';
 } = {
   production: true,
   restPathRoot: 'http://localhost:8081/demo-server/',
   restServiceRoot: 'http://localhost:8081/demo-server/services/rest/',
+  security: 'csrf',
 };
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
@@ -2,8 +2,10 @@ export const environment: {
   production: boolean;
   restPathRoot: string;
   restServiceRoot: string;
+  security: 'csrf' | 'jwt';
 } = {
-  production: false,
+  production: true,
   restPathRoot: 'http://localhost:8081/demo-server/',
   restServiceRoot: 'http://localhost:8081/demo-server/services/rest/',
+  security: 'csrf',
 };