Skip to content

Commit

Permalink
Merge pull request #2326 from intersective/prerelease
Browse files Browse the repository at this point in the history
Release 2.4.2.1
  • Loading branch information
shawnm0705 authored Dec 10, 2024
2 parents 15de141 + 345964b commit d2efa8d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
3 changes: 3 additions & 0 deletions projects/v3/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ export class AppComponent implements OnInit, OnDestroy {
'register',
'forgot_password',
'reset_password',
'global_login',
'direct_login',
'do=secure',
];

constructor(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ export class AuthGlobalLoginComponent implements OnInit {

async ngOnInit() {
const apikey = this.route.snapshot.paramMap.get('apikey');
const multipleStacks = this.route.snapshot.paramMap.get('multiple');
const multipleStacks: string = this.route.snapshot.paramMap.get('multiple');

if (!apikey) {
return this._error();
}
Expand All @@ -37,7 +38,7 @@ export class AuthGlobalLoginComponent implements OnInit {
});

const homePath = ['v3', 'home'];
if (multipleStacks) {
if (multipleStacks === 'true') {
this.storage.set('hasMultipleStacks', true);
}
if (environment.demo) {
Expand All @@ -62,10 +63,10 @@ export class AuthGlobalLoginComponent implements OnInit {
prod: [`/${locale}`, ...homePath],
});
}

return this.navigate(homePath);
}
} catch (err) {

this._error(err);
}
}
Expand Down
2 changes: 1 addition & 1 deletion projects/v3/src/app/services/auth.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,7 @@ export class AuthService {
this.storage.clear();
if (typeof redirect === 'object') {
return this.router.navigate(redirect);
} else if (typeof redirect === 'boolean' && redirect === true) {
} else if (redirect === true) {
// still store config info even logout
this.storage.setConfig(config);
return this.router.navigate(['/'], navigationParams);
Expand Down

0 comments on commit d2efa8d

Please sign in to comment.