Update type header handling when building specific JWS

Author: cicnavi

src/Federation/Factories/EntityStatementFactory.php

@@ -41,10 +41,7 @@ public function fromData(
         array $payload,
         array $header,
     ): EntityStatement {
-
-        if (!array_key_exists(ClaimsEnum::Typ->value, $header)) {
-            $header[ClaimsEnum::Typ->value] = JwtTypesEnum::EntityStatementJwt->value;
-        }
+        $header[ClaimsEnum::Typ->value] = JwtTypesEnum::EntityStatementJwt->value;
 
         return new EntityStatement(
             $this->jwsDecoratorBuilder->fromData(

src/Federation/Factories/TrustMarkDelegationFactory.php

@@ -5,6 +5,8 @@
 namespace SimpleSAML\OpenID\Federation\Factories;
 
 use SimpleSAML\OpenID\Algorithms\SignatureAlgorithmEnum;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
+use SimpleSAML\OpenID\Codebooks\JwtTypesEnum;
 use SimpleSAML\OpenID\Federation\TrustMarkDelegation;
 use SimpleSAML\OpenID\Jwk\JwkDecorator;
 use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
@@ -35,6 +37,8 @@ public function fromData(
         array $payload,
         array $header,
     ): TrustMarkDelegation {
+        $header[ClaimsEnum::Typ->value] = JwtTypesEnum::TrustMarkDelegationJwt->value;
+
         return new TrustMarkDelegation(
             $this->jwsDecoratorBuilder->fromData(
                 $signingKey,

src/Federation/Factories/TrustMarkFactory.php

@@ -5,6 +5,7 @@
 namespace SimpleSAML\OpenID\Federation\Factories;
 
 use SimpleSAML\OpenID\Algorithms\SignatureAlgorithmEnum;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
 use SimpleSAML\OpenID\Codebooks\JwtTypesEnum;
 use SimpleSAML\OpenID\Federation\TrustMark;
 use SimpleSAML\OpenID\Jwk\JwkDecorator;
@@ -40,6 +41,8 @@ public function fromData(
         array $header,
         JwtTypesEnum $expectedJwtType = JwtTypesEnum::TrustMarkJwt,
     ): TrustMark {
+        $header[ClaimsEnum::Typ->value] = $expectedJwtType;
+
         return new TrustMark(
             $this->jwsDecoratorBuilder->fromData(
                 $signingKey,

src/Jwk.php

@@ -4,18 +4,12 @@
 
 namespace SimpleSAML\OpenID;
 
-use Psr\Log\LoggerInterface;
 use SimpleSAML\OpenID\Jwk\Factories\JwkDecoratorFactory;
 
 class Jwk
 {
     protected ?JwkDecoratorFactory $jwkDecoratorFactory = null;
 
-    public function __construct(
-        protected readonly ?LoggerInterface $logger = null,
-    ) {
-    }
-
     public function jwkDecoratorFactory(): JwkDecoratorFactory
     {
         return $this->jwkDecoratorFactory ??= new JwkDecoratorFactory();

src/Jwks/Factories/SignedJwksFactory.php

@@ -5,6 +5,8 @@
 namespace SimpleSAML\OpenID\Jwks\Factories;
 
 use SimpleSAML\OpenID\Algorithms\SignatureAlgorithmEnum;
+use SimpleSAML\OpenID\Codebooks\ClaimsEnum;
+use SimpleSAML\OpenID\Codebooks\JwtTypesEnum;
 use SimpleSAML\OpenID\Jwk\JwkDecorator;
 use SimpleSAML\OpenID\Jwks\SignedJwks;
 use SimpleSAML\OpenID\Jws\Factories\ParsedJwsFactory;
@@ -38,6 +40,8 @@ public function fromData(
         array $payload,
         array $header,
     ): SignedJwks {
+        $header[ClaimsEnum::Typ->value] = JwtTypesEnum::JwkSetJwt->value;
+
         return new SignedJwks(
             $this->jwsDecoratorBuilder->fromData(
                 $signingKey,

src/VerifiableCredentials/Factories/JwtVcJsonFactory.php

@@ -35,6 +35,9 @@ public function fromData(
         array $payload,
         array $header,
     ): JwtVcJson {
+        // TODO mivanci Set type header
+//        $header[ClaimsEnum::Typ->value] = JwtTypesEnum::->value;
+
         return new JwtVcJson(
             $this->jwsDecoratorBuilder->fromData(
                 $signingKey,