[ARVADOS-WORKBENCH2] created: 1.4.1-451-gc666d786

Git user git at public.arvados.org
Fri Oct 2 19:54:08 UTC 2020


        at  c666d78642ac6af933bfee6bca45b0815a2ed86e (commit)


commit c666d78642ac6af933bfee6bca45b0815a2ed86e
Author: Peter Amstutz <peter.amstutz at curii.com>
Date:   Fri Oct 2 15:53:34 2020 -0400

    16947: Don't show misleading session validate errors.
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <peter.amstutz at curii.com>

diff --git a/src/services/auth-service/auth-service.ts b/src/services/auth-service/auth-service.ts
index 5e382fba..9fc738bc 100644
--- a/src/services/auth-service/auth-service.ts
+++ b/src/services/auth-service/auth-service.ts
@@ -92,7 +92,7 @@ export class AuthService {
         window.location.assign(`${this.baseUrl || ""}/logout?return_to=${currentUrl}`);
     }
 
-    public getUserDetails = (): Promise<User> => {
+    public getUserDetails = (showErrors?: boolean): Promise<User> => {
         const reqId = uuid();
         this.actions.progressFn(reqId, true);
         return this.apiClient
@@ -114,7 +114,7 @@ export class AuthService {
             })
             .catch(e => {
                 this.actions.progressFn(reqId, false);
-                this.actions.errorFn(reqId, e);
+                this.actions.errorFn(reqId, e, showErrors);
                 throw e;
             });
     }
diff --git a/src/store/auth/auth-action-session.ts b/src/store/auth/auth-action-session.ts
index 4568d77e..0f85e9ac 100644
--- a/src/store/auth/auth-action-session.ts
+++ b/src/store/auth/auth-action-session.ts
@@ -114,7 +114,7 @@ export const validateCluster = async (config: Config, useToken: string):
     const svc = createServices(config, { progressFn: () => { }, errorFn: () => { } });
     setAuthorizationHeader(svc, saltedToken);
 
-    const user = await svc.authService.getUserDetails();
+    const user = await svc.authService.getUserDetails(false);
     return {
         user,
         token: saltedToken,

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list