fix: fix serialization

asbiin · Oct 1, 2023 · 0975749 · 0975749
1 parent 6c8e089
commit 0975749
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/src/Services/Webauthn/CreationOptionsFactory.php b/src/Services/Webauthn/CreationOptionsFactory.php
@@ -51,7 +51,9 @@ public function __invoke(User $user): PublicKeyCredentialCreationOptions
             ->setAuthenticatorSelection($this->authenticatorSelectionCriteria)
             ->setAttestation($this->attestationConveyance);
 
-        $this->cache->put($this->cacheKey($user), $publicKey->jsonSerialize(), $this->timeout);
+        $value = json_encode($publicKey, flags: JSON_THROW_ON_ERROR);
+
+        $this->cache->put($this->cacheKey($user), $value, $this->timeout);
 
         return $publicKey;
     }

diff --git a/src/Services/Webauthn/CredentialAssertionValidator.php b/src/Services/Webauthn/CredentialAssertionValidator.php
@@ -53,7 +53,9 @@ public function __invoke(User $user, array $data): bool
     protected function pullPublicKey(User $user): PublicKeyCredentialRequestOptions
     {
         try {
-            return PublicKeyCredentialRequestOptions::createFromArray($this->cache->pull($this->cacheKey($user)));
+            $value = json_decode($this->cache->pull($this->cacheKey($user)), true, flags: JSON_THROW_ON_ERROR);
+
+            return PublicKeyCredentialRequestOptions::createFromArray($value);
         } catch (\Exception $e) {
             app('webauthn.log')->debug('Webauthn publickKey deserialize error', ['exception' => $e]);
             abort(404);

diff --git a/src/Services/Webauthn/CredentialAttestationValidator.php b/src/Services/Webauthn/CredentialAttestationValidator.php
@@ -48,7 +48,9 @@ public function __invoke(User $user, array $data): PublicKeyCredentialSource
     protected function pullPublicKey(User $user): PublicKeyCredentialCreationOptions
     {
         try {
-            return PublicKeyCredentialCreationOptions::createFromArray($this->cache->pull($this->cacheKey($user)));
+            $value = json_decode($this->cache->pull($this->cacheKey($user)), true, flags: JSON_THROW_ON_ERROR);
+
+            return PublicKeyCredentialCreationOptions::createFromArray($value);
         } catch (\Exception $e) {
             app('webauthn.log')->debug('Webauthn publicKey deserialize error', ['exception' => $e]);
             abort(404);

diff --git a/src/Services/Webauthn/RequestOptionsFactory.php b/src/Services/Webauthn/RequestOptionsFactory.php
@@ -39,7 +39,9 @@ public function __invoke(User $user): PublicKeyCredentialRequestOptions
             ->setRpId($this->getRpId())
             ->setUserVerification($this->userVerification);
 
-        $this->cache->put($this->cacheKey($user), $publicKey->jsonSerialize(), $this->timeout);
+        $value = json_encode($publicKey, flags: JSON_THROW_ON_ERROR);
+
+        $this->cache->put($this->cacheKey($user), $value, $this->timeout);
 
         return $publicKey;
     }