Update VcSdJwtFactory

Author: cicnavi

src/VerifiableCredentials.php

@@ -251,6 +251,7 @@ public function vcSdJwtFactory(): VcSdJwtFactory
             $this->timestampValidationLeewayDecorator,
             $this->helpers(),
             $this->claimFactory(),
+            $this->disclosureFactory(),
         );
     }
 

src/VerifiableCredentials/VcDataModel2/Factories/VcSdJwtFactory.php

@@ -6,12 +6,15 @@
 
 use SimpleSAML\OpenID\Algorithms\SignatureAlgorithmEnum;
 use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
+use SimpleSAML\OpenID\Codebooks\HashAlgorithmsEnum;
 use SimpleSAML\OpenID\Codebooks\JwtTypesEnum;
 use SimpleSAML\OpenID\Jwk\JwkDecorator;
-use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
+use SimpleSAML\OpenID\SdJwt\DisclosureBag;
+use SimpleSAML\OpenID\SdJwt\Factories\SdJwtFactory;
+use SimpleSAML\OpenID\SdJwt\KbJwt;
 use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel2\VcSdJwt;
 
-class VcSdJwtFactory extends ParsedJwsFactory
+class VcSdJwtFactory extends SdJwtFactory
 {
     public function fromToken(string $token): VcSdJwt
     {
@@ -31,14 +34,25 @@ public function fromToken(string $token): VcSdJwt
      * @param array<non-empty-string,mixed> $payload
      * @param array<non-empty-string,mixed> $header
      * @throws \SimpleSAML\OpenID\Exceptions\JwsException
+     * @throws \SimpleSAML\OpenID\Exceptions\OpenIdException
      */
     public function fromData(
         JwkDecorator $signingKey,
         SignatureAlgorithmEnum $signatureAlgorithm,
         array $payload,
         array $header,
+        ?DisclosureBag $disclosureBag = null,
+        ?KbJwt $kbJwt = null,
+        JwtTypesEnum $jwtTypesEnum = JwtTypesEnum::VcSdJwt,
+        HashAlgorithmsEnum $hashAlgorithmsEnum = HashAlgorithmsEnum::SHA_256,
     ): VcSdJwt {
-        $header[ClaimsEnum::Typ->value] = JwtTypesEnum::VcSdJwt->value;
+        $header[ClaimsEnum::Typ->value] = $jwtTypesEnum->value;
+
+        if ($disclosureBag instanceof DisclosureBag) {
+            $payload = $this->updatePayloadWithDisclosures($payload, $disclosureBag, $hashAlgorithmsEnum);
+        }
+
+        /** @var array<non-empty-string,mixed> $payload */
 
         return new VcSdJwt(
             $this->jwsDecoratorBuilder->fromData(
@@ -53,6 +67,8 @@ public function fromData(
             $this->timestampValidationLeeway,
             $this->helpers,
             $this->claimFactory,
+            $disclosureBag,
+            $kbJwt,
         );
     }
 }

tests/src/VerifiableCredentials/VcDataModel2/Factories/VcSdJwtFactoryTest.php

@@ -16,17 +16,19 @@
 use SimpleSAML\OpenID\Helpers;
 use SimpleSAML\OpenID\Jwk\JwkDecorator;
 use SimpleSAML\OpenID\Jwks\Factories\JwksDecoratorFactory;
-use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
 use SimpleSAML\OpenID\Jws\JwsDecorator;
 use SimpleSAML\OpenID\Jws\JwsDecoratorBuilder;
 use SimpleSAML\OpenID\Jws\JwsVerifierDecorator;
 use SimpleSAML\OpenID\Jws\ParsedJws;
+use SimpleSAML\OpenID\SdJwt\DisclosureBag;
+use SimpleSAML\OpenID\SdJwt\Factories\DisclosureFactory;
+use SimpleSAML\OpenID\SdJwt\Factories\SdJwtFactory;
 use SimpleSAML\OpenID\Serializers\JwsSerializerManagerDecorator;
 use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel2\Factories\VcSdJwtFactory;
 use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel2\VcSdJwt;
 
 #[CoversClass(VcSdJwtFactory::class)]
-#[UsesClass(ParsedJwsFactory::class)]
+#[UsesClass(SdJwtFactory::class)]
 #[UsesClass(VcSdJwt::class)]
 #[UsesClass(ParsedJws::class)]
 #[UsesClass(DateIntervalDecorator::class)]
@@ -50,6 +52,8 @@ final class VcSdJwtFactoryTest extends TestCase
 
     protected \PHPUnit\Framework\MockObject\Stub&ClaimFactory $claimFactoryMock;
 
+    protected \PHPUnit\Framework\MockObject\Stub&DisclosureFactory $disclosureFactoryMock;
+
 
     protected function setUp(): void
     {
@@ -60,6 +64,7 @@ protected function setUp(): void
         $this->dateIntervalDecorator = new DateIntervalDecorator(new \DateInterval('PT0S'));
         $this->helpers = new Helpers();
         $this->claimFactoryMock = $this->createStub(ClaimFactory::class);
+        $this->disclosureFactoryMock = $this->createStub(DisclosureFactory::class);
     }
 
 
@@ -73,6 +78,7 @@ protected function sut(): VcSdJwtFactory
             $this->dateIntervalDecorator,
             $this->helpers,
             $this->claimFactoryMock,
+            $this->disclosureFactoryMock,
         );
     }
 
@@ -147,4 +153,43 @@ public function testCanBuildFromData(): void
             ),
         );
     }
+
+
+    public function testCanBuildFromDataWithDisclosureBag(): void
+    {
+        $signingKey = $this->createStub(JwkDecorator::class);
+        $signatureAlgorithm = SignatureAlgorithmEnum::RS256;
+        $payload = ['foo' => 'bar'];
+        $header = ['alg' => 'RS256'];
+        $disclosureBag = $this->createStub(DisclosureBag::class);
+        $disclosureBag->method('all')->willReturn([]);
+
+        $jwsDecoratorMock = $this->createJwsDecoratorMock($payload);
+
+        $this->jwsDecoratorBuilderMock
+            ->expects($this->once())
+            ->method('fromData')
+            ->with(
+                $signingKey,
+                $signatureAlgorithm,
+                $payload,
+                $this->callback(function (array $header): true {
+                    $this->assertArrayHasKey(ClaimsEnum::Typ->value, $header);
+                    $this->assertSame(JwtTypesEnum::VcSdJwt->value, $header[ClaimsEnum::Typ->value]);
+                    return true;
+                }),
+            )
+            ->willReturn($jwsDecoratorMock);
+
+        $vcSdJwt = $this->sut()->fromData(
+            $signingKey,
+            $signatureAlgorithm,
+            $payload,
+            $header,
+            $disclosureBag,
+        );
+
+        $this->assertInstanceOf(VcSdJwt::class, $vcSdJwt);
+        $this->assertSame($disclosureBag, $vcSdJwt->getDisclosureBag());
+    }
 }