Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-25 12:15:18 +01:00
Code Issues Projects Releases Wiki Activity

update types and naming convention for new method in fido2-client.service

Browse Source
This commit is contained in:
jng 2023-08-21 13:50:57 -04:00
parent 3115c0d2a1
commit 1f5499b9bb
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libs/common/src/vault/services/fido2/fido2-client.service.ts
View File

@ -1,4 +1,5 @@
import { parse } from "tldts"; import { parse } from "tldts";
import { IResult } from "tldts-core";
import { FeatureFlag } from "../../../enums/feature-flag.enum"; import { FeatureFlag } from "../../../enums/feature-flag.enum";
import { ConfigServiceAbstraction } from "../../../platform/abstractions/config/config.service.abstraction"; import { ConfigServiceAbstraction } from "../../../platform/abstractions/config/config.service.abstraction";
@ -34,9 +35,14 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
private logService?: LogService private logService?: LogService
) {} ) {}
errorCheckHandler(params: any, enableFido2VaultCredentials: boolean, parsedOrigin: any) { private verifyCredentialRequest(
params: CreateCredentialParams | AssertCredentialParams,
enableFido2VaultCredentials: boolean,
parsedOrigin: IResult
) {
const { sameOriginWithAncestors, origin } = params; const { sameOriginWithAncestors, origin } = params;
const rpId = params.rpId ?? params.rp.id ?? parsedOrigin.hostname; const rpId =
"rpId" in params ? params.rpId : "rp" in params ? params.rp.id : parsedOrigin.hostname;
if (!enableFido2VaultCredentials) { if (!enableFido2VaultCredentials) {
this.logService?.warning(`[Fido2Client] Fido2VaultCredential is not enabled`); this.logService?.warning(`[Fido2Client] Fido2VaultCredential is not enabled`);
@ -76,7 +82,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
const enableFido2VaultCredentials = await this.isFido2FeatureEnabled(); const enableFido2VaultCredentials = await this.isFido2FeatureEnabled();
const rpId = params.rp.id ?? parsedOrigin.hostname; const rpId = params.rp.id ?? parsedOrigin.hostname;
this.errorCheckHandler(params, enableFido2VaultCredentials, parsedOrigin); this.verifyCredentialRequest(params, enableFido2VaultCredentials, parsedOrigin);
const userId = Fido2Utils.stringToBuffer(user.id); const userId = Fido2Utils.stringToBuffer(user.id);
if (userId.length < 1 || userId.length > 64) { if (userId.length < 1 || userId.length > 64) {
@ -205,7 +211,7 @@ export class Fido2ClientService implements Fido2ClientServiceAbstraction {
const rpId = params.rpId ?? parsedOrigin.hostname; const rpId = params.rpId ?? parsedOrigin.hostname;
const enableFido2VaultCredentials = await this.isFido2FeatureEnabled(); const enableFido2VaultCredentials = await this.isFido2FeatureEnabled();
this.errorCheckHandler(params, enableFido2VaultCredentials, parsedOrigin); this.verifyCredentialRequest(params, enableFido2VaultCredentials, parsedOrigin);
const { domain: effectiveDomain } = parsedOrigin; const { domain: effectiveDomain } = parsedOrigin;
if (effectiveDomain == undefined) { if (effectiveDomain == undefined) {