mirror of
https://github.com/bitwarden/browser
synced 2025-12-20 18:23:31 +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>
122 lines
4.0 KiB
TypeScript
122 lines
4.0 KiB
TypeScript
import { Component, OnDestroy, OnInit } from "@angular/core";
|
|
|
|
import { DialogServiceAbstraction } from "@bitwarden/angular/services/dialog";
|
|
import { ApiService } from "@bitwarden/common/abstractions/api.service";
|
|
import { UserVerificationService } from "@bitwarden/common/auth/abstractions/user-verification/user-verification.service.abstraction";
|
|
import { TwoFactorProviderType } from "@bitwarden/common/auth/enums/two-factor-provider-type";
|
|
import { UpdateTwoFactorAuthenticatorRequest } from "@bitwarden/common/auth/models/request/update-two-factor-authenticator.request";
|
|
import { TwoFactorAuthenticatorResponse } from "@bitwarden/common/auth/models/response/two-factor-authenticator.response";
|
|
import { AuthResponse } from "@bitwarden/common/auth/types/auth-response";
|
|
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
|
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
|
import { PlatformUtilsService } from "@bitwarden/common/platform/abstractions/platform-utils.service";
|
|
import { StateService } from "@bitwarden/common/platform/abstractions/state.service";
|
|
import { Utils } from "@bitwarden/common/platform/misc/utils";
|
|
|
|
import { TwoFactorBaseComponent } from "./two-factor-base.component";
|
|
|
|
// NOTE: There are additional options available but these are just the ones we are current using.
|
|
// See: https://github.com/neocotic/qrious#examples
|
|
interface QRiousOptions {
|
|
element: HTMLElement;
|
|
value: string;
|
|
size: number;
|
|
}
|
|
|
|
declare global {
|
|
interface Window {
|
|
QRious: new (options: QRiousOptions) => unknown;
|
|
}
|
|
}
|
|
|
|
@Component({
|
|
selector: "app-two-factor-authenticator",
|
|
templateUrl: "two-factor-authenticator.component.html",
|
|
})
|
|
export class TwoFactorAuthenticatorComponent
|
|
extends TwoFactorBaseComponent
|
|
implements OnInit, OnDestroy
|
|
{
|
|
type = TwoFactorProviderType.Authenticator;
|
|
key: string;
|
|
token: string;
|
|
formPromise: Promise<TwoFactorAuthenticatorResponse>;
|
|
|
|
override componentName = "app-two-factor-authenticator";
|
|
private qrScript: HTMLScriptElement;
|
|
|
|
constructor(
|
|
apiService: ApiService,
|
|
i18nService: I18nService,
|
|
userVerificationService: UserVerificationService,
|
|
platformUtilsService: PlatformUtilsService,
|
|
logService: LogService,
|
|
private stateService: StateService,
|
|
dialogService: DialogServiceAbstraction
|
|
) {
|
|
super(
|
|
apiService,
|
|
i18nService,
|
|
platformUtilsService,
|
|
logService,
|
|
userVerificationService,
|
|
dialogService
|
|
);
|
|
this.qrScript = window.document.createElement("script");
|
|
this.qrScript.src = "scripts/qrious.min.js";
|
|
this.qrScript.async = true;
|
|
}
|
|
|
|
ngOnInit() {
|
|
window.document.body.appendChild(this.qrScript);
|
|
}
|
|
|
|
ngOnDestroy() {
|
|
window.document.body.removeChild(this.qrScript);
|
|
}
|
|
|
|
auth(authResponse: AuthResponse<TwoFactorAuthenticatorResponse>) {
|
|
super.auth(authResponse);
|
|
return this.processResponse(authResponse.response);
|
|
}
|
|
|
|
submit() {
|
|
if (this.enabled) {
|
|
return super.disable(this.formPromise);
|
|
} else {
|
|
return this.enable();
|
|
}
|
|
}
|
|
|
|
protected async enable() {
|
|
const request = await this.buildRequestModel(UpdateTwoFactorAuthenticatorRequest);
|
|
request.token = this.token;
|
|
request.key = this.key;
|
|
|
|
return super.enable(async () => {
|
|
this.formPromise = this.apiService.putTwoFactorAuthenticator(request);
|
|
const response = await this.formPromise;
|
|
await this.processResponse(response);
|
|
});
|
|
}
|
|
|
|
private async processResponse(response: TwoFactorAuthenticatorResponse) {
|
|
this.token = null;
|
|
this.enabled = response.enabled;
|
|
this.key = response.key;
|
|
const email = await this.stateService.getEmail();
|
|
window.setTimeout(() => {
|
|
new window.QRious({
|
|
element: document.getElementById("qr"),
|
|
value:
|
|
"otpauth://totp/Bitwarden:" +
|
|
Utils.encodeRFC3986URIComponent(email) +
|
|
"?secret=" +
|
|
encodeURIComponent(this.key) +
|
|
"&issuer=Bitwarden",
|
|
size: 160,
|
|
});
|
|
}, 100);
|
|
}
|
|
}
|