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

create a defaultOnInit()

Browse Source
This commit is contained in:
rr-bw
2024-09-07 13:06:45 -07:00
parent 4f893e0769
commit e8c4217bec
1 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -113,26 +113,7 @@ export class LoginComponentV2 implements OnInit, OnDestroy {
await this.webOnInit(); await this.webOnInit();
} }
let paramEmailIsSet = false; await this.defaultOnInit();
this.activatedRoute.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
if (!params) {
return;
}
const qParamsEmail = params.email;
// If there is an email in the query params, set that email as the form field value
if (qParamsEmail?.indexOf("@") > -1) {
this.formGroup.controls.email.setValue(qParamsEmail);
paramEmailIsSet = true;
}
});
// If there is no email in the query params, attempt to load email settings from loginEmailService
if (!paramEmailIsSet) {
await this.loadEmailSettings();
}
if (this.clientType === ClientType.Web) { if (this.clientType === ClientType.Web) {
// If there's an existing org invite, use it to get the password policies // If there's an existing org invite, use it to get the password policies
@@ -362,6 +343,29 @@ export class LoginComponentV2 implements OnInit, OnDestroy {
} }
} }
private async defaultOnInit(): Promise<void> {
let paramEmailIsSet = false;
this.activatedRoute.queryParams.pipe(takeUntil(this.destroy$)).subscribe((params) => {
if (!params) {
return;
}
const qParamsEmail = params.email;
// If there is an email in the query params, set that email as the form field value
if (qParamsEmail?.indexOf("@") > -1) {
this.formGroup.controls.email.setValue(qParamsEmail);
paramEmailIsSet = true;
}
});
// If there is no email in the query params, attempt to load email settings from loginEmailService
if (!paramEmailIsSet) {
await this.loadEmailSettings();
}
}
private async webOnInit(): Promise<void> { private async webOnInit(): Promise<void> {
this.activatedRoute.queryParams.pipe(first(), takeUntil(this.destroy$)).subscribe((qParams) => { this.activatedRoute.queryParams.pipe(first(), takeUntil(this.destroy$)).subscribe((qParams) => {
// If there is a parameter called 'org', set previousUrl to `/create-organization?org=<paramValue>` // If there is a parameter called 'org', set previousUrl to `/create-organization?org=<paramValue>`