Skip to content

Commit 483426c

Browse files
committed
feat() fix redirect url
1 parent 5c4d631 commit 483426c

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

apps/mix-database/src/app/app.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { SwUpdate, VersionReadyEvent } from '@angular/service-worker';
1111
import { zoomOutLeftOnLeaveAnimation } from '@mixcore/share/animation';
1212
import { MixEaterEgg } from '@mixcore/share/api';
1313
import { AuthService } from '@mixcore/share/auth';
14+
import { DomHelper } from '@mixcore/share/helper';
1415
import { ModalService } from '@mixcore/ui/modal';
1516
import { filter, forkJoin, switchMap } from 'rxjs';
1617

@@ -67,7 +68,7 @@ export class AppComponent implements OnInit {
6768
this.authService.isAuthorized$.next(true);
6869
this.router
6970
.navigateByUrl(
70-
this.authService.redirectUrl || window.location.pathname
71+
this.authService.redirectUrl || DomHelper.getCurrentPathname()
7172
)
7273
.then();
7374

apps/mix-kanban/src/app/app.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { SwUpdate, VersionReadyEvent } from '@angular/service-worker';
1111
import { zoomOutLeftOnLeaveAnimation } from '@mixcore/share/animation';
1212
import { MixEaterEgg } from '@mixcore/share/api';
1313
import { AuthService } from '@mixcore/share/auth';
14+
import { DomHelper } from '@mixcore/share/helper';
1415
import { ModalService } from '@mixcore/ui/modal';
1516
import { filter, forkJoin, switchMap } from 'rxjs';
1617

@@ -67,7 +68,7 @@ export class AppComponent implements OnInit {
6768
this.authService.isAuthorized$.next(true);
6869
this.router
6970
.navigateByUrl(
70-
this.authService.redirectUrl || window.location.pathname
71+
this.authService.redirectUrl || DomHelper.getCurrentPathname()
7172
)
7273
.then();
7374

0 commit comments

Comments
 (0)