Merge pull request #10574 from abpframework/auto-merge/rel-4-4/617

Merge branch rel-5.0 with rel-4.4

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();
   }
 

npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts

@@ -62,6 +62,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(() => {