Merge pull request #392 from hsdhott/feature/set_ag_as_default_bugfix

Feature/set ag as default bugfix

Author: hsdhott

webapp/src/app/core/services/auth.service.ts

@@ -66,17 +66,21 @@ export class AuthService {
     }
 
     doLogout() {
-        this.dataStore.clearAll(); // Calling clear session from data store
-        localStorage.setItem('logout', 'true');
-        localStorage.removeItem('logout');
-
         if (this.adAuthentication) {
+            this.clearSessionStorage();
            this.adalService.logout();
         } else {
             this.onPremAuthentication.logout();
+            this.clearSessionStorage();
         }
     }
 
+    clearSessionStorage() {
+        this.dataStore.clearAll(); // Calling clear session from data store
+        localStorage.setItem('logout', 'true');
+        localStorage.removeItem('logout');
+    }
+
     authenticateUserOnPrem(url, method, payload, headers) {
 
         return this.httpService.getHttpResponse(url, method, payload, {}, headers)

webapp/src/app/core/services/request-interceptor.service.ts

@@ -28,6 +28,9 @@ export class RequestInterceptorService implements HttpInterceptor {
         if (req.url.includes('user/authorize') || req.url.includes('user/login') || req.url.includes('refreshtoken')) {
             this.loggerService.log('info', 'Not adding the access token for this api - ' + req.url);
             return next.handle(req);
+        } else if (req.url.includes('user/logout-session')) {
+            this.loggerService.log('info', 'Do not retry when logging user out - ' + req.url);
+            return next.handle(this.addToken(req, authService.getAuthToken()));
         }
         return next.handle(this.addToken(req, authService.getAuthToken())).pipe(
             catchError(error => {

webapp/src/environments/environment.prod.ts

@@ -426,7 +426,7 @@ export const environment = {
         method: 'GET'
     },
     logout: {
-        url: '{{baseUrl}}/user/logout-session',
+        url: '{{baseUrl}}/auth/user/logout-session',
         method: 'GET'
     },
     refresh: {

webapp/src/environments/environment.stg.ts

@@ -426,7 +426,7 @@ export const environment = {
         method: 'GET'
     },
     logout: {
-        url: '{{baseUrl}}/user/logout-session',
+        url: '{{baseUrl}}/auth/user/logout-session',
         method: 'GET'
     },
     refresh: {

webapp/src/environments/environment.ts

@@ -426,7 +426,7 @@ export const environment = {
         method: 'GET'
     },
     logout: {
-        url: '{{baseUrl}}/user/logout-session',
+        url: '{{baseUrl}}/auth/user/logout-session',
         method: 'GET'
     },
     refresh: {