Merge branch '5.1' into 5

silverstripe · Sep 22, 2023 · d901b0b · d901b0b
2 parents 251bef6 + 7cb3de8
commit d901b0b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/RegisterHandler.php b/src/RegisterHandler.php
@@ -259,8 +259,9 @@ protected function getCredentialCreationOptions(
             $this->getUserEntity($store->getMember()),
             random_bytes(32),
             [new PublicKeyCredentialParameters('public-key', Algorithms::COSE_ALGORITHM_ES256)],
-            40000
+            $this->getAuthenticatorSelectionCriteria()
         );
+        $credentialOptions->setTimeout(40000);
         $credentialOptions->setAuthenticatorSelection($this->getAuthenticatorSelectionCriteria());
         $credentialOptions->setAttestation(PublicKeyCredentialCreationOptions::ATTESTATION_CONVEYANCE_PREFERENCE_NONE);
 

diff --git a/src/VerifyHandler.php b/src/VerifyHandler.php
@@ -185,7 +185,8 @@ protected function getCredentialRequestOptions(
             return $source->getPublicKeyCredentialDescriptor();
         }, $validCredentials ?? []);
 
-        $options = new PublicKeyCredentialRequestOptions(random_bytes(32), 40000);
+        $options = new PublicKeyCredentialRequestOptions((string) random_bytes(32));
+        $options->setTimeout(40000);
 
         $options->allowCredentials(...$descriptors);
         $options->setUserVerification(PublicKeyCredentialRequestOptions::USER_VERIFICATION_REQUIREMENT_PREFERRED);