Fix base AtContext

Author: cicnavi

src/Codebooks/AtContextsEnum.php

@@ -7,4 +7,6 @@
 enum AtContextsEnum: string
 {
     case W3Org2018CredentialsV1 = 'https://www.w3.org/2018/credentials/v1';
+
+    case W3OrgNsCredentialsV2 = 'https://www.w3.org/ns/credentials/v2';
 }

src/Factories/ClaimFactory.php

@@ -11,13 +11,16 @@
 use SimpleSAML\OpenID\ValueAbstracts\GenericClaim;
 use SimpleSAML\OpenID\ValueAbstracts\JwksClaim;
 use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Factories\VcDataModelClaimFactory;
+use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel2\Factories\VcDataModel2ClaimFactory;
 
 class ClaimFactory
 {
     protected FederationClaimFactory $federationClaimFactory;
 
     protected VcDataModelClaimFactory $vcDataModelClaimFactory;
 
+    protected VcDataModel2ClaimFactory $vcDataModel2ClaimFactory;
+
 
     public function __construct(
         protected readonly Helpers $helpers,
@@ -43,6 +46,15 @@ public function forVcDataModel(): VcDataModelClaimFactory
     }
 
 
+    public function forVcDataModel2(): VcDataModel2ClaimFactory
+    {
+        return $this->vcDataModel2ClaimFactory ??= new VcDataModel2ClaimFactory(
+            $this->helpers,
+            $this,
+        );
+    }
+
+
     /**
      * @throws \SimpleSAML\OpenID\Exceptions\InvalidValueException
      */

src/VerifiableCredentials/VcDataModel/Claims/VcAtContextClaimValue.php

@@ -18,11 +18,12 @@ class VcAtContextClaimValue implements ClaimInterface
     public function __construct(
         protected readonly string $baseContext,
         protected readonly array $otherContexts,
+        AtContextsEnum $expectedBaseContext = AtContextsEnum::W3Org2018CredentialsV1,
     ) {
-        if ($this->baseContext !== AtContextsEnum::W3Org2018CredentialsV1->value) {
+        if ($this->baseContext !== $expectedBaseContext->value) {
             throw new VcDataModelException(sprintf(
                 'Invalid VC @context claim. Base context should be %s, %s given.',
-                AtContextsEnum::W3Org2018CredentialsV1->value,
+                $expectedBaseContext->value,
                 $this->baseContext,
             ));
         }
@@ -64,7 +65,7 @@ public function getName(): string
      */
     public function getValue(): array
     {
-        return[
+        return [
             $this->baseContext,
             ...$this->otherContexts,
         ];

src/VerifiableCredentials/VcDataModel2/Claims/ValidFromClaimValue.php

@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\OpenID\VerifiableCredentials\VcDataModel2\Factories;
+
+use SimpleSAML\OpenID\Codebooks\AtContextsEnum;
+use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Claims\VcAtContextClaimValue;
+use SimpleSAML\OpenID\VerifiableCredentials\VcDataModel\Factories\VcDataModelClaimFactory;
+
+class VcDataModel2ClaimFactory extends VcDataModelClaimFactory
+{
+    /**
+     * @param mixed[] $otherContexts
+     * @throws \SimpleSAML\OpenID\Exceptions\VcDataModelException
+     */
+    public function buildVcAtContextClaimValue(string $baseContext, array $otherContexts): VcAtContextClaimValue
+    {
+        return new VcAtContextClaimValue($baseContext, $otherContexts, AtContextsEnum::W3OrgNsCredentialsV2);
+    }
+}

src/VerifiableCredentials/VcDataModel2/Claims/ValidUntilClaimValue.php

@@ -97,7 +97,7 @@ public function getVcAtContext(): VcAtContextClaimValue
             throw new VcDataModelException('Invalid @context claim.');
         }
 
-        return $this->vcAtContextClaimValue = $this->claimFactory->forVcDataModel()->buildVcAtContextClaimValue(
+        return $this->vcAtContextClaimValue = $this->claimFactory->forVcDataModel2()->buildVcAtContextClaimValue(
             $baseContext,
             $vcContext,
         );
@@ -140,7 +140,7 @@ public function getVcType(): TypeClaimValue
             throw new VcDataModelException('Invalid Type claim.');
         }
 
-        return $this->vcTypeClaimValue = $this->claimFactory->forVcDataModel()->buildTypeClaimValue($vcType);
+        return $this->vcTypeClaimValue = $this->claimFactory->forVcDataModel2()->buildTypeClaimValue($vcType);
     }
 
 
@@ -161,7 +161,7 @@ public function getVcCredentialSubject(): VcCredentialSubjectClaimBag
             throw new VcDataModelException('Invalid Credential Subject claim.');
         }
 
-        return $this->vcCredentialSubjectClaimBag = $this->claimFactory->forVcDataModel()
+        return $this->vcCredentialSubjectClaimBag = $this->claimFactory->forVcDataModel2()
             ->buildVcCredentialSubjectClaimBag(
                 $vcCredentialSubject,
                 $this->getSubject(),
@@ -192,13 +192,13 @@ public function getVcIssuer(): VcIssuerClaimValue
         }
 
         if (is_string($vcIssuer)) {
-            return $this->vcIssuerClaimValue = $this->claimFactory->forVcDataModel()->buildVcIssuerClaimValue(
+            return $this->vcIssuerClaimValue = $this->claimFactory->forVcDataModel2()->buildVcIssuerClaimValue(
                 [ClaimsEnum::Id->value => $vcIssuer],
             );
         }
 
         if (is_array($vcIssuer)) {
-            return $this->vcIssuerClaimValue = $this->claimFactory->forVcDataModel()->buildVcIssuerClaimValue(
+            return $this->vcIssuerClaimValue = $this->claimFactory->forVcDataModel2()->buildVcIssuerClaimValue(
                 $vcIssuer,
             );
         }
@@ -233,14 +233,15 @@ public function getValidFrom(): DateTimeImmutable
                     throw new VcDataModelException('Invalid Not Before or Issued At claim.', $e->getCode(), $e);
                 }
             }
+
             throw new VcDataModelException('Valid From claim is missing.');
         }
 
         try {
             $validFromStr = $this->helpers->type()->ensureNonEmptyString($validFrom, ClaimsEnum::ValidFrom->value);
             return $this->validFrom = $this->helpers->dateTime()->fromXsDateTime($validFromStr);
-        } catch (Exception $e) {
-            throw new VcDataModelException('Invalid Valid From claim.', (int) $e->getCode(), $e);
+        } catch (Exception $exception) {
+            throw new VcDataModelException('Invalid Valid From claim.', (int) $exception->getCode(), $exception);
         }
     }
 
