mirror of
https://github.com/bitwarden/browser
synced 2025-12-15 07:43:35 +00:00
* Added abstractions for PolicyApiService and PolicyService * Added implementations for PolicyApiService and PolicyService * Updated all references to new PolicyApiService and PolicyService * Deleted old PolicyService abstraction and implementation * Fixed CLI import path for policy.service * Fixed main.background.ts policyApiService dependency for policyService * Ran prettier * Updated policy-api.service with the correct imports * [EC-377] Removed methods from StateService that read policies * [EC-377] Updated policy service getAll method to use observable collection * [EC-377] Added first unit tests for policy service * [EC-377] Added more unit tests for Policy Service * [EC-376] Sorted methods order in PolicyApiService * [EC-376] Removed unused clearCache method from PolicyService * [EC-376] Added upsert method to PolicyService * [EC-376] PolicyApiService putPolicy method now upserts data to PolicyService * [EC-377] Removed tests for deleted clearCache method * [EC-377] Added unit test for PolicyService.upsert * [EC-377] Updated references to state service observables * [EC-377] Removed getAll method from PolicyService and refactored components to use observable collection * [EC-377] Updated components to use concatMap instead of async subscribe * [EC-377] Removed getPolicyForOrganization from policyApiService * [EC-377] Updated policyAppliesToUser to return observable collection * [EC-377] Changed policyService.policyAppliesToUser to return observable * [EC-377] Fixed browser settings.component.ts getting vault timeout * Updated people.component.ts to get ResetPassword policy through a subscription * [EC-377] Changed passwordGenerationService.getOptions to return observable * [EC-377] Fixed CLI generate.command.ts getting enforcePasswordGeneratorPoliciesOnOptions * [EC-377] Fixed eslint errors on rxjs * [EC-377] Reverted changes on passwordGeneration.service and vaultTimeout.service * [EC-377] Removed eslint disable on web/vault/add-edit-component * [EC-377] Changed AccountData.policies to TemporaryDataEncryption * [EC-377] Updated import.component to be reactive to policyAppliesToUser$ * [EC-377] Updated importBlockedByPolicy$ * [EC-377] Fixed missing rename * [EC-377] Updated policyService.masterPasswordPolicyOptions to return observable * [EC-377] Fixed vaultTimeout imports from merge * [EC-377] Reverted call to passwordGenerationService.getOptions * [EC-377] Reverted call to enforcePasswordGeneratorPoliciesOnOptions * [EC-377] Removed unneeded ngOnDestroy * Apply suggestions from code review Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com> * [EC-377] Fixed login.component.ts and register.component.ts * [EC-377] Updated PolicyService to update vaultTimeout * [EC-377] Updated PolicyService dependencies * [EC-377] Renamed policyAppliesToUser to policyAppliesToActiveUser * [EC-377] VaultTimeoutSettings service now gets the vault timeout directly instead of using observables * [EC-377] Fixed unit tests by removing unneeded vaultTimeoutSettingsService * [EC-377] Set getDecryptedPolicies and setDecryptedPolicies as deprecated * [EC-377] Set PolicyService.getAll as deprecated and updated to use prototype.hasOwnProperty * [EC-565] Reverted unintended change to vaultTimeoutSettings that was causing a bug to not display the correct vault timeout * [EC-377] Removed unneeded destroy$ from preferences.component.ts * [EC-377] Fixed policy.service.ts import of OrganizationService Co-authored-by: Oscar Hinton <Hinton@users.noreply.github.com> Co-authored-by: mimartin12 <77340197+mimartin12@users.noreply.github.com>
221 lines
8.0 KiB
TypeScript
221 lines
8.0 KiB
TypeScript
import { Component, NgZone, OnDestroy, OnInit } from "@angular/core";
|
|
import { FormBuilder } from "@angular/forms";
|
|
import { ActivatedRoute, Router } from "@angular/router";
|
|
import { Subject, takeUntil } from "rxjs";
|
|
import { first } from "rxjs/operators";
|
|
|
|
import { LoginComponent as BaseLoginComponent } from "@bitwarden/angular/components/login.component";
|
|
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
|
import { AuthService } from "@bitwarden/common/abstractions/auth.service";
|
|
import { CryptoFunctionService } from "@bitwarden/common/abstractions/cryptoFunction.service";
|
|
import { EnvironmentService } from "@bitwarden/common/abstractions/environment.service";
|
|
import { FormValidationErrorsService } from "@bitwarden/common/abstractions/formValidationErrors.service";
|
|
import { I18nService } from "@bitwarden/common/abstractions/i18n.service";
|
|
import { LogService } from "@bitwarden/common/abstractions/log.service";
|
|
import { MessagingService } from "@bitwarden/common/abstractions/messaging.service";
|
|
import { PasswordGenerationService } from "@bitwarden/common/abstractions/passwordGeneration.service";
|
|
import { PlatformUtilsService } from "@bitwarden/common/abstractions/platformUtils.service";
|
|
import { PolicyApiServiceAbstraction } from "@bitwarden/common/abstractions/policy/policy-api.service.abstraction";
|
|
import { InternalPolicyService } from "@bitwarden/common/abstractions/policy/policy.service.abstraction";
|
|
import { PolicyData } from "@bitwarden/common/models/data/policyData";
|
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/models/domain/masterPasswordPolicyOptions";
|
|
import { Policy } from "@bitwarden/common/models/domain/policy";
|
|
import { ListResponse } from "@bitwarden/common/models/response/listResponse";
|
|
import { PolicyResponse } from "@bitwarden/common/models/response/policyResponse";
|
|
|
|
import { flagEnabled } from "../../../utils/flags";
|
|
import { RouterService, StateService } from "../../core";
|
|
|
|
@Component({
|
|
selector: "app-login",
|
|
templateUrl: "login.component.html",
|
|
})
|
|
export class LoginComponent extends BaseLoginComponent implements OnInit, OnDestroy {
|
|
showResetPasswordAutoEnrollWarning = false;
|
|
enforcedPasswordPolicyOptions: MasterPasswordPolicyOptions;
|
|
policies: ListResponse<PolicyResponse>;
|
|
showPasswordless = false;
|
|
|
|
private destroy$ = new Subject<void>();
|
|
|
|
constructor(
|
|
authService: AuthService,
|
|
router: Router,
|
|
i18nService: I18nService,
|
|
private route: ActivatedRoute,
|
|
platformUtilsService: PlatformUtilsService,
|
|
environmentService: EnvironmentService,
|
|
passwordGenerationService: PasswordGenerationService,
|
|
cryptoFunctionService: CryptoFunctionService,
|
|
private apiService: ApiService,
|
|
private policyApiService: PolicyApiServiceAbstraction,
|
|
private policyService: InternalPolicyService,
|
|
logService: LogService,
|
|
ngZone: NgZone,
|
|
protected stateService: StateService,
|
|
private messagingService: MessagingService,
|
|
private routerService: RouterService,
|
|
formBuilder: FormBuilder,
|
|
formValidationErrorService: FormValidationErrorsService
|
|
) {
|
|
super(
|
|
authService,
|
|
router,
|
|
platformUtilsService,
|
|
i18nService,
|
|
stateService,
|
|
environmentService,
|
|
passwordGenerationService,
|
|
cryptoFunctionService,
|
|
logService,
|
|
ngZone,
|
|
formBuilder,
|
|
formValidationErrorService
|
|
);
|
|
this.onSuccessfulLogin = async () => {
|
|
this.messagingService.send("setFullWidth");
|
|
};
|
|
this.onSuccessfulLoginNavigate = this.goAfterLogIn;
|
|
this.showPasswordless = flagEnabled("showPasswordless");
|
|
}
|
|
|
|
async ngOnInit() {
|
|
// eslint-disable-next-line rxjs-angular/prefer-takeuntil, rxjs/no-async-subscribe
|
|
this.route.queryParams.pipe(first()).subscribe(async (qParams) => {
|
|
if (qParams.email != null && qParams.email.indexOf("@") > -1) {
|
|
this.formGroup.get("email")?.setValue(qParams.email);
|
|
}
|
|
if (qParams.premium != null) {
|
|
this.routerService.setPreviousUrl("/settings/premium");
|
|
} else if (qParams.org != null) {
|
|
const route = this.router.createUrlTree(["create-organization"], {
|
|
queryParams: { plan: qParams.org },
|
|
});
|
|
this.routerService.setPreviousUrl(route.toString());
|
|
}
|
|
|
|
// Are they coming from an email for sponsoring a families organization
|
|
if (qParams.sponsorshipToken != null) {
|
|
const route = this.router.createUrlTree(["setup/families-for-enterprise"], {
|
|
queryParams: { token: qParams.sponsorshipToken },
|
|
});
|
|
this.routerService.setPreviousUrl(route.toString());
|
|
}
|
|
await super.ngOnInit();
|
|
const rememberEmail = await this.stateService.getRememberEmail();
|
|
this.formGroup.get("rememberEmail")?.setValue(rememberEmail);
|
|
});
|
|
|
|
const invite = await this.stateService.getOrganizationInvitation();
|
|
if (invite != null) {
|
|
let policyList: Policy[] = null;
|
|
try {
|
|
this.policies = await this.policyApiService.getPoliciesByToken(
|
|
invite.organizationId,
|
|
invite.token,
|
|
invite.email,
|
|
invite.organizationUserId
|
|
);
|
|
policyList = this.policyService.mapPoliciesFromToken(this.policies);
|
|
} catch (e) {
|
|
this.logService.error(e);
|
|
}
|
|
|
|
if (policyList != null) {
|
|
const resetPasswordPolicy = this.policyService.getResetPasswordPolicyOptions(
|
|
policyList,
|
|
invite.organizationId
|
|
);
|
|
// Set to true if policy enabled and auto-enroll enabled
|
|
this.showResetPasswordAutoEnrollWarning =
|
|
resetPasswordPolicy[1] && resetPasswordPolicy[0].autoEnrollEnabled;
|
|
|
|
this.policyService
|
|
.masterPasswordPolicyOptions$(policyList)
|
|
.pipe(takeUntil(this.destroy$))
|
|
.subscribe((enforcedPasswordPolicyOptions) => {
|
|
this.enforcedPasswordPolicyOptions = enforcedPasswordPolicyOptions;
|
|
});
|
|
}
|
|
}
|
|
}
|
|
|
|
ngOnDestroy(): void {
|
|
this.destroy$.next();
|
|
this.destroy$.complete();
|
|
}
|
|
|
|
async goAfterLogIn() {
|
|
const masterPassword = this.formGroup.value.masterPassword;
|
|
|
|
// Check master password against policy
|
|
if (this.enforcedPasswordPolicyOptions != null) {
|
|
const strengthResult = this.passwordGenerationService.passwordStrength(
|
|
masterPassword,
|
|
this.getPasswordStrengthUserInput()
|
|
);
|
|
const masterPasswordScore = strengthResult == null ? null : strengthResult.score;
|
|
|
|
// If invalid, save policies and require update
|
|
if (
|
|
!this.policyService.evaluateMasterPassword(
|
|
masterPasswordScore,
|
|
masterPassword,
|
|
this.enforcedPasswordPolicyOptions
|
|
)
|
|
) {
|
|
const policiesData: { [id: string]: PolicyData } = {};
|
|
this.policies.data.map((p) => (policiesData[p.id] = new PolicyData(p)));
|
|
await this.policyService.replace(policiesData);
|
|
this.router.navigate(["update-password"]);
|
|
return;
|
|
}
|
|
}
|
|
|
|
const previousUrl = this.routerService.getPreviousUrl();
|
|
if (previousUrl) {
|
|
this.router.navigateByUrl(previousUrl);
|
|
} else {
|
|
this.router.navigate([this.successRoute]);
|
|
}
|
|
}
|
|
|
|
async submit() {
|
|
const rememberEmail = this.formGroup.value.rememberEmail;
|
|
|
|
await this.stateService.setRememberEmail(rememberEmail);
|
|
if (!rememberEmail) {
|
|
await this.stateService.setRememberedEmail(null);
|
|
}
|
|
await super.submit(false);
|
|
}
|
|
|
|
async startPasswordlessLogin() {
|
|
this.formGroup.get("masterPassword")?.clearValidators();
|
|
this.formGroup.get("masterPassword")?.updateValueAndValidity();
|
|
|
|
if (!this.formGroup.valid) {
|
|
return;
|
|
}
|
|
|
|
const email = this.formGroup.get("email").value;
|
|
this.router.navigate(["/login-with-device"], { state: { email: email } });
|
|
}
|
|
|
|
private getPasswordStrengthUserInput() {
|
|
const email = this.formGroup.value.email;
|
|
let userInput: string[] = [];
|
|
const atPosition = email.indexOf("@");
|
|
if (atPosition > -1) {
|
|
userInput = userInput.concat(
|
|
email
|
|
.substr(0, atPosition)
|
|
.trim()
|
|
.toLowerCase()
|
|
.split(/[^A-Za-z0-9]/)
|
|
);
|
|
}
|
|
return userInput;
|
|
}
|
|
}
|