bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-18 17:23:37 +00:00
Code Issues Releases Wiki Activity

Consolidate clearing loginEmailService values and routing

Browse Source
This commit is contained in:
Alec Rippberger
2024-09-25 15:44:50 -05:00
parent e0eff02a42
commit 3187a3300e
1 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libs/auth/src/angular/login/login.component.ts
View File

@@ -266,20 +266,18 @@ export class LoginComponent implements OnInit, OnDestroy {
// If none of the above cases are true, proceed with login... // If none of the above cases are true, proceed with login...
// ...on Web // ...on Web
if (this.clientType === ClientType.Web) { if (this.clientType === ClientType.Web) {
await this.goAfterLogIn(authResult.userId);
return;
// ...on Browser/Desktop // ...on Browser/Desktop
await this.goAfterLogIn(authResult.userId);
} else { } else {
this.loginEmailService.clearValues();
if (this.clientType === ClientType.Browser) { if (this.clientType === ClientType.Browser) {
await this.router.navigate(["/tabs/vault"]); await this.router.navigate(["/tabs/vault"]);
} else { } else {
await this.router.navigate(["vault"]); // Desktop await this.router.navigate(["vault"]); // Desktop
} }
return;
} }
this.loginEmailService.clearValues();
await this.router.navigate(["vault"]);
} }
protected async launchSsoBrowserWindow(clientId: "browser" | "desktop"): Promise<void> { protected async launchSsoBrowserWindow(clientId: "browser" | "desktop"): Promise<void> {
@@ -312,11 +310,6 @@ export class LoginComponent implements OnInit, OnDestroy {
return; return;
} }
} }
/* TODO-rr-bw: these two lines are also used at the end of the submit method for
Browser/Desktop. See if you can consolidate for all 3 clients. */
this.loginEmailService.clearValues();
await this.router.navigate(["vault"]);
} }
protected showCaptcha(): boolean { protected showCaptcha(): boolean {