From 483426cdaafe1b5864586b7a9a81e849c2f3411e Mon Sep 17 00:00:00 2001
From: develite98 <phongcao3091998@gmail.com>
Date: Fri, 3 Nov 2023 12:57:51 +0700
Subject: [PATCH] feat() fix redirect url

---
 apps/mix-database/src/app/app.component.ts | 3 ++-
 apps/mix-kanban/src/app/app.component.ts   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/mix-database/src/app/app.component.ts b/apps/mix-database/src/app/app.component.ts
index 0bfb514a..c3c9145a 100644
--- a/apps/mix-database/src/app/app.component.ts
+++ b/apps/mix-database/src/app/app.component.ts
@@ -11,6 +11,7 @@ import { SwUpdate, VersionReadyEvent } from '@angular/service-worker';
 import { zoomOutLeftOnLeaveAnimation } from '@mixcore/share/animation';
 import { MixEaterEgg } from '@mixcore/share/api';
 import { AuthService } from '@mixcore/share/auth';
+import { DomHelper } from '@mixcore/share/helper';
 import { ModalService } from '@mixcore/ui/modal';
 import { filter, forkJoin, switchMap } from 'rxjs';
 
@@ -67,7 +68,7 @@ export class AppComponent implements OnInit {
           this.authService.isAuthorized$.next(true);
           this.router
             .navigateByUrl(
-              this.authService.redirectUrl || window.location.pathname
+              this.authService.redirectUrl || DomHelper.getCurrentPathname()
             )
             .then();
 
diff --git a/apps/mix-kanban/src/app/app.component.ts b/apps/mix-kanban/src/app/app.component.ts
index 0bfb514a..c3c9145a 100644
--- a/apps/mix-kanban/src/app/app.component.ts
+++ b/apps/mix-kanban/src/app/app.component.ts
@@ -11,6 +11,7 @@ import { SwUpdate, VersionReadyEvent } from '@angular/service-worker';
 import { zoomOutLeftOnLeaveAnimation } from '@mixcore/share/animation';
 import { MixEaterEgg } from '@mixcore/share/api';
 import { AuthService } from '@mixcore/share/auth';
+import { DomHelper } from '@mixcore/share/helper';
 import { ModalService } from '@mixcore/ui/modal';
 import { filter, forkJoin, switchMap } from 'rxjs';
 
@@ -67,7 +68,7 @@ export class AppComponent implements OnInit {
           this.authService.isAuthorized$.next(true);
           this.router
             .navigateByUrl(
-              this.authService.redirectUrl || window.location.pathname
+              this.authService.redirectUrl || DomHelper.getCurrentPathname()
             )
             .then();