diff --git a/apps/red-ui/src/app/guards/if-logged-in.guard.ts b/apps/red-ui/src/app/guards/if-logged-in.guard.ts index 91a51e440..5acd504d7 100644 --- a/apps/red-ui/src/app/guards/if-logged-in.guard.ts +++ b/apps/red-ui/src/app/guards/if-logged-in.guard.ts @@ -5,6 +5,7 @@ import { keycloakInitializer, KeycloakStatusService, TenantsService } from '@iqs import { KeycloakService } from 'keycloak-angular'; import { UserService } from '@users/user.service'; import { LicenseService } from '@services/license.service'; +import { RouterHistoryService } from '@services/router-history.service'; export function ifLoggedIn(): CanActivateFn { return async (route: ActivatedRouteSnapshot) => { @@ -16,6 +17,7 @@ export function ifLoggedIn(): CanActivateFn { const usersService = inject(UserService); const licenseService = inject(LicenseService); const keycloakStatusService = inject(KeycloakStatusService); + const routerHistoryService = inject(RouterHistoryService); const keycloakInstance = keycloakService.getKeycloakInstance(); const tenant = route.paramMap.get('tenant'); @@ -34,6 +36,7 @@ export function ifLoggedIn(): CanActivateFn { await tenantsService.selectTenant(tenant); await usersService.initialize(); await licenseService.loadLicenses(); + routerHistoryService.clearRouterHistory(); } const isLoggedIn = await keycloakService.isLoggedIn(); diff --git a/apps/red-ui/src/app/services/router-history.service.ts b/apps/red-ui/src/app/services/router-history.service.ts index 985b5df93..65cac7491 100644 --- a/apps/red-ui/src/app/services/router-history.service.ts +++ b/apps/red-ui/src/app/services/router-history.service.ts @@ -11,7 +11,10 @@ const LAST_DOSSIERS_SCREEN = 'routerHistory_lastDossiersScreen'; export class RouterHistoryService { private _lastDossiersScreen = localStorage.getItem(LAST_DOSSIERS_SCREEN); - constructor(private readonly _router: Router, private readonly _tenantsService: TenantsService) { + constructor( + private readonly _router: Router, + private readonly _tenantsService: TenantsService, + ) { // eslint-disable-next-line rxjs/no-ignored-subscription this._router.events.pipe(filter(event => event instanceof NavigationEnd)).subscribe((event: NavigationEnd) => { if (event.url.includes('/dossiers') || event.url.includes('/archive')) { @@ -30,4 +33,8 @@ export class RouterHistoryService { this._router.navigate([url]); } } + + clearRouterHistory() { + localStorage.removeItem(LAST_DOSSIERS_SCREEN); + } } diff --git a/libs/common-ui b/libs/common-ui index d1df30b56..6cb63fcf4 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit d1df30b56ea5abd03b0c8623f68fc96db9fef271 +Subproject commit 6cb63fcf43fbbf522b847f57467156808bbe72a1