feat() fix redirect url

mixcore · Nov 3, 2023 · 483426c · 483426c · vercel · Nov 3, 2023
1 parent 5c4d631
commit 483426c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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();