fix: ensure user cookies are cleared before logout redirect

SciCatProject · Feb 14, 2025 · 04da6d0 · 04da6d0
1 parent a505802
commit 04da6d0
Showing 1 changed file with 16 additions and 18 deletions.
diff --git a/src/app/state-management/effects/user.effects.ts b/src/app/state-management/effects/user.effects.ts
@@ -216,25 +216,23 @@ export class UserEffects {
     return this.actions$.pipe(
       ofType(fromActions.logoutAction),
       filter(() => this.authService.isAuthenticated()),
-      switchMap(() =>
-        this.sharedAuthService.authControllerLogout().pipe(
-          switchMap(({ logoutURL }) => {
-            this.authService.clear();
-            return [
-              clearDatasetsStateAction(),
-              clearInstrumentsStateAction(),
-              clearJobsStateAction(),
-              clearLogbooksStateAction(),
-              clearPoliciesStateAction(),
-              clearProposalsStateAction(),
-              clearPublishedDataStateAction(),
-              clearSamplesStateAction(),
-              fromActions.logoutCompleteAction({ logoutURL }),
-            ];
-          }),
+      switchMap(() => {
+        this.authService.clear();
+        return this.sharedAuthService.authControllerLogout().pipe(
+          switchMap(({ logoutURL }) => [
+            clearDatasetsStateAction(),
+            clearInstrumentsStateAction(),
+            clearJobsStateAction(),
+            clearLogbooksStateAction(),
+            clearPoliciesStateAction(),
+            clearProposalsStateAction(),
+            clearPublishedDataStateAction(),
+            clearSamplesStateAction(),
+            fromActions.logoutCompleteAction({ logoutURL }),
+          ]),
           catchError(() => of(fromActions.logoutFailedAction())),
-        ),
-      ),
+        );
+      }),
     );
   });