Skip to content

Commit 7fbc103

Browse files
authored
Merge pull request #2326 from intersective/prerelease
Release 2.4.2.1
2 parents a4a53b2 + 986f927 commit 7fbc103

3 files changed

Lines changed: 8 additions & 4 deletions

File tree

projects/v3/src/app/app.component.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,9 @@ export class AppComponent implements OnInit, OnDestroy {
3535
'register',
3636
'forgot_password',
3737
'reset_password',
38+
'global_login',
39+
'direct_login',
40+
'do=secure',
3841
];
3942

4043
constructor(

projects/v3/src/app/pages/auth/auth-global-login/auth-global-login.component.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ export class AuthGlobalLoginComponent implements OnInit {
2525

2626
async ngOnInit() {
2727
const apikey = this.route.snapshot.paramMap.get('apikey');
28-
const multipleStacks = this.route.snapshot.paramMap.get('multiple');
28+
const multipleStacks: string = this.route.snapshot.paramMap.get('multiple');
29+
2930
if (!apikey) {
3031
return this._error();
3132
}
@@ -37,7 +38,7 @@ export class AuthGlobalLoginComponent implements OnInit {
3738
});
3839

3940
const homePath = ['v3', 'home'];
40-
if (multipleStacks) {
41+
if (multipleStacks === 'true') {
4142
this.storage.set('hasMultipleStacks', true);
4243
}
4344
if (environment.demo) {
@@ -62,10 +63,10 @@ export class AuthGlobalLoginComponent implements OnInit {
6263
prod: [`/${locale}`, ...homePath],
6364
});
6465
}
65-
6666
return this.navigate(homePath);
6767
}
6868
} catch (err) {
69+
6970
this._error(err);
7071
}
7172
}

projects/v3/src/app/services/auth.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ export class AuthService {
345345
this.storage.clear();
346346
if (typeof redirect === 'object') {
347347
return this.router.navigate(redirect);
348-
} else if (typeof redirect === 'boolean' && redirect === true) {
348+
} else if (redirect === true) {
349349
// still store config info even logout
350350
this.storage.setConfig(config);
351351
return this.router.navigate(['/'], navigationParams);

0 commit comments

Comments
 (0)