X-Git-Url: https://git.arvados.org/arvados-workbench2.git/blobdiff_plain/eeb82d50816250cc6287928e6d958affa73880ee..c27efd822acfd3bd93fc3e2e3e24a24146811eb7:/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 da593c2d..50760bb4 100644
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -2,24 +2,33 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import { API_HOST, serverApi } from "../../common/api/server-api";
-import { User } from "../../models/user";
-import { Dispatch } from "redux";
-import actions from "../../store/auth/auth-action";
+import { User } from "~/models/user";
+import { AxiosInstance } from "axios";
+import { ApiActions, ProgressFn } from "~/services/api/api-actions";
+import * as uuid from "uuid/v4";
 
 export const API_TOKEN_KEY = 'apiToken';
 export const USER_EMAIL_KEY = 'userEmail';
 export const USER_FIRST_NAME_KEY = 'userFirstName';
 export const USER_LAST_NAME_KEY = 'userLastName';
+export const USER_UUID_KEY = 'userUuid';
+export const USER_OWNER_UUID_KEY = 'userOwnerUuid';
 
 export interface UserDetailsResponse {
     email: string;
     first_name: string;
     last_name: string;
+    uuid: string;
+    owner_uuid: string;
     is_admin: boolean;
 }
 
-export default class AuthService {
+export class AuthService {
+
+    constructor(
+        protected apiClient: AxiosInstance,
+        protected baseUrl: string,
+        protected actions: ApiActions) { }
 
     public saveApiToken(token: string) {
         localStorage.setItem(API_TOKEN_KEY, token);
@@ -33,12 +42,23 @@ export default class AuthService {
         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 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);
-        return email && firstName && lastName
-            ? { email, firstName, lastName }
+        const uuid = localStorage.getItem(USER_UUID_KEY);
+        const ownerUuid = localStorage.getItem(USER_OWNER_UUID_KEY);
+
+        return email && firstName && lastName && uuid && ownerUuid
+            ? { email, firstName, lastName, uuid, ownerUuid }
             : undefined;
     }
 
@@ -46,32 +66,53 @@ export default class AuthService {
         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);
     }
 
     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);
     }
 
     public login() {
         const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
-        window.location.assign(`${API_HOST}/login?return_to=${currentUrl}`);
+        window.location.assign(`${this.baseUrl || ""}/login?return_to=${currentUrl}`);
     }
 
     public logout() {
         const currentUrl = `${window.location.protocol}//${window.location.host}`;
-        window.location.assign(`${API_HOST}/logout?return_to=${currentUrl}`);
+        window.location.assign(`${this.baseUrl || ""}/logout?return_to=${currentUrl}`);
     }
 
-    public getUserDetails = () => (dispatch: Dispatch) => {
-        dispatch(actions.USER_DETAILS_REQUEST());
-        serverApi
+    public getUserDetails = (): Promise<User> => {
+        const reqId = uuid();
+        this.actions.progressFn(reqId, true);
+        return this.apiClient
             .get<UserDetailsResponse>('/users/current')
             .then(resp => {
-                dispatch(actions.USER_DETAILS_SUCCESS(resp.data));
+                this.actions.progressFn(reqId, false);
+                return {
+                    email: resp.data.email,
+                    firstName: resp.data.first_name,
+                    lastName: resp.data.last_name,
+                    uuid: resp.data.uuid,
+                    ownerUuid: resp.data.owner_uuid
+                };
             })
-            // .catch(err => {
-            // });
-    };
+            .catch(e => {
+                this.actions.progressFn(reqId, false);
+                this.actions.errorFn(reqId, e);
+                throw e;
+            });
+    }
+
+    public getRootUuid() {
+        const uuid = this.getOwnerUuid();
+        const uuidParts = uuid ? uuid.split('-') : [];
+        return uuidParts.length > 1 ? `${uuidParts[0]}-${uuidParts[1]}` : undefined;
+    }
 }