bitwarden/web
1
0
Fork 0
mirror of https://github.com/bitwarden/web synced 2026-01-17 07:53:15 +00:00
Code Issues Releases Wiki Activity

[KeyConnector] Add support for key connector OTP (#1256)

Browse Source 
Co-authored-by: Thomas Rittson <trittson@bitwarden.com>
This commit is contained in:
Oscar Hinton
2021-11-09 19:24:26 +01:00
committed by GitHub
parent e5eb5d61fe
commit db5a8df64e
46 changed files with 473 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/app/settings/two-factor-verify.component.ts
View File

@@ -5,16 +5,14 @@ import {
Output,
} from '@angular/core';
import { ToasterService } from 'angular2-toaster';
import { TwoFactorProviderType } from 'jslib-common/enums/twoFactorProviderType';
import { VerificationType } from 'jslib-common/enums/verificationType';
import { ApiService } from 'jslib-common/abstractions/api.service';
import { CryptoService } from 'jslib-common/abstractions/crypto.service';
import { I18nService } from 'jslib-common/abstractions/i18n.service';
import { LogService } from 'jslib-common/abstractions/log.service';
import { UserVerificationService } from 'jslib-common/abstractions/userVerification.service';
import { PasswordVerificationRequest } from 'jslib-common/models/request/passwordVerificationRequest';
import { Verification } from 'jslib-common/types/verification';
@Component({
selector: 'app-two-factor-verify',
@@ -25,25 +23,14 @@ export class TwoFactorVerifyComponent {
@Input() organizationId: string;
@Output() onAuthed = new EventEmitter<any>();
masterPassword: string;
secret: Verification;
formPromise: Promise<any>;
private masterPasswordHash: string;
constructor(private apiService: ApiService, private i18nService: I18nService,
private toasterService: ToasterService, private cryptoService: CryptoService,
private logService: LogService) { }
constructor(private apiService: ApiService, private logService: LogService,
private userVerificationService: UserVerificationService) { }
async submit() {
if (this.masterPassword == null || this.masterPassword === '') {
this.toasterService.popAsync('error', this.i18nService.t('errorOccurred'),
this.i18nService.t('masterPassRequired'));
return;
}
const request = new PasswordVerificationRequest();
request.masterPasswordHash = this.masterPasswordHash =
await this.cryptoService.hashPassword(this.masterPassword, null);
const request = await this.userVerificationService.buildRequest(this.secret);
try {
switch (this.type) {
@@ -75,7 +62,10 @@ export class TwoFactorVerifyComponent {
const response = await this.formPromise;
this.onAuthed.emit({
response: response,
masterPasswordHash: this.masterPasswordHash,
secret: this.secret.type === VerificationType.MasterPassword
? request.masterPasswordHash
: request.otp,
verificationType: this.secret.type,
});
} catch (e) {
this.logService.error(e);