@@ -287,15 +288,16 @@ public function getValidUntil(): ?DateTimeImmutable
                     throw new VcDataModelException('Invalid Expiration Time claim.', $e->getCode(), $e);
                 }
             }
+
             $this->validUntil = false;
             return null;
         }
 
         try {
             $validUntilStr = $this->helpers->type()->ensureNonEmptyString($validUntil, ClaimsEnum::ValidUntil->value);
             return $this->validUntil = $this->helpers->dateTime()->fromXsDateTime($validUntilStr);
-        } catch (Exception $e) {
-            throw new VcDataModelException('Invalid Valid Until claim.', (int) $e->getCode(), $e);
+        } catch (Exception $exception) {
+            throw new VcDataModelException('Invalid Valid Until claim.', (int) $exception->getCode(), $exception);
         }
     }
 
@@ -336,7 +338,7 @@ public function getVcProof(): ?VcProofClaimValue
             throw new VcDataModelException('Invalid Proof claim.');
         }
 
-        return $this->vcProofClaimValue = $this->claimFactory->forVcDataModel()->buildVcProofClaimValue($vcProof);
+        return $this->vcProofClaimValue = $this->claimFactory->forVcDataModel2()->buildVcProofClaimValue($vcProof);
     }
 
 
@@ -364,7 +366,7 @@ public function getVcCredentialStatus(): ?VcCredentialStatusClaimValue
             throw new VcDataModelException('Invalid Credential Status claim.');
         }
 
-        return $this->vcCredentialStatusClaimValue = $this->claimFactory->forVcDataModel()
+        return $this->vcCredentialStatusClaimValue = $this->claimFactory->forVcDataModel2()
             ->buildVcCredentialStatusClaimValue($vcCredentialStatus);
     }
 
@@ -393,7 +395,7 @@ public function getVcCredentialSchema(): ?VcCredentialSchemaClaimBag
             throw new VcDataModelException('Invalid Credential Schema claim.');
         }
 
-        return $this->vcCredentialSchemaClaimBag = $this->claimFactory->forVcDataModel()
+        return $this->vcCredentialSchemaClaimBag = $this->claimFactory->forVcDataModel2()
             ->buildVcCredentialSchemaClaimBag($vcCredentialSchema);
     }
 
@@ -422,7 +424,7 @@ public function getVcRefreshService(): ?VcRefreshServiceClaimBag
             throw new VcDataModelException('Invalid Refresh Service claim.');
         }
 
-        return $this->vcRefreshServiceClaimBag = $this->claimFactory->forVcDataModel()
+        return $this->vcRefreshServiceClaimBag = $this->claimFactory->forVcDataModel2()
             ->buildVcRefreshServiceClaimBag($vcRefreshService);
     }
 
@@ -451,7 +453,7 @@ public function getVcTermsOfUse(): ?VcTermsOfUseClaimBag
             throw new VcDataModelException('Invalid Terms Of Use claim.');
         }
 
-        return $this->vcTermsOfUseClaimBag = $this->claimFactory->forVcDataModel()
+        return $this->vcTermsOfUseClaimBag = $this->claimFactory->forVcDataModel2()
             ->buildVcTermsOfUseClaimBag($vcTermsOfUse);
     }
 
@@ -480,7 +482,7 @@ public function getVcEvidence(): ?VcEvidenceClaimBag
             throw new VcDataModelException('Invalid Evidence claim.');
         }
 
-        return $this->vcEvidenceClaimBag = $this->claimFactory->forVcDataModel()
+        return $this->vcEvidenceClaimBag = $this->claimFactory->forVcDataModel2()
             ->buildVcEvidenceClaimBag($vcEvidence);
     }
 }

src/VerifiableCredentials/VcDataModel2/Factories/VcDataModel2ClaimFactory.php

@@ -14,17 +14,21 @@ final class VcAtContextClaimValueTest extends TestCase
 {
     protected string $baseContext = AtContextsEnum::W3Org2018CredentialsV1->value;
 
+    protected AtContextsEnum $expectedBaseContext = AtContextsEnum::W3Org2018CredentialsV1;
+
     protected array $otherContexts = [];
 
 
     protected function sut(
         ?string $baseContext = null,
         ?array $otherContexts = null,
+        ?AtContextsEnum $expectedBaseContext = null,
     ): VcAtContextClaimValue {
         $baseContext ??= $this->baseContext;
         $otherContexts ??= $this->otherContexts;
+        $expectedBaseContext ??= $this->expectedBaseContext;
 
-        return new VcAtContextClaimValue($baseContext, $otherContexts);
+        return new VcAtContextClaimValue($baseContext, $otherContexts, $expectedBaseContext);
     }