mirror of
https://github.com/bitwarden/browser
synced 2025-12-17 08:43:33 +00:00
* [PM-2135] feat: create new user-verification module
* [PM-2136] feat: add ability to remove form field bottom margin
(cherry picked from commit 05925ff77ed47f3865c2aecade8271390d9e2fa6)
* [PM-2135] feat: refactor user-verification component
* [PM-2135] feat: refactor user-verification-prompt
* [PM-2135] feat: use form validation in prompt
* [PM-2135] feat: change autofocus target
* [PM-2135] chore: clean up old code
* [PM-2135] feat: allow user verification to show invalid password error
* [PM-2135] feat: hack mark as touched to get error to display
* [PM-2135] chore: move to auth
* [PM-2135] fix: hardcoded dialog buttons
* [PM-2135] feat: add onDestroy handler
* [PM-2135] fix: remove unecessary directive input
* [PM-2135] feat: add password toggle
* [PM-2135] chore: add hack comment
* [PM-2135] chore: move services to auth folder and rename
* [PM-2135] fix: show correct error messages
* [PM-2135] fix: re-add non-existant files to whitelist
I honestly don't know why the linter is complaining about this
* Fix capital letters whitelist
* [PM-2135] chore: remove rows that were mistakenly added during merge from master
* [PM-2135] chore: remove rows that were mistakenly added during merge from master
* [PM-2135] feat: disable built-in browser validations
* Revert "[PM-2135] feat: disable built-in browser validations"
This reverts commit 969f75822a.
---------
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
197 lines
6.9 KiB
TypeScript
197 lines
6.9 KiB
TypeScript
import { Directive } from "@angular/core";
|
|
import { Router } from "@angular/router";
|
|
|
|
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
|
import { PolicyService } from "@bitwarden/common/admin-console/abstractions/policy/policy.service.abstraction";
|
|
import { MasterPasswordPolicyOptions } from "@bitwarden/common/admin-console/models/domain/master-password-policy-options";
|
|
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
|
|
import { VerificationType } from "@bitwarden/common/auth/enums/verification-type";
|
|
import { ForceResetPasswordReason } from "@bitwarden/common/auth/models/domain/force-reset-password-reason";
|
|
import { PasswordRequest } from "@bitwarden/common/auth/models/request/password.request";
|
|
import { UpdateTempPasswordRequest } from "@bitwarden/common/auth/models/request/update-temp-password.request";
|
|
import { CryptoService } from "@bitwarden/common/platform/abstractions/crypto.service";
|
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
|
import { MessagingService } from "@bitwarden/common/platform/abstractions/messaging.service";
|
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
|
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
|
import { EncString } from "@bitwarden/common/platform/models/domain/enc-string";
|
|
import { SymmetricCryptoKey } from "@bitwarden/common/platform/models/domain/symmetric-crypto-key";
|
|
import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password";
|
|
import { Verification } from "@bitwarden/common/types/verification";
|
|
import { SyncService } from "@bitwarden/common/vault/abstractions/sync/sync.service.abstraction";
|
|
|
|
import { DialogServiceAbstraction } from "../../services/dialog";
|
|
|
|
import { ChangePasswordComponent as BaseChangePasswordComponent } from "./change-password.component";
|
|
|
|
@Directive()
|
|
export class UpdateTempPasswordComponent extends BaseChangePasswordComponent {
|
|
hint: string;
|
|
key: string;
|
|
enforcedPolicyOptions: MasterPasswordPolicyOptions;
|
|
showPassword = false;
|
|
reason: ForceResetPasswordReason = ForceResetPasswordReason.None;
|
|
verification: Verification = {
|
|
type: VerificationType.MasterPassword,
|
|
secret: "",
|
|
};
|
|
|
|
onSuccessfulChangePassword: () => Promise<any>;
|
|
|
|
get requireCurrentPassword(): boolean {
|
|
return this.reason === ForceResetPasswordReason.WeakMasterPassword;
|
|
}
|
|
|
|
constructor(
|
|
i18nService: I18nService,
|
|
platformUtilsService: PlatformUtilsService,
|
|
passwordGenerationService: PasswordGenerationServiceAbstraction,
|
|
policyService: PolicyService,
|
|
cryptoService: CryptoService,
|
|
messagingService: MessagingService,
|
|
private apiService: ApiService,
|
|
stateService: StateService,
|
|
private syncService: SyncService,
|
|
private logService: LogService,
|
|
private userVerificationService: UserVerificationService,
|
|
private router: Router,
|
|
dialogService: DialogServiceAbstraction
|
|
) {
|
|
super(
|
|
i18nService,
|
|
cryptoService,
|
|
messagingService,
|
|
passwordGenerationService,
|
|
platformUtilsService,
|
|
policyService,
|
|
stateService,
|
|
dialogService
|
|
);
|
|
}
|
|
|
|
async ngOnInit() {
|
|
await this.syncService.fullSync(true);
|
|
|
|
this.reason = await this.stateService.getForcePasswordResetReason();
|
|
|
|
// If we somehow end up here without a reason, go back to the home page
|
|
if (this.reason == ForceResetPasswordReason.None) {
|
|
this.router.navigate(["/"]);
|
|
return;
|
|
}
|
|
|
|
await super.ngOnInit();
|
|
}
|
|
|
|
get masterPasswordWarningText(): string {
|
|
return this.reason == ForceResetPasswordReason.WeakMasterPassword
|
|
? this.i18nService.t("updateWeakMasterPasswordWarning")
|
|
: this.i18nService.t("updateMasterPasswordWarning");
|
|
}
|
|
|
|
togglePassword(confirmField: boolean) {
|
|
this.showPassword = !this.showPassword;
|
|
document.getElementById(confirmField ? "masterPasswordRetype" : "masterPassword").focus();
|
|
}
|
|
|
|
async setupSubmitActions(): Promise<boolean> {
|
|
this.email = await this.stateService.getEmail();
|
|
this.kdf = await this.stateService.getKdfType();
|
|
this.kdfConfig = await this.stateService.getKdfConfig();
|
|
return true;
|
|
}
|
|
|
|
async submit() {
|
|
// Validation
|
|
if (!(await this.strongPassword())) {
|
|
return;
|
|
}
|
|
|
|
if (!(await this.setupSubmitActions())) {
|
|
return;
|
|
}
|
|
|
|
try {
|
|
// Create new key and hash new password
|
|
const newKey = await this.cryptoService.makeKey(
|
|
this.masterPassword,
|
|
this.email.trim().toLowerCase(),
|
|
this.kdf,
|
|
this.kdfConfig
|
|
);
|
|
const newPasswordHash = await this.cryptoService.hashPassword(this.masterPassword, newKey);
|
|
|
|
// Grab user's current enc key
|
|
const userEncKey = await this.cryptoService.getEncKey();
|
|
|
|
// Create new encKey for the User
|
|
const newEncKey = await this.cryptoService.remakeEncKey(newKey, userEncKey);
|
|
|
|
await this.performSubmitActions(newPasswordHash, newKey, newEncKey);
|
|
} catch (e) {
|
|
this.logService.error(e);
|
|
}
|
|
}
|
|
|
|
async performSubmitActions(
|
|
masterPasswordHash: string,
|
|
key: SymmetricCryptoKey,
|
|
encKey: [SymmetricCryptoKey, EncString]
|
|
) {
|
|
try {
|
|
switch (this.reason) {
|
|
case ForceResetPasswordReason.AdminForcePasswordReset:
|
|
this.formPromise = this.updateTempPassword(masterPasswordHash, encKey);
|
|
break;
|
|
case ForceResetPasswordReason.WeakMasterPassword:
|
|
this.formPromise = this.updatePassword(masterPasswordHash, encKey);
|
|
break;
|
|
}
|
|
|
|
await this.formPromise;
|
|
this.platformUtilsService.showToast(
|
|
"success",
|
|
null,
|
|
this.i18nService.t("updatedMasterPassword")
|
|
);
|
|
|
|
await this.stateService.setForcePasswordResetReason(ForceResetPasswordReason.None);
|
|
|
|
if (this.onSuccessfulChangePassword != null) {
|
|
this.onSuccessfulChangePassword();
|
|
} else {
|
|
this.messagingService.send("logout");
|
|
}
|
|
} catch (e) {
|
|
this.logService.error(e);
|
|
}
|
|
}
|
|
private async updateTempPassword(
|
|
masterPasswordHash: string,
|
|
encKey: [SymmetricCryptoKey, EncString]
|
|
) {
|
|
const request = new UpdateTempPasswordRequest();
|
|
request.key = encKey[1].encryptedString;
|
|
request.newMasterPasswordHash = masterPasswordHash;
|
|
request.masterPasswordHint = this.hint;
|
|
|
|
return this.apiService.putUpdateTempPassword(request);
|
|
}
|
|
|
|
private async updatePassword(
|
|
newMasterPasswordHash: string,
|
|
encKey: [SymmetricCryptoKey, EncString]
|
|
) {
|
|
const request = await this.userVerificationService.buildRequest(
|
|
this.verification,
|
|
PasswordRequest
|
|
);
|
|
request.masterPasswordHint = this.hint;
|
|
request.newMasterPasswordHash = newMasterPasswordHash;
|
|
request.key = encKey[1].encryptedString;
|
|
|
|
return this.apiService.postPassword(request);
|
|
}
|
|
}
|