X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/d6c7e8411ec818d537453c5564c7fa15834cb0be..0ca7039728489e25ae1e196278454e7bafbca948:/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 3fd67fc0..29442401 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"; @@ -17,8 +17,10 @@ export const USER_LAST_NAME_KEY = 'userLastName'; export const USER_UUID_KEY = 'userUuid'; export const USER_OWNER_UUID_KEY = 'userOwnerUuid'; export const USER_IS_ADMIN = 'isAdmin'; +export const USER_IS_ACTIVE = 'isActive'; export const USER_USERNAME = 'username'; export const USER_PREFS = 'prefs'; +export const HOME_CLUSTER = 'homeCluster'; export interface UserDetailsResponse { email: string; @@ -27,6 +29,7 @@ export interface UserDetailsResponse { uuid: string; owner_uuid: string; is_admin: boolean; + is_active: boolean; username: string; prefs: UserPrefs; } @@ -36,72 +39,52 @@ 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) { + 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; - } - - 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'; + 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 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, username, prefs } - : 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_USERNAME, user.username); - localStorage.setItem(USER_PREFS, JSON.stringify(user.prefs)); + public getHomeCluster() { + return this.getStorage().getItem(HOME_CLUSTER) || undefined; } 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_USERNAME); - localStorage.removeItem(USER_PREFS); - } - - public login(uuidPrefix: string, homeCluster: string) { + 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 }) { const currentUrl = `${window.location.protocol}//${window.location.host}/token`; - window.location.assign(`https://${homeCluster}/login?remote=${uuidPrefix}&return_to=${currentUrl}`); + const homeClusterHost = remoteHosts[homeCluster]; + window.location.assign(`https://${homeClusterHost}/login?${(uuidPrefix !== homeCluster && homeCluster !== loginCluster) ? "remote=" + uuidPrefix + "&" : ""}return_to=${currentUrl}`); } public logout() { @@ -124,6 +107,7 @@ export class AuthService { uuid: resp.data.uuid, ownerUuid: resp.data.owner_uuid, isAdmin: resp.data.is_admin, + isActive: resp.data.is_active, username: resp.data.username, prefs }; @@ -135,15 +119,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 []; @@ -151,7 +129,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) { @@ -159,31 +141,42 @@ 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(); + const localSessions = this.getSessions().map(s => ({ + ...s, + active: false, + status: SessionStatus.INVALIDATED + })); + const cfgSessions = Object.keys(cfg.remoteHosts).map(clusterId => { const remoteHost = cfg.remoteHosts[clusterId]; return { 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(cfgSessions) .concat(localSessions) - .concat(cfgSessions); + .filter((r: Session) => r.clusterId !== "*"); const uniqSessions = uniqBy(sessions, 'clusterId');