Add some debuging

Author: cicnavi

src/Controllers/VerifiableCredentials/CredentialIssuerCredentialController.php

@@ -524,13 +524,20 @@ public function credential(Request $request): Response
         // Get valid claim paths so we can check if the user attribute is allowed to be included in the credential,
         // as per the credential configuration supported configuration.
         $validClaimPaths = $this->moduleConfig->getVciValidCredentialClaimPathsFor($resolvedCredentialIdentifier);
-
+        $this->loggerService->debug(
+            'CredentialIssuerCredentialController::credential: Valid claim paths for credential configuration ',
+            ['validClaimPaths' => $validClaimPaths],
+        );
         // Map user attributes to credential claims
         $credentialSubject = []; // For JwtVcJson
         $disclosureBag = $this->verifiableCredentials->disclosureBagFactory()->build(); // For DcSdJwt
         $attributeToCredentialClaimPathMap = $this->moduleConfig->getVciUserAttributeToCredentialClaimPathMapFor(
             $resolvedCredentialIdentifier,
         );
+        $this->loggerService->debug(
+            'CredentialIssuerCredentialController::credential: Attribute to credential claim path map',
+            ['attributeToCredentialClaimPathMap' => $attributeToCredentialClaimPathMap],
+        );
         foreach ($attributeToCredentialClaimPathMap as $mapEntry) {
             if (!is_array($mapEntry)) {
                 $this->loggerService->warning(
@@ -542,6 +549,11 @@ public function credential(Request $request): Response
                 continue;
             }
 
+            $this->loggerService->debug(
+                'Map entry: ',
+                ['mapEntry' => $mapEntry],
+            );
+
             $userAttributeName = key($mapEntry);
             if (!is_string($userAttributeName)) {
                 $this->loggerService->warning(
@@ -553,6 +565,10 @@ public function credential(Request $request): Response
                 continue;
             }
 
+            $this->loggerService->debug(
+                'User attribute name: ' . $userAttributeName,
+            );
+
             /** @psalm-suppress MixedAssignment */
             $credentialClaimPath = current($mapEntry);
             if (!is_array($credentialClaimPath)) {
@@ -574,6 +590,11 @@ public function credential(Request $request): Response
                 continue;
             }
 
+            $this->loggerService->debug(
+                'Credential claim path',
+                ['credentialClaimPath' => $credentialClaimPath],
+            );
+
             if (!isset($userAttributes[$userAttributeName])) {
                 $this->loggerService->warning(
                     'Attribute "%s" does not exist in user attributes.',
@@ -590,6 +611,7 @@ public function credential(Request $request): Response
             $userAttributes[$userAttributeName];
 
             if ($credentialFormatId === CredentialFormatIdentifiersEnum::JwtVcJson->value) {
+                $this->loggerService->debug('JwtVcJson format detected, adding user attribute to credential subject.');
                 $this->verifiableCredentials->helpers()->arr()->setNestedValue(
                     $credentialSubject,
                     $attributeValue,
@@ -598,6 +620,11 @@ public function credential(Request $request): Response
             }
 
             if (in_array($credentialFormatId, self::SD_JWT_FORMAT_IDS, true)) {
+                $this->loggerService->debug(
+                    'CredentialIssuerCredentialController::credential: Processing SD JWT credential format ID '
+                    . $credentialFormatId,
+                );
+
                 // For now, we will only support disclosures for object properties.
                 $claimName = array_pop($credentialClaimPath);
                 if (!is_string($claimName)) {
@@ -611,8 +638,17 @@ public function credential(Request $request): Response
                     continue;
                 }
 
-                if ($credentialFormatId === CredentialFormatIdentifiersEnum::VcSdJwt->value) {
+                $this->loggerService->debug('Claim name: ' . $claimName);
+
+                if (
+                    $credentialFormatId === CredentialFormatIdentifiersEnum::VcSdJwt->value &&
+                    !in_array(ClaimsEnum::Credential_Subject->value, $credentialClaimPath, true)
+                ) {
+                    $this->loggerService->debug('VC SD JWT - adding credential subject to claim path for claim "%s".');
                     array_unshift($credentialClaimPath, ClaimsEnum::Credential_Subject->value);
+                    $this->loggerService->debug(
+                        'Credential claim path for credential subject: ' . print_r($credentialClaimPath, true),
+                    );
                 }
 
                 /** @psalm-suppress ArgumentTypeCoercion */
@@ -722,14 +758,16 @@ public function credential(Request $request): Response
             // Always start with the VCDM 2.0 base context URL (mandatory).
             $atContext = [AtContextsEnum::W3OrgNsCredentialsV2->value];
 
-            // If a JSON-LD context document is configured for this credential, append the module-hosted
-            // context URL so that verifiers can resolve the custom credential subject terms.
+            // If a JSON-LD context document is configured for this credential,
+            // append the module-hosted context URL so that verifiers can
+            // resolve the custom credential subject terms.
             if ($this->moduleConfig->getVciCredentialJsonLdContextFor($resolvedCredentialIdentifier) !== null) {
                 $atContext[] = $this->routes->urlCredentialJsonLdContext($resolvedCredentialIdentifier);
             }
 
-            // Append any additional context URLs declared in the credential configuration's @context field
-            // (skipping the base W3C URL, which is already first in the list).
+            // Append any additional context URLs declared in the credential
+            // configuration's @context field (skipping the base W3C URL,
+            // which is already first in the list).
             /** @psalm-suppress MixedAssignment */
             $configuredContexts = $resolvedCredentialConfiguration[ClaimsEnum::AtContext->value] ?? [];
             if (is_array($configuredContexts)) {
@@ -776,6 +814,7 @@ public function credential(Request $request): Response
                 [
                     ClaimsEnum::Kid->value => $issuerDid . '#0',
                 ],
+                disclosureBag: $disclosureBag,
             );
         }