From 564bb1d3d51faeef9a07c2fb02eb4b06c44e005f Mon Sep 17 00:00:00 2001
From: Mahmut Gundogdu <mahmutgundogdu@hotmail.com.tr>
Date: Wed, 26 Jul 2023 10:58:32 +0300
Subject: [PATCH] Dynamic layout musst solve layout oninit. Update guard

---
 .../src/lib/components/dynamic-layout.component.ts   | 11 +++++++++--
 .../packages/oauth/src/lib/guards/oauth.guard.ts     | 12 +++---------
 2 files changed, 12 insertions(+), 11 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 5adaa0d768..5215c95398 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
@@ -1,4 +1,4 @@
-import { Component, Injector, isDevMode, Optional, SkipSelf, Type } from '@angular/core';
+import { Component, Injector, isDevMode, OnInit, Optional, SkipSelf, Type } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { eLayoutType } from '../enums/common';
 import { ABP } from '../models';
@@ -16,7 +16,7 @@ import { TreeNode } from '../utils/tree-utils';
   template: ` <ng-container *ngIf="isLayoutVisible" [ngComponentOutlet]="layout"></ng-container> `,
   providers: [SubscriptionService],
 })
-export class DynamicLayoutComponent {
+export class DynamicLayoutComponent implements OnInit {
   layout?: Type<any>;
   layoutKey?: eLayoutType;
 
@@ -53,6 +53,13 @@ export class DynamicLayoutComponent {
     this.listenToLanguageChange();
   }
 
+  ngOnInit(): void {
+    if(this.layout){
+      return;
+    }
+    this.getLayout()
+  }
+
   private checkLayoutOnNavigationEnd() {
     const navigationEnd$ = this.routerEvents.getNavigationEvents('End');
     this.subscription.addOne(navigationEnd$, () => this.getLayout());
diff --git a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
index 85a39b5bf8..faafafedfa 100644
--- a/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/guards/oauth.guard.ts
@@ -23,14 +23,8 @@ export class AbpOAuthGuard implements IAbpGuard {
     if (hasValidAccessToken) {
       return true;
     }
-
-    return of(false).pipe(
-      tap(() => this.httpErrorReporter.reportError({ status: 401 } as HttpErrorResponse)),
-      delay(1500),
-      tap(() => {
-        const params = { returnUrl: state.url };
-        this.authService.navigateToLogin(params);
-      }),
-    );
+    const params = { returnUrl: state.url };
+    this.authService.navigateToLogin(params);
+    return false;
   }
 }