Merge pull request #6 from goedemiddag/attestation-rewrite

More deprecations fixed
goedemiddag · Nov 2, 2023 · fbc844f · fbc844f
2 parents 2cad58b + ab35e12
commit fbc844f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/Eloquent/ManagesCredentialRepository.php b/src/Eloquent/ManagesCredentialRepository.php
@@ -3,6 +3,7 @@
 namespace DarkGhostHunter\Larapass\Eloquent;
 
 use Base64Url\Base64Url;
+use Symfony\Component\Uid\Uuid;
 use Webauthn\PublicKeyCredentialDescriptor as CredentialDescriptor;
 use Webauthn\PublicKeyCredentialSource as CredentialSource;
 use Webauthn\PublicKeyCredentialUserEntity as UserEntity;
@@ -92,7 +93,7 @@ public function toCredentialSource(): CredentialSource
             $this->transports->all(),
             $this->attestation_type,
             $this->trust_path,
-            $this->aaguid,
+            Uuid::fromString($this->aaguid->toString()),
             $this->public_key,
             $this->user_handle,
             $this->counter

diff --git a/src/LarapassServiceProvider.php b/src/LarapassServiceProvider.php
@@ -169,7 +169,7 @@ static function ($app) {
                     null,
                     $app[ExtensionOutputCheckerHandler::class],
                     $app[CoseAlgorithmManager::class],
-                    $app[CounterChecker::class],
+                    null,
                 );
             }
         );

diff --git a/src/WebAuthn/WebAuthnAssertValidator.php b/src/WebAuthn/WebAuthnAssertValidator.php
@@ -177,10 +177,10 @@ protected function makeAssertionRequest($user = null): RequestOptions
     {
         return new RequestOptions(
             random_bytes($this->bytes),
-            $this->timeout,
-            $this->relyingParty->getId(),
+            $this->relyingParty->id,
             $user ? $user->allCredentialDescriptors() : [],
             $this->verifyLogin,
+            $this->timeout,
             $this->extensions
         );
     }