16941: Fix AxiosInstance import. Add apiClient accessor

[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 da96f1629b2fc9e3cf76ba91c3215df43bd17666..ce3564e001614b664998a9db73a57c79eabc79af 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, UserResource } 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";
@@ -39,79 +39,50 @@ 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);
-        localStorage.setItem(HOME_CLUSTER, token.split('/')[1].substr(0, 5));
+        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));
+        }
     }
 
     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;
-    }
-
-    public getUuid() {
-        return localStorage.getItem(USER_UUID_KEY) || undefined;
-    }
-
-    public getOwnerUuid() {
-        return localStorage.getItem(USER_OWNER_UUID_KEY) || undefined;
-    }
-
-    public getIsAdmin(): boolean {
-        return localStorage.getItem(USER_IS_ADMIN) === 'true';
-    }
-
-    public getIsActive(): boolean {
-        return localStorage.getItem(USER_IS_ACTIVE) === 'true';
-    }
-
-    public getUser(): User | undefined {
-        const email = localStorage.getItem(USER_EMAIL_KEY);
-        const firstName = localStorage.getItem(USER_FIRST_NAME_KEY);
-        const lastName = localStorage.getItem(USER_LAST_NAME_KEY);
-        const uuid = this.getUuid();
-        const ownerUuid = this.getOwnerUuid();
-        const isAdmin = this.getIsAdmin();
-        const isActive = this.getIsActive();
-        const username = localStorage.getItem(USER_USERNAME);
-        const prefs = JSON.parse(localStorage.getItem(USER_PREFS) || '{"profile": {}}');
-
-        return email && firstName && lastName && uuid && ownerUuid && username && prefs
-            ? { email, firstName, lastName, uuid, ownerUuid, isAdmin, isActive, username, prefs }
-            : undefined;
+        return this.getStorage().getItem(HOME_CLUSTER) || undefined;
     }
 
-    public saveUser(user: User | UserResource) {
-        localStorage.setItem(USER_EMAIL_KEY, user.email);
-        localStorage.setItem(USER_FIRST_NAME_KEY, user.firstName);
-        localStorage.setItem(USER_LAST_NAME_KEY, user.lastName);
-        localStorage.setItem(USER_UUID_KEY, user.uuid);
-        localStorage.setItem(USER_OWNER_UUID_KEY, user.ownerUuid);
-        localStorage.setItem(USER_IS_ADMIN, JSON.stringify(user.isAdmin));
-        localStorage.setItem(USER_IS_ACTIVE, JSON.stringify(user.isActive));
-        localStorage.setItem(USER_USERNAME, user.username);
-        localStorage.setItem(USER_PREFS, JSON.stringify(user.prefs));
+    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);
     }
 
     public login(uuidPrefix: string, homeCluster: string, loginCluster: string, remoteHosts: { [key: string]: string }) {
@@ -152,15 +123,9 @@ export class AuthService {
             });
     }
 
-    public getRootUuid() {
-        const uuid = this.getOwnerUuid();
-        const uuidParts = uuid ? uuid.split('-') : [];
-        return uuidParts.length > 1 ? `${uuidParts[0]}-${uuidParts[1]}` : undefined;
-    }
-
     public getSessions(): Session[] {
         try {
-            const sessions = JSON.parse(localStorage.getItem("sessions") || '');
+            const sessions = JSON.parse(this.getStorage().getItem("sessions") || '');
             return sessions;
         } catch {
             return [];
@@ -168,7 +133,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) {
@@ -176,12 +145,15 @@ export class AuthService {
             clusterId: cfg.uuidPrefix,
             remoteHost: cfg.rootUrl,
             baseUrl: cfg.baseUrl,
-            username: getUserFullname(user),
+            name: user ? getUserDisplayName(user) : '',
             email: user ? user.email : '',
+            userIsActive: user ? user.isActive : false,
             token: this.getApiToken(),
             loggedIn: true,
             active: true,
-            status: SessionStatus.VALIDATED
+            uuid: user ? user.uuid : '',
+            status: SessionStatus.VALIDATED,
+            apiRevision: cfg.apiRevision,
         } as Session;
         const localSessions = this.getSessions().map(s => ({
             ...s,
@@ -195,12 +167,14 @@ export class AuthService {
                 clusterId,
                 remoteHost,
                 baseUrl: '',
-                username: '',
+                name: '',
                 email: '',
                 token: '',
                 loggedIn: false,
                 active: false,
-                status: SessionStatus.INVALIDATED
+                uuid: '',
+                status: SessionStatus.INVALIDATED,
+                apiRevision: 0,
             } as Session;
         });
         const sessions = [currentSession]