Merge branch '21128-toolbar-context-menu'

[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 5b97596983e05e8d047212620565b135c491786e..79a6b7e1960be50cf06a078fb7bcd15f85fb19fc 100644 (file)
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -35,6 +35,8 @@ export interface UserDetailsResponse {
     is_active: boolean;
     username: string;
     prefs: UserPrefs;
+    can_write: boolean;
+    can_manage: boolean;
 }
 
 export class AuthService {
@@ -64,17 +66,20 @@ export class AuthService {
         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));
+            this.getStorage().setItem(HOME_CLUSTER, sp[1].substring(0, 5));
         }
     }
 
+    public setTargetUrl(url: string) {
+        localStorage.setItem(TARGET_URL, url);
+    }
+
     public removeTargetURL() {
         localStorage.removeItem(TARGET_URL);
-        sessionStorage.removeItem(TARGET_URL);
     }
 
     public getTargetURL() {
-        return this.getStorage().getItem(TARGET_URL);
+        return localStorage.getItem(TARGET_URL);
     }
 
     public removeApiToken() {
@@ -113,13 +118,17 @@ export class AuthService {
         const currentUrl = `${window.location.protocol}//${window.location.host}/token`;
         const homeClusterHost = remoteHosts[homeCluster];
         const rd = new URL(window.location.href);
-        this.getStorage().setItem(TARGET_URL, rd.pathname + rd.search);
+        this.setTargetUrl(rd.pathname + rd.search);
         window.location.assign(`https://${homeClusterHost}/login?${(uuidPrefix !== homeCluster && homeCluster !== loginCluster) ? "remote=" + uuidPrefix + "&" : ""}return_to=${currentUrl}`);
     }
 
-    public logout(expireToken: string) {
-        const currentUrl = `${window.location.protocol}//${window.location.host}`;
-        window.location.assign(`${this.baseUrl || ""}/logout?api_token=${expireToken}&return_to=${currentUrl}`);
+    public logout(expireToken: string, preservePath: boolean) {
+        const fullUrl = new URL(window.location.href);
+        const wbBase = `${fullUrl.protocol}//${fullUrl.host}`;
+        const wbPath = fullUrl.pathname + fullUrl.search;
+        const returnTo = `${wbBase}${preservePath ? wbPath : ''}`
+
+        window.location.assign(`${this.baseUrl || ""}/logout?api_token=${expireToken}&return_to=${returnTo}`);
     }
 
     public getUserDetails = (showErrors?: boolean): Promise<User> => {
@@ -139,6 +148,8 @@ export class AuthService {
                     isAdmin: resp.data.is_admin,
                     isActive: resp.data.is_active,
                     username: resp.data.username,
+                    canWrite: resp.data.can_write,
+                    canManage: resp.data.can_manage,
                     prefs
                 };
             })