X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/646db814fcdff5e2267df848cee94f1128c760e7..refs/heads/18975-log-improvements:/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 355cef42..548dbcaa 100644 --- a/src/services/auth-service/auth-service.ts +++ b/src/services/auth-service/auth-service.ts @@ -2,12 +2,12 @@ // // 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'; @@ -22,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; @@ -50,12 +52,19 @@ 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)); } }