Fix integration from main

Firehed · Nov 21, 2023 · 85dce33 · 85dce33
1 parent 10ba0cf
commit 85dce33
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/Codecs/Credential.php b/src/Codecs/Credential.php
@@ -296,9 +296,10 @@ private function decodeV2(BinaryString $bytes): CredentialInterface
             $rawAo = $bytes->read($aoLength);
             $cdj = new BinaryString($bytes->read($cdjLength));
             $ao = new AttestationObject(new BinaryString($rawAo));
+            $attestation = [$ao, $cdj];
         } else {
             // Uhh??
-            $ao = $cdj = null;
+            $attestation = null;
         }
 
         return new CredentialV2(
@@ -310,8 +311,7 @@ private function decodeV2(BinaryString $bytes): CredentialInterface
             isBackupEligible: $BE,
             isBackedUp: $BS,
             coseKey: new COSEKey(new BinaryString($cbor)),
-            ao: $ao,
-            attestationCDJ: $cdj,
+            attestation: $attestation,
         );
     }
 }
diff --git a/src/CreateResponse.php b/src/CreateResponse.php
@@ -171,8 +171,7 @@ public function verify(
             transports: $this->transports,
             isBackupEligible: $authData->isBackupEligible(),
             isBackedUp: $authData->isBackedUp(),
-            ao: $this->ao,
-            attestationCDJ: $this->clientDataJson,
+            attestation: [$this->ao, $this->clientDataJson],
         );
 
         // This is not part of the official procedure, but serves as a general