dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI: Not redirect to the previous link after login with 2FA

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2022-07-25 13:34:40 +03:00
parent 578075e9b8
commit 33fe04a7a0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/core/auth/auth.service.ts
View File

@ -268,7 +268,9 @@ export class AuthService {
public defaultUrl(isAuthenticated: boolean, authState?: AuthState, path?: string, params?: any): UrlTree { public defaultUrl(isAuthenticated: boolean, authState?: AuthState, path?: string, params?: any): UrlTree {
let result: UrlTree = null; let result: UrlTree = null;
if (isAuthenticated) { if (isAuthenticated) {
if (!path || path === 'login' || this.forceDefaultPlace(authState, path, params)) { if (authState.authUser.authority === Authority.PRE_VERIFICATION_TOKEN) {
result = this.router.parseUrl('login/mfa');
} else if (!path || path === 'login' || this.forceDefaultPlace(authState, path, params)) {
if (this.redirectUrl) { if (this.redirectUrl) {
const redirectUrl = this.redirectUrl; const redirectUrl = this.redirectUrl;
this.redirectUrl = null; this.redirectUrl = null;