X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9a37cc202448e431064b247d36ac0229a6bfa9b2..825b555f06eb9dfb987dee1d072bba6874552a8a:/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 8601e2084d..cec0cef1d8 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 } 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";
@@ -17,7 +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_IS_ACTIVE = 'isActive';
+export const USER_USERNAME = 'username';
 export const USER_PREFS = 'prefs';
 
 export interface UserDetailsResponse {
@@ -27,7 +28,8 @@ export interface UserDetailsResponse {
     uuid: string;
     owner_uuid: string;
     is_admin: boolean;
-    identity_url: string;
+    is_active: boolean;
+    username: string;
     prefs: UserPrefs;
 }
 
@@ -62,6 +64,10 @@ export class AuthService {
         return localStorage.getItem(USER_IS_ADMIN) === 'true';
     }
 
+    public getIsActive(): boolean {
+        return localStorage.getItem(USER_IS_ACTIVE) === 'true';
+    }
+
     public getUser(): User | undefined {
         const email = localStorage.getItem(USER_EMAIL_KEY);
         const firstName = localStorage.getItem(USER_FIRST_NAME_KEY);
@@ -69,22 +75,24 @@ export class AuthService {
         const uuid = this.getUuid();
         const ownerUuid = this.getOwnerUuid();
         const isAdmin = this.getIsAdmin();
-        const identityUrl = localStorage.getItem(USER_IDENTITY_URL);
+        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 && identityUrl && prefs
-            ? { email, firstName, lastName, uuid, ownerUuid, isAdmin, identityUrl, prefs }
+        return email && firstName && lastName && uuid && ownerUuid && username && prefs
+            ? { email, firstName, lastName, uuid, ownerUuid, isAdmin, isActive, username, 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_IS_ACTIVE, JSON.stringify(user.isActive));
+        localStorage.setItem(USER_USERNAME, user.username);
         localStorage.setItem(USER_PREFS, JSON.stringify(user.prefs));
     }
 
@@ -95,13 +103,15 @@ 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_IS_ACTIVE);
+        localStorage.removeItem(USER_USERNAME);
         localStorage.removeItem(USER_PREFS);
     }
 
-    public login() {
+    public login(uuidPrefix: string, homeCluster: string, remoteHosts: { [key: string]: string }) {
         const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
-        window.location.assign(`${this.baseUrl || ""}/login?return_to=${currentUrl}`);
+        const homeClusterHost = remoteHosts[homeCluster];
+        window.location.assign(`https://${homeClusterHost}/login?${uuidPrefix !== homeCluster ? "remote=" + uuidPrefix + "&" : ""}return_to=${currentUrl}`);
     }
 
     public logout() {
@@ -116,7 +126,7 @@ export class AuthService {
             .get<UserDetailsResponse>('/users/current')
             .then(resp => {
                 this.actions.progressFn(reqId, false);
-                const prefs = resp.data.prefs.profile ? resp.data.prefs : { profile: {}};
+                const prefs = resp.data.prefs.profile ? resp.data.prefs : { profile: {} };
                 return {
                     email: resp.data.email,
                     firstName: resp.data.first_name,
@@ -124,7 +134,8 @@ export class AuthService {
                     uuid: resp.data.uuid,
                     ownerUuid: resp.data.owner_uuid,
                     isAdmin: resp.data.is_admin,
-                    identityUrl: resp.data.identity_url,
+                    isActive: resp.data.is_active,
+                    username: resp.data.username,
                     prefs
                 };
             })