Merge branch '16159-logout-request-with-token'

[arvados-workbench2.git] / src / store / auth / auth-middleware.ts

diff --git a/src/store/auth/auth-middleware.ts b/src/store/auth/auth-middleware.ts
index 76f85984b06e0a5dc0a5c88696f8ce931eb0286d..ce7cd5cb6f9ceebd165af5b6ea275d56dc5aa871 100644 (file)
--- a/src/store/auth/auth-middleware.ts
+++ b/src/store/auth/auth-middleware.ts
@@ -30,6 +30,7 @@ export const authMiddleware = (services: ServiceRepository): Middleware => store
                 setAuthorizationHeader(services, state.auth.apiToken);
             } else {
                 services.authService.removeApiToken();
+                services.authService.removeSessions();
                 removeAuthorizationHeader(services);
             }
 
@@ -63,10 +64,12 @@ export const authMiddleware = (services: ServiceRepository): Middleware => store
             if (deleteLinkData) {
                 services.linkAccountService.removeAccountToLink();
             }
+            const token = services.authService.getApiToken();
             services.authService.removeApiToken();
+            services.authService.removeSessions();
             services.authService.removeUser();
             removeAuthorizationHeader(services);
-            services.authService.logout();
+            services.authService.logout(token || '');
         },
         default: () => next(action)
     });