X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/29c0944feb7932889a5b6fcaf208eef9f5864a29..547664ecb6ac881103fb9e94a51b2a2746b2c6ae:/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 359a78ec..bd4bc196 100644 --- 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"; @@ -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,93 +40,75 @@ export class AuthService { constructor( protected apiClient: AxiosInstance, protected baseUrl: string, - protected actions: ApiActions) { } + protected actions: ApiActions, + protected useSessionStorage: boolean = false) { } - public saveApiToken(token: string) { - localStorage.setItem(API_TOKEN_KEY, token); - localStorage.setItem(HOME_CLUSTER, token.split('/')[1].substr(0, 5)); - } - - public removeApiToken() { - localStorage.removeItem(API_TOKEN_KEY); - } - - public getApiToken() { - return localStorage.getItem(API_TOKEN_KEY) || undefined; + private getStorage() { + if (this.useSessionStorage) { + return sessionStorage; + } + return localStorage; } - public getHomeCluster() { - return localStorage.getItem(HOME_CLUSTER) || undefined; + public saveApiToken(token: string) { + 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 getUuid() { - return localStorage.getItem(USER_UUID_KEY) || undefined; + public removeTargetURL() { + this.getStorage().removeItem(TARGET_URL); } - public getOwnerUuid() { - return localStorage.getItem(USER_OWNER_UUID_KEY) || undefined; + public getTargetURL() { + return this.getStorage().getItem(TARGET_URL); } - public getIsAdmin(): boolean { - return localStorage.getItem(USER_IS_ADMIN) === 'true'; + public removeApiToken() { + this.getStorage().removeItem(API_TOKEN_KEY); } - public getIsActive(): boolean { - return localStorage.getItem(USER_IS_ACTIVE) === 'true'; + public getApiToken() { + return this.getStorage().getItem(API_TOKEN_KEY) || undefined; } - 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; + public getHomeCluster() { + 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); + 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 => { + public getUserDetails = (showErrors?: boolean): Promise => { const reqId = uuid(); this.actions.progressFn(reqId, true); return this.apiClient @@ -147,20 +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 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 +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) { @@ -176,12 +157,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,17 +179,19 @@ 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] - .concat(localSessions) .concat(cfgSessions) + .concat(localSessions) .filter((r: Session) => r.clusterId !== "*"); const uniqSessions = uniqBy(sessions, 'clusterId');