mirror of
https://github.com/bitwarden/browser
synced 2026-02-17 09:59:41 +00:00
[PM-30443][FIX] Pass more inclusive user verification Boolean to setAbortTimeout (#15027)
* [FIX] Pass more inclusive user verification Boolean to `setAbortTimeout` * Update `setAbortTimeout` user verification parameter type * Fix lint issue --------- Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com> Co-authored-by: Daniel James Smith <djsmith85@users.noreply.github.com>
This commit is contained in:
@@ -30,7 +30,6 @@ import {
|
||||
Fido2ClientService as Fido2ClientServiceAbstraction,
|
||||
PublicKeyCredentialParam,
|
||||
UserRequestedFallbackAbortReason,
|
||||
UserVerification,
|
||||
} from "../../abstractions/fido2/fido2-client.service.abstraction";
|
||||
import { LogService } from "../../abstractions/log.service";
|
||||
import { Utils } from "../../misc/utils";
|
||||
@@ -195,7 +194,7 @@ export class Fido2ClientService<
|
||||
}
|
||||
const timeoutSubscription = this.setAbortTimeout(
|
||||
abortController,
|
||||
params.authenticatorSelection?.userVerification,
|
||||
makeCredentialParams.requireUserVerification,
|
||||
params.timeout,
|
||||
);
|
||||
|
||||
@@ -318,7 +317,7 @@ export class Fido2ClientService<
|
||||
|
||||
const timeoutSubscription = this.setAbortTimeout(
|
||||
abortController,
|
||||
params.userVerification,
|
||||
getAssertionParams.requireUserVerification,
|
||||
params.timeout,
|
||||
);
|
||||
|
||||
@@ -441,13 +440,13 @@ export class Fido2ClientService<
|
||||
|
||||
private setAbortTimeout = (
|
||||
abortController: AbortController,
|
||||
userVerification?: UserVerification,
|
||||
requireUserVerification: boolean,
|
||||
timeout?: number,
|
||||
): Subscription => {
|
||||
let clampedTimeout: number;
|
||||
|
||||
const { WITH_VERIFICATION, NO_VERIFICATION } = this.TIMEOUTS;
|
||||
if (userVerification === "required") {
|
||||
if (requireUserVerification) {
|
||||
timeout = timeout ?? WITH_VERIFICATION.DEFAULT;
|
||||
clampedTimeout = Math.max(WITH_VERIFICATION.MIN, Math.min(timeout, WITH_VERIFICATION.MAX));
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user