mirror of
https://github.com/bitwarden/browser
synced 2025-12-19 01:33: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>
89 lines
3.4 KiB
TypeScript
89 lines
3.4 KiB
TypeScript
import { CryptoService } from "../../../platform/abstractions/crypto.service";
|
|
import { I18nService } from "../../../platform/abstractions/i18n.service";
|
|
import { Verification } from "../../../types/verification";
|
|
import { UserVerificationApiServiceAbstraction } from "../../abstractions/user-verification/user-verification-api.service.abstraction";
|
|
import { UserVerificationService as UserVerificationServiceAbstraction } from "../../abstractions/user-verification/user-verification.service.abstraction";
|
|
import { VerificationType } from "../../enums/verification-type";
|
|
import { SecretVerificationRequest } from "../../models/request/secret-verification.request";
|
|
import { VerifyOTPRequest } from "../../models/request/verify-otp.request";
|
|
|
|
/**
|
|
* Used for general-purpose user verification throughout the app.
|
|
* Use it to verify the input collected by UserVerificationComponent.
|
|
*/
|
|
export class UserVerificationService implements UserVerificationServiceAbstraction {
|
|
constructor(
|
|
private cryptoService: CryptoService,
|
|
private i18nService: I18nService,
|
|
private userVerificationApiService: UserVerificationApiServiceAbstraction
|
|
) {}
|
|
|
|
/**
|
|
* Create a new request model to be used for server-side verification
|
|
* @param verification User-supplied verification data (Master Password or OTP)
|
|
* @param requestClass The request model to create
|
|
* @param alreadyHashed Whether the master password is already hashed
|
|
*/
|
|
async buildRequest<T extends SecretVerificationRequest>(
|
|
verification: Verification,
|
|
requestClass?: new () => T,
|
|
alreadyHashed?: boolean
|
|
) {
|
|
this.validateInput(verification);
|
|
|
|
const request =
|
|
requestClass != null ? new requestClass() : (new SecretVerificationRequest() as T);
|
|
|
|
if (verification.type === VerificationType.OTP) {
|
|
request.otp = verification.secret;
|
|
} else {
|
|
request.masterPasswordHash = alreadyHashed
|
|
? verification.secret
|
|
: await this.cryptoService.hashPassword(verification.secret, null);
|
|
}
|
|
|
|
return request;
|
|
}
|
|
|
|
/**
|
|
* Used to verify the Master Password client-side, or send the OTP to the server for verification (with no other data)
|
|
* Generally used for client-side verification only.
|
|
* @param verification User-supplied verification data (Master Password or OTP)
|
|
*/
|
|
async verifyUser(verification: Verification): Promise<boolean> {
|
|
this.validateInput(verification);
|
|
|
|
if (verification.type === VerificationType.OTP) {
|
|
const request = new VerifyOTPRequest(verification.secret);
|
|
try {
|
|
await this.userVerificationApiService.postAccountVerifyOTP(request);
|
|
} catch (e) {
|
|
throw new Error(this.i18nService.t("invalidVerificationCode"));
|
|
}
|
|
} else {
|
|
const passwordValid = await this.cryptoService.compareAndUpdateKeyHash(
|
|
verification.secret,
|
|
null
|
|
);
|
|
if (!passwordValid) {
|
|
throw new Error(this.i18nService.t("invalidMasterPassword"));
|
|
}
|
|
}
|
|
return true;
|
|
}
|
|
|
|
async requestOTP() {
|
|
await this.userVerificationApiService.postAccountRequestOTP();
|
|
}
|
|
|
|
private validateInput(verification: Verification) {
|
|
if (verification?.secret == null || verification.secret === "") {
|
|
if (verification.type === VerificationType.OTP) {
|
|
throw new Error(this.i18nService.t("verificationCodeRequired"));
|
|
} else {
|
|
throw new Error(this.i18nService.t("masterPasswordRequired"));
|
|
}
|
|
}
|
|
}
|
|
}
|