Merge branch 'master' into 14604-ui-improvements

[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 ffd81ef12c86bf1638213d44e0422d527ea91868..6fe27c8d4d819a24556ca38983404c17091fa3b2 100644 (file)
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -2,13 +2,13 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { getUserFullname, User } from "~/models/user";
+import { getUserFullname, User, UserPrefs, UserResource } from '~/models/user';
 import { AxiosInstance } from "axios";
 import { ApiActions } from "~/services/api/api-actions";
 import * as uuid from "uuid/v4";
-import { Session } from "~/models/session";
+import { Session, SessionStatus } from "~/models/session";
 import { Config } from "~/common/config";
-import { merge, uniqWith, uniqBy } from "lodash";
+import { uniqBy } from "lodash";
 
 export const API_TOKEN_KEY = 'apiToken';
 export const USER_EMAIL_KEY = 'userEmail';
@@ -17,6 +17,8 @@ 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_IDENTITY_URL = 'identityUrl';
+export const USER_PREFS = 'prefs';
 
 export interface UserDetailsResponse {
     email: string;
@@ -25,6 +27,8 @@ export interface UserDetailsResponse {
     uuid: string;
     owner_uuid: string;
     is_admin: boolean;
+    identity_url: string;
+    prefs: UserPrefs;
 }
 
 export class AuthService {
@@ -65,19 +69,23 @@ export class AuthService {
         const uuid = this.getUuid();
         const ownerUuid = this.getOwnerUuid();
         const isAdmin = this.getIsAdmin();
+        const identityUrl = localStorage.getItem(USER_IDENTITY_URL);
+        const prefs = JSON.parse(localStorage.getItem(USER_PREFS) || '{"profile": {}}');
 
-        return email && firstName && lastName && uuid && ownerUuid
-            ? { email, firstName, lastName, uuid, ownerUuid, isAdmin }
+        return email && firstName && lastName && uuid && ownerUuid && identityUrl && prefs
+            ? { email, firstName, lastName, uuid, ownerUuid, isAdmin, identityUrl, prefs }
             : undefined;
     }
 
-    public saveUser(user: User) {
+    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_IDENTITY_URL, user.identityUrl);
+        localStorage.setItem(USER_PREFS, JSON.stringify(user.prefs));
     }
 
     public removeUser() {
@@ -87,6 +95,8 @@ export class AuthService {
         localStorage.removeItem(USER_UUID_KEY);
         localStorage.removeItem(USER_OWNER_UUID_KEY);
         localStorage.removeItem(USER_IS_ADMIN);
+        localStorage.removeItem(USER_IDENTITY_URL);
+        localStorage.removeItem(USER_PREFS);
     }
 
     public login() {
@@ -106,13 +116,16 @@ export class AuthService {
             .get<UserDetailsResponse>('/users/current')
             .then(resp => {
                 this.actions.progressFn(reqId, false);
+                const prefs = resp.data.prefs.profile ? resp.data.prefs : { profile: {}};
                 return {
                     email: resp.data.email,
                     firstName: resp.data.first_name,
                     lastName: resp.data.last_name,
                     uuid: resp.data.uuid,
                     ownerUuid: resp.data.owner_uuid,
-                    isAdmin: resp.data.is_admin
+                    isAdmin: resp.data.is_admin,
+                    identityUrl: resp.data.identity_url,
+                    prefs
                 };
             })
             .catch(e => {
@@ -144,11 +157,14 @@ export class AuthService {
     public buildSessions(cfg: Config, user?: User) {
         const currentSession = {
             clusterId: cfg.uuidPrefix,
-            remoteHost: cfg.baseUrl,
+            remoteHost: cfg.rootUrl,
+            baseUrl: cfg.baseUrl,
             username: getUserFullname(user),
             email: user ? user.email : '',
             token: this.getApiToken(),
-            loggedIn: true
+            loggedIn: true,
+            active: true,
+            status: SessionStatus.VALIDATED
         } as Session;
         const localSessions = this.getSessions();
         const cfgSessions = Object.keys(cfg.remoteHosts).map(clusterId => {
@@ -156,15 +172,18 @@ export class AuthService {
             return {
                 clusterId,
                 remoteHost,
+                baseUrl: '',
                 username: '',
                 email: '',
                 token: '',
-                loggedIn: false
+                loggedIn: false,
+                active: false,
+                status: SessionStatus.INVALIDATED
             } as Session;
         });
         const sessions = [currentSession]
-            .concat(cfgSessions)
-            .concat(localSessions);
+            .concat(localSessions)
+            .concat(cfgSessions);
 
         const uniqSessions = uniqBy(sessions, 'clusterId');