From cbbdd46a6206165e5b4480a38951286404721c81 Mon Sep 17 00:00:00 2001 From: Mehmet Erim <34455572+mehmet-erim@users.noreply.github.com> Date: Mon, 8 Nov 2021 15:45:27 +0300 Subject: [PATCH 1/3] Update replace-with-tilde.ts --- npm/ng-packs/scripts/replace-with-tilde.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/npm/ng-packs/scripts/replace-with-tilde.ts b/npm/ng-packs/scripts/replace-with-tilde.ts index d4f119582f..ca748e2a9f 100644 --- a/npm/ng-packs/scripts/replace-with-tilde.ts +++ b/npm/ng-packs/scripts/replace-with-tilde.ts @@ -10,7 +10,7 @@ async function replace(filePath: string) { if (!dependencies) return; Object.keys(dependencies).forEach(key => { - if (key.includes('@abp/') && key !== '@abp/utils') { + if (key.includes('@abp/')) { dependencies[key] = dependencies[key].replace('^', '~'); } }); From 86b8f952eecfc6a109ab91e1bf39983b50e7c9f6 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 9 Nov 2021 11:19:43 +0300 Subject: [PATCH 2/3] redirect to the login page when token expired --- .../packages/core/src/lib/strategies/auth-flow.strategy.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts index 001d0e8842..339b6f5401 100644 --- a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts +++ b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts @@ -60,6 +60,11 @@ export abstract class AuthFlowStrategy { if (shouldClear) clearOAuthStorage(oAuthStorage); this.oAuthService.configure(this.oAuthConfig); + + this.oAuthService.events + .pipe(filter(event => event.type === 'token_refresh_error')) + .subscribe(() => this.navigateToLogin()); + return this.oAuthService .loadDiscoveryDocument() .then(() => { From 414d0a1e0c9a68d113def15d6cdec57f38e33f00 Mon Sep 17 00:00:00 2001 From: mehmet-erim Date: Tue, 9 Nov 2021 11:21:55 +0300 Subject: [PATCH 3/3] fix layout flickering --- .../core/src/lib/components/dynamic-layout.component.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts index c9a852ae08..939fff173e 100644 --- a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts +++ b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts @@ -52,9 +52,7 @@ export class DynamicLayoutComponent { this.router = injector.get(Router); this.routes = injector.get(RoutesService); - this.getLayout(); this.checkLayoutOnNavigationEnd(); - this.listenToLanguageChange(); }