X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/0ca7039728489e25ae1e196278454e7bafbca948..761e9780888a343e0655563acea23577eeb5d29a:/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 29442401..52bfa29e 100644
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -2,14 +2,15 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { User, UserPrefs, getUserDisplayName } 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";
-import { Session, SessionStatus } from "~/models/session";
-import { Config } from "~/common/config";
+import { ApiActions } from "services/api/api-actions";
+import uuid from "uuid/v4";
+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';
@@ -21,6 +22,8 @@ export const USER_IS_ACTIVE = 'isActive';
 export const USER_USERNAME = 'username';
 export const USER_PREFS = 'prefs';
 export const HOME_CLUSTER = 'homeCluster';
+export const LOCAL_STORAGE = 'localStorage';
+export const SESSION_STORAGE = 'sessionStorage';
 
 export interface UserDetailsResponse {
     email: string;
@@ -49,16 +52,37 @@ export class AuthService {
         return localStorage;
     }
 
+    public getStorageType() {
+        if (this.useSessionStorage) {
+            return SESSION_STORAGE;
+        }
+        return LOCAL_STORAGE;
+    }
+
     public saveApiToken(token: string) {
+        this.removeApiToken();
         this.getStorage().setItem(API_TOKEN_KEY, token);
         const sp = token.split('/');
         if (sp.length === 3) {
-            this.getStorage().setItem(HOME_CLUSTER, sp[1].substr(0, 5));
+            this.getStorage().setItem(HOME_CLUSTER, sp[1].substring(0, 5));
         }
     }
 
+    public setTargetUrl(url: string) {
+        localStorage.setItem(TARGET_URL, url);
+    }
+
+    public removeTargetURL() {
+        localStorage.removeItem(TARGET_URL);
+    }
+
+    public getTargetURL() {
+        return localStorage.getItem(TARGET_URL);
+    }
+
     public removeApiToken() {
-        this.getStorage().removeItem(API_TOKEN_KEY);
+        localStorage.removeItem(API_TOKEN_KEY);
+        sessionStorage.removeItem(API_TOKEN_KEY);
     }
 
     public getApiToken() {
@@ -69,30 +93,39 @@ export class AuthService {
         return this.getStorage().getItem(HOME_CLUSTER) || undefined;
     }
 
+    public getApiClient() {
+        return this.apiClient;
+    }
+
     public removeUser() {
-        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);
+        [localStorage, sessionStorage].forEach((storage) => {
+            storage.removeItem(USER_EMAIL_KEY);
+            storage.removeItem(USER_FIRST_NAME_KEY);
+            storage.removeItem(USER_LAST_NAME_KEY);
+            storage.removeItem(USER_UUID_KEY);
+            storage.removeItem(USER_OWNER_UUID_KEY);
+            storage.removeItem(USER_IS_ADMIN);
+            storage.removeItem(USER_IS_ACTIVE);
+            storage.removeItem(USER_USERNAME);
+            storage.removeItem(USER_PREFS);
+            storage.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.setTargetUrl(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
@@ -114,7 +147,7 @@ export class AuthService {
             })
             .catch(e => {
                 this.actions.progressFn(reqId, false);
-                this.actions.errorFn(reqId, e);
+                this.actions.errorFn(reqId, e, showErrors);
                 throw e;
             });
     }
@@ -129,11 +162,13 @@ export class AuthService {
     }
 
     public saveSessions(sessions: Session[]) {
+        this.removeSessions();
         this.getStorage().setItem("sessions", JSON.stringify(sessions));
     }
 
     public removeSessions() {
-        this.getStorage().removeItem("sessions");
+        localStorage.removeItem("sessions");
+        sessionStorage.removeItem("sessions");
     }
 
     public buildSessions(cfg: Config, user?: User) {