//
// 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";
-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';
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 const LOCAL_STORAGE = 'localStorage';
+export const SESSION_STORAGE = 'sessionStorage';
export interface UserDetailsResponse {
email: string;
uuid: string;
owner_uuid: string;
is_admin: boolean;
+ is_active: boolean;
username: string;
prefs: UserPrefs;
}
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);
+ private getStorage() {
+ if (this.useSessionStorage) {
+ return sessionStorage;
+ }
+ return localStorage;
}
- public removeApiToken() {
- localStorage.removeItem(API_TOKEN_KEY);
+ public getStorageType() {
+ if (this.useSessionStorage) {
+ return SESSION_STORAGE;
+ }
+ return LOCAL_STORAGE;
}
- public getApiToken() {
- return localStorage.getItem(API_TOKEN_KEY) || undefined;
+ 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].substring(0, 5));
+ }
+ }
+
+ public setTargetUrl(url: string) {
+ localStorage.setItem(TARGET_URL, url);
}
- public getUuid() {
- return localStorage.getItem(USER_UUID_KEY) || undefined;
+ public removeTargetURL() {
+ localStorage.removeItem(TARGET_URL);
}
- public getOwnerUuid() {
- return localStorage.getItem(USER_OWNER_UUID_KEY) || undefined;
+ public getTargetURL() {
+ return localStorage.getItem(TARGET_URL);
}
- public getIsAdmin(): boolean {
- return localStorage.getItem(USER_IS_ADMIN) === 'true';
+ public removeApiToken() {
+ localStorage.removeItem(API_TOKEN_KEY);
+ sessionStorage.removeItem(API_TOKEN_KEY);
}
- 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": {}}');
+ public getApiToken() {
+ return this.getStorage().getItem(API_TOKEN_KEY) || undefined;
+ }
- return email && firstName && lastName && uuid && ownerUuid && username && prefs
- ? { email, firstName, lastName, uuid, ownerUuid, isAdmin, 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_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_USERNAME);
- localStorage.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) {
+ public login(uuidPrefix: string, homeCluster: string, loginCluster: string, remoteHosts: { [key: string]: string }) {
const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
- // window.location.assign(`${this.baseUrl || ""}/login?return_to=${currentUrl}`);
- window.location.assign(`https://${homeCluster}/login?remote=${uuidPrefix}&return_to=${currentUrl}`);
+ 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
uuid: resp.data.uuid,
ownerUuid: resp.data.owner_uuid,
isAdmin: resp.data.is_admin,
+ isActive: resp.data.is_active,
username: resp.data.username,
prefs
};
})
.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 [];
}
public saveSessions(sessions: Session[]) {
- localStorage.setItem("sessions", JSON.stringify(sessions));
+ this.removeSessions();
+ this.getStorage().setItem("sessions", JSON.stringify(sessions));
+ }
+
+ public removeSessions() {
+ localStorage.removeItem("sessions");
+ sessionStorage.removeItem("sessions");
}
public buildSessions(cfg: Config, user?: User) {
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');
projects / arvados-workbench2.git / blobdiff