@pagopa/io-react-native-wallet 3.5.1 → 3.6.0

package/src/credential/issuance/common/06-verify-and-parse-credential.mdoc.ts

@@ -13,6 +13,12 @@ import type { IssuanceApi, IssuerConfig, ParsedCredential } from "../api";
 type CredentialConf =
   IssuerConfig["credential_configurations_supported"][string];
 
+type ClaimConfig = CredentialConf["claims"][number];
+
+type DisplayableClaim = Omit<ClaimConfig, "display"> & {
+  display: NonNullable<ClaimConfig["display"]>;
+};
+
 type DecodedMDocCredential = Out<typeof verifyMdoc> & {
   issuerSigned: CBOR.IssuerSigned;
 };
@@ -75,7 +81,13 @@ const parseCredentialMDoc = (
     throw new IoWalletError("Missing claims in the credential subject");
   }
 
-  const attrDefinitions = credentialConfig.claims.map<
+  // Claims without display property (such as `iat`, `exp`, `iss`, etc.)
+  // must be ignored as they are not meant to be displayed to the user.
+  const displayableClaims = credentialConfig.claims.filter(
+    (c) => c.display !== undefined
+  ) as DisplayableClaim[];
+
+  const attrDefinitions = displayableClaims.map<
     [string, string, { name: string; locale: string }[]]
   >(({ path: [namespace, attribute], display }) => [
     namespace as string,
@@ -183,7 +195,11 @@ export const verifyAndParseCredentialMDoc: IssuanceApi["verifyAndParseCredential
     issuerConf,
     credential,
     credentialConfigurationId,
-    { credentialCryptoContext, ignoreMissingAttributes },
+    {
+      credentialCryptoContext,
+      ignoreMissingAttributes,
+      includeUndefinedAttributes,
+    },
     x509CertRoot
   ) => {
     if (!x509CertRoot) {
@@ -204,7 +220,7 @@ export const verifyAndParseCredentialMDoc: IssuanceApi["verifyAndParseCredential
       credentialConfig,
       decoded,
       ignoreMissingAttributes,
-      ignoreMissingAttributes
+      includeUndefinedAttributes
     );
 
     const { signed, validUntil } =

package/src/credential/issuance/common/06-verify-and-parse-credential.sdjwt.ts

@@ -18,6 +18,12 @@ import type { IssuanceApi, IssuerConfig, ParsedCredential } from "../api";
 type CredentialConf =
   IssuerConfig["credential_configurations_supported"][string];
 
+type ClaimConfig = CredentialConf["claims"][number];
+
+type DisplayableClaim = Omit<ClaimConfig, "display"> & {
+  display: NonNullable<ClaimConfig["display"]>;
+};
+
 /**
  * Parse a Sd-Jwt credential according to the issuer configuration
  * @param credentialConfig - the list of supported credentials, as defined in the issuer configuration with their claims metadata
@@ -32,13 +38,17 @@ const parseCredentialSdJwt = (
   ignoreMissingAttributes: boolean = false,
   includeUndefinedAttributes: boolean = false
 ): ParsedCredential => {
-  const claimsMetadata = credentialConfig.claims || [];
+  // Claims without display property (such as `iat`, `exp`, `iss`, etc.)
+  // must be ignored as they are not meant to be displayed to the user.
+  const displayableClaims = (credentialConfig.claims || []).filter(
+    (c) => c.display !== undefined
+  ) as DisplayableClaim[];
 
   // Check that all mandatory attributes defined in the issuer configuration are present in the credential
   if (!ignoreMissingAttributes) {
     const missingPaths: string[] = [];
     const rootKeysToVerify = new Set(
-      claimsMetadata
+      displayableClaims
         .map((c) => c.path[0])
         .filter((p): p is string => typeof p === "string")
     );
@@ -64,7 +74,7 @@ const parseCredentialSdJwt = (
   const getDisplayNames = (
     path: (string | number | null)[]
   ): Record<string, string> | undefined => {
-    const match = claimsMetadata.find((c) => isPathEqual(c.path, path));
+    const match = displayableClaims.find((c) => isPathEqual(c.path, path));
     if (!match) return undefined;
 
     const nameMap: Record<string, string> = {};
@@ -99,7 +109,7 @@ const parseCredentialSdJwt = (
 
     // Identify unique keys in config at this level
     const configKeysAtThisLevel: (string | number)[] = [];
-    for (const claim of claimsMetadata) {
+    for (const claim of displayableClaims) {
       // Check if the claim path starts with the current path
       if (isPrefixOf(currentPath, claim.path)) {
         const nextPart = claim.path[currentPath.length];

package/src/credential/issuance/v1.3.3/mappers.ts

@@ -25,7 +25,7 @@ const mapCredentialConfigurationsSupported = (
         claims:
           config.credential_metadata.claims?.map((claim) => ({
             path: claim.path,
-            display: claim.display ?? [],
+            display: claim.display,
           })) ?? [],
       };
       return acc;

package/src/credentials-catalogue/api/DigitalCredentialsCatalogue.ts

@@ -115,6 +115,7 @@ export const DigitalCredential = z.object({
   purposes: z.array(z.union([z.string(), CredentialPurpose])),
   issuers: z.array(CredentialIssuer),
   authentic_sources: z.array(AuthenticSource),
+  parent_credentials: z.array(z.string()).optional(),
   formats: z.array(CredentialFormat).optional(),
   // claims: z.array(Claim), // TODO: [SIW-3978] Should we keep claims?
 });

package/src/credentials-catalogue/v1.3.3/mappers.ts

@@ -65,7 +65,7 @@ export const mapToCredentialsCatalogue = createMapper<
         `Schemas for ${credentialType} must be present in the Schema Registry`
       );
       return schemas.map((schema) => ({
-        configuration_id: schema.id, // TODO: [SIW-3978] Does schema ID corresponds to configuration_id?
+        configuration_id: schema.id, // TODO: [SIW-3978] Fix this, the schema ID does not correspond to configuration_id
         ...schema,
       }));
     };
@@ -87,7 +87,9 @@ export const mapToCredentialsCatalogue = createMapper<
         ({ authentic_sources, credential_name_l10n_id, ...credential }) => ({
           name_l10n_id: credential_name_l10n_id,
           formats: resolveFormats(credential.credential_type),
-          authentic_sources: authentic_sources.map(resolveAuthSource),
+          authentic_sources: authentic_sources
+            ? authentic_sources.map(resolveAuthSource)
+            : [],
           ...credential,
         })
       ),

package/src/credentials-catalogue/v1.3.3/types.ts

@@ -132,12 +132,10 @@ export const DigitalCredential = z.object({
   classes: z.array(z.string()).optional(),
   purposes: z.array(z.string()),
   issuers: z.array(CredentialIssuer),
-  authentic_sources: z.array(
-    z.object({
-      id: z.string(),
-      dataset_id: z.string(),
-    })
-  ),
+  authentic_sources: z
+    .array(z.object({ id: z.string(), dataset_id: z.string() }))
+    .optional(),
+  parent_credentials: z.array(z.string()).optional(),
 });
 
 const JwtHeader = z.object({

package/src/mdoc/const.ts

@@ -1 +1,2 @@
 export const MDOC_DEFAULT_NAMESPACE = "org.iso.18013.5.1";
+export const MDOC_VERIFICATION_IDENTIFIER = "verification";

package/src/mdoc/utils.ts

@@ -2,7 +2,7 @@ import { CBOR } from "@pagopa/io-react-native-iso18013";
 import { Verification } from "../sd-jwt/types";
 import type { IssuanceApi } from "../credential/issuance";
 import type { Out } from "../utils/misc";
-import { MDOC_DEFAULT_NAMESPACE } from "./const";
+import { MDOC_VERIFICATION_IDENTIFIER } from "./const";
 
 /**
  * @param namespace The mdoc credential `namespace`
@@ -25,11 +25,12 @@ export const getVerificationFromParsedCredential = (
     IssuanceApi["verifyAndParseCredential"]
   >["parsedCredential"]
 ) => {
-  const verificationKey = getParsedCredentialClaimKey(
-    `${MDOC_DEFAULT_NAMESPACE}.IT`,
-    "verification"
+  const verificationKey = Object.keys(parsedCredential).find((key) =>
+    key.endsWith(MDOC_VERIFICATION_IDENTIFIER)
   );
-  const verification = parsedCredential[verificationKey]?.value;
+  const verification = verificationKey
+    ? parsedCredential[verificationKey]?.value
+    : undefined;
   return verification ? Verification.parse(verification) : undefined;
 };
 
@@ -43,9 +44,11 @@ export const getVerificationFromParsedCredential = (
  */
 export const getVerification = async (token: string) => {
   const issuerSigned = await CBOR.decodeIssuerSigned(token);
-  const namespace = issuerSigned.nameSpaces[`${MDOC_DEFAULT_NAMESPACE}.IT`];
-  const verification = namespace?.find(
-    (x) => x.elementIdentifier === "verification"
+
+  const flattenedClaims = Object.values(issuerSigned.nameSpaces).flat();
+
+  const verification = flattenedClaims?.find(
+    (x) => x.elementIdentifier === MDOC_VERIFICATION_IDENTIFIER
   )?.elementValue;
 
   return verification ? Verification.parse(verification) : undefined;