Merge branch '16159-logout-request-with-token'

[arvados-workbench2.git] / src / services / auth-service / auth-service.ts

diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts
index 690420e78449ff35815cd63e0b1644a65012793a..bd4bc1969c5004d1506f39b3d5a233d748d2fa57 100644 (file)
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { getUserFullname, User, UserPrefs } from '~/models/user';
+import { User, UserPrefs, getUserDisplayName } from '~/models/user';
 import { AxiosInstance } from "axios";
 import { ApiActions } from "~/services/api/api-actions";
 import * as uuid from "uuid/v4";
@@ -10,6 +10,7 @@ import { Session, SessionStatus } from "~/models/session";
 import { Config } from "~/common/config";
 import { uniqBy } from "lodash";
 
+export const TARGET_URL = 'targetURL';
 export const API_TOKEN_KEY = 'apiToken';
 export const USER_EMAIL_KEY = 'userEmail';
 export const USER_FIRST_NAME_KEY = 'userFirstName';
@@ -39,52 +40,75 @@ export class AuthService {
     constructor(
         protected apiClient: AxiosInstance,
         protected baseUrl: string,
-        protected actions: ApiActions) { }
+        protected actions: ApiActions,
+        protected useSessionStorage: boolean = false) { }
+
+    private getStorage() {
+        if (this.useSessionStorage) {
+            return sessionStorage;
+        }
+        return localStorage;
+    }
 
     public saveApiToken(token: string) {
-        localStorage.setItem(API_TOKEN_KEY, token);
+        this.getStorage().setItem(API_TOKEN_KEY, token);
         const sp = token.split('/');
         if (sp.length === 3) {
-            localStorage.setItem(HOME_CLUSTER, sp[1].substr(0, 5));
+            this.getStorage().setItem(HOME_CLUSTER, sp[1].substr(0, 5));
         }
     }
 
+    public removeTargetURL() {
+        this.getStorage().removeItem(TARGET_URL);
+    }
+
+    public getTargetURL() {
+        return this.getStorage().getItem(TARGET_URL);
+    }
+
     public removeApiToken() {
-        localStorage.removeItem(API_TOKEN_KEY);
+        this.getStorage().removeItem(API_TOKEN_KEY);
     }
 
     public getApiToken() {
-        return localStorage.getItem(API_TOKEN_KEY) || undefined;
+        return this.getStorage().getItem(API_TOKEN_KEY) || undefined;
     }
 
     public getHomeCluster() {
-        return localStorage.getItem(HOME_CLUSTER) || undefined;
+        return this.getStorage().getItem(HOME_CLUSTER) || undefined;
+    }
+
+    public getApiClient() {
+        return this.apiClient;
     }
 
     public removeUser() {
-        localStorage.removeItem(USER_EMAIL_KEY);
-        localStorage.removeItem(USER_FIRST_NAME_KEY);
-        localStorage.removeItem(USER_LAST_NAME_KEY);
-        localStorage.removeItem(USER_UUID_KEY);
-        localStorage.removeItem(USER_OWNER_UUID_KEY);
-        localStorage.removeItem(USER_IS_ADMIN);
-        localStorage.removeItem(USER_IS_ACTIVE);
-        localStorage.removeItem(USER_USERNAME);
-        localStorage.removeItem(USER_PREFS);
+        this.getStorage().removeItem(USER_EMAIL_KEY);
+        this.getStorage().removeItem(USER_FIRST_NAME_KEY);
+        this.getStorage().removeItem(USER_LAST_NAME_KEY);
+        this.getStorage().removeItem(USER_UUID_KEY);
+        this.getStorage().removeItem(USER_OWNER_UUID_KEY);
+        this.getStorage().removeItem(USER_IS_ADMIN);
+        this.getStorage().removeItem(USER_IS_ACTIVE);
+        this.getStorage().removeItem(USER_USERNAME);
+        this.getStorage().removeItem(USER_PREFS);
+        this.getStorage().removeItem(TARGET_URL);
     }
 
     public login(uuidPrefix: string, homeCluster: string, loginCluster: string, remoteHosts: { [key: string]: string }) {
         const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
         const homeClusterHost = remoteHosts[homeCluster];
+        const rd = new URL(window.location.href);
+        this.getStorage().setItem(TARGET_URL, rd.pathname + rd.search);
         window.location.assign(`https://${homeClusterHost}/login?${(uuidPrefix !== homeCluster && homeCluster !== loginCluster) ? "remote=" + uuidPrefix + "&" : ""}return_to=${currentUrl}`);
     }
 
-    public logout() {
+    public logout(expireToken: string) {
         const currentUrl = `${window.location.protocol}//${window.location.host}`;
-        window.location.assign(`${this.baseUrl || ""}/logout?return_to=${currentUrl}`);
+        window.location.assign(`${this.baseUrl || ""}/logout?api_token=${expireToken}&return_to=${currentUrl}`);
     }
 
-    public getUserDetails = (): Promise<User> => {
+    public getUserDetails = (showErrors?: boolean): Promise<User> => {
         const reqId = uuid();
         this.actions.progressFn(reqId, true);
         return this.apiClient
@@ -106,14 +130,14 @@ export class AuthService {
             })
             .catch(e => {
                 this.actions.progressFn(reqId, false);
-                this.actions.errorFn(reqId, e);
+                this.actions.errorFn(reqId, e, showErrors);
                 throw e;
             });
     }
 
     public getSessions(): Session[] {
         try {
-            const sessions = JSON.parse(localStorage.getItem("sessions") || '');
+            const sessions = JSON.parse(this.getStorage().getItem("sessions") || '');
             return sessions;
         } catch {
             return [];
@@ -121,7 +145,11 @@ export class AuthService {
     }
 
     public saveSessions(sessions: Session[]) {
-        localStorage.setItem("sessions", JSON.stringify(sessions));
+        this.getStorage().setItem("sessions", JSON.stringify(sessions));
+    }
+
+    public removeSessions() {
+        this.getStorage().removeItem("sessions");
     }
 
     public buildSessions(cfg: Config, user?: User) {
@@ -129,8 +157,9 @@ export class AuthService {
             clusterId: cfg.uuidPrefix,
             remoteHost: cfg.rootUrl,
             baseUrl: cfg.baseUrl,
-            name: getUserFullname(user),
+            name: user ? getUserDisplayName(user) : '',
             email: user ? user.email : '',
+            userIsActive: user ? user.isActive : false,
             token: this.getApiToken(),
             loggedIn: true,
             active: true,