@bifold/core 2.10.1 → 2.11.0

package/lib/module/utils/cred-def.js

@@ -1,5 +1,11 @@
 import { AnonCredsCredentialMetadataKey, parseIndyCredentialDefinitionId, parseIndySchemaId } from '@credo-ts/anoncreds';
 import { credentialSchema } from './schema';
+import { ensureCredentialMetadata, getEffectiveCredentialName } from './credential';
+// Fallback default credential name when no other name is available
+export const fallbackDefaultCredentialNameValue = 'Credential';
+
+// Default credential definition tag value
+export const defaultCredDefTag = 'default';
 
 // Normalize incoming identifiers by trimming whitespace and converting empty strings to undefined
 function normalizeId(id) {
@@ -7,47 +13,13 @@ function normalizeId(id) {
   const trimmed = id.trim();
   return trimmed.length > 0 ? trimmed : undefined;
 }
-export async function getCredentialName(credDefId, schemaId, agent) {
+export async function getCredentialName(credDefId, schemaId) {
   const normalizedCredDefId = normalizeId(credDefId);
   const normalizedSchemaId = normalizeId(schemaId);
-  const isWebvh = !!(normalizedCredDefId !== null && normalizedCredDefId !== void 0 && normalizedCredDefId.toLowerCase().startsWith('did:webvh:') || normalizedSchemaId !== null && normalizedSchemaId !== void 0 && normalizedSchemaId.toLowerCase().startsWith('did:webvh:'));
-  if (isWebvh) {
-    return parseWebVHCredDefId(normalizedCredDefId, normalizedSchemaId, agent);
-  }
   return parseIndyCredDefId(normalizedCredDefId, normalizedSchemaId);
 }
-async function parseWebVHCredDefId(credDefId, schemaId, agent) {
-  var _agent$modules;
-  let name = 'Credential';
-  if (!(agent !== null && agent !== void 0 && (_agent$modules = agent.modules) !== null && _agent$modules !== void 0 && _agent$modules.anoncreds)) {
-    return name;
-  }
-  if (credDefId) {
-    try {
-      const {
-        credentialDefinition: result
-      } = await agent.modules.anoncreds.getCredentialDefinition(credDefId);
-      name = (result === null || result === void 0 ? void 0 : result.tag) ?? name;
-    } catch {
-      var _agent$config;
-      agent === null || agent === void 0 || (_agent$config = agent.config) === null || _agent$config === void 0 || (_agent$config = _agent$config.logger) === null || _agent$config === void 0 || _agent$config.info('parseWebVHCredDefId: Credential definition not found, using default name');
-    }
-  }
-  if ((name.toLowerCase() === 'default' || name.toLowerCase() === 'credential') && schemaId) {
-    try {
-      const {
-        schema: result
-      } = await agent.modules.anoncreds.getSchema(schemaId);
-      name = (result === null || result === void 0 ? void 0 : result.name) ?? name;
-    } catch {
-      var _agent$config2;
-      agent === null || agent === void 0 || (_agent$config2 = agent.config) === null || _agent$config2 === void 0 || (_agent$config2 = _agent$config2.logger) === null || _agent$config2 === void 0 || _agent$config2.info('parseWebVHCredDefId: Schema definition not found, using default name');
-    }
-  }
-  return name || 'Credential';
-}
 function parseIndyCredDefId(credDefId, schemaId) {
-  let name = 'Credential';
+  let name = fallbackDefaultCredentialNameValue;
   if (credDefId) {
     try {
       const parsedCredDef = parseIndyCredentialDefinitionId(credDefId);
@@ -56,17 +28,17 @@ function parseIndyCredDefId(credDefId, schemaId) {
       // If parsing fails, keep the default name
     }
   }
-  if (name.toLowerCase() === 'default' || name.toLowerCase() === 'credential') {
+  if (name.toLowerCase() === defaultCredDefTag || name.toLowerCase() === fallbackDefaultCredentialNameValue.toLowerCase()) {
     if (schemaId) {
       try {
         const parsedSchema = parseIndySchemaId(schemaId);
         name = (parsedSchema === null || parsedSchema === void 0 ? void 0 : parsedSchema.schemaName) ?? name;
       } catch {
         // If parsing fails, keep the default name
-        name = 'Credential';
+        name = fallbackDefaultCredentialNameValue;
       }
     } else {
-      name = 'Credential';
+      name = fallbackDefaultCredentialNameValue;
     }
   }
   return name;
@@ -75,10 +47,41 @@ function credentialDefinition(credential) {
   var _credential$metadata$;
   return (_credential$metadata$ = credential.metadata.get(AnonCredsCredentialMetadataKey)) === null || _credential$metadata$ === void 0 ? void 0 : _credential$metadata$.credentialDefinitionId;
 }
-export async function parsedCredDefNameFromCredential(credential, agent) {
-  return getCredentialName(credentialDefinition(credential), credentialSchema(credential), agent);
+export function getSchemaName(credential) {
+  const metadata = credential.metadata.get(AnonCredsCredentialMetadataKey);
+  const schemaName = metadata === null || metadata === void 0 ? void 0 : metadata.schemaName;
+  return schemaName;
+}
+export function getCredDefTag(credential) {
+  const metadata = credential.metadata.get(AnonCredsCredentialMetadataKey);
+  const credDefTag = metadata === null || metadata === void 0 ? void 0 : metadata.credDefTag;
+  return credDefTag;
+}
+export async function parsedCredDefNameFromCredential(credential, agent, logger) {
+  // Ensure metadata is cached if agent is provided
+  if (agent) {
+    try {
+      await ensureCredentialMetadata(credential, agent, undefined, logger);
+    } catch (error) {
+      // If metadata restoration fails, we'll fall back to parsing IDs or default name
+      logger === null || logger === void 0 || logger.warn('Failed to restore credential metadata in parsedCredDefNameFromCredential', {
+        error: error
+      });
+    }
+  }
+
+  // Check if we have cached metadata
+  const cachedSchemaName = getSchemaName(credential);
+  if (cachedSchemaName) {
+    // Use the priority waterfall logic (OCA name > credDefTag > schemaName > fallback)
+    return getEffectiveCredentialName(credential);
+  }
+
+  // Fallback: parse the IDs if metadata is not cached and no agent to resolve
+  const fallbackName = await getCredentialName(credentialDefinition(credential), credentialSchema(credential));
+  return fallbackName;
 }
-export async function parsedCredDefName(credentialDefinitionId, schemaId, agent) {
-  return getCredentialName(credentialDefinitionId, schemaId, agent);
+export async function parsedCredDefName(credentialDefinitionId, schemaId) {
+  return getCredentialName(credentialDefinitionId, schemaId);
 }
 //# sourceMappingURL=cred-def.js.map

package/lib/module/utils/cred-def.js.map

@@ -1 +1 @@
-{"version":3,"names":["AnonCredsCredentialMetadataKey","parseIndyCredentialDefinitionId","parseIndySchemaId","credentialSchema","normalizeId","id","undefined","trimmed","trim","length","getCredentialName","credDefId","schemaId","agent","normalizedCredDefId","normalizedSchemaId","isWebvh","toLowerCase","startsWith","parseWebVHCredDefId","parseIndyCredDefId","_agent$modules","name","modules","anoncreds","credentialDefinition","result","getCredentialDefinition","tag","_agent$config","config","logger","info","schema","getSchema","_agent$config2","parsedCredDef","parsedSchema","schemaName","credential","_credential$metadata$","metadata","get","credentialDefinitionId","parsedCredDefNameFromCredential","parsedCredDefName"],"sourceRoot":"../../../src","sources":["utils/cred-def.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["AnonCredsCredentialMetadataKey","parseIndyCredentialDefinitionId","parseIndySchemaId","credentialSchema","ensureCredentialMetadata","getEffectiveCredentialName","fallbackDefaultCredentialNameValue","defaultCredDefTag","normalizeId","id","undefined","trimmed","trim","length","getCredentialName","credDefId","schemaId","normalizedCredDefId","normalizedSchemaId","parseIndyCredDefId","name","parsedCredDef","tag","toLowerCase","parsedSchema","schemaName","credentialDefinition","credential","_credential$metadata$","metadata","get","credentialDefinitionId","getSchemaName","getCredDefTag","credDefTag","parsedCredDefNameFromCredential","agent","logger","error","warn","cachedSchemaName","fallbackName","parsedCredDefName"],"sourceRoot":"../../../src","sources":["utils/cred-def.ts"],"mappings":"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","ignoreList":[]}

package/lib/module/utils/credential.js

@@ -1,6 +1,7 @@
 import { AnonCredsCredentialMetadataKey } from '@credo-ts/anoncreds';
 import { CredentialState } from '@credo-ts/core';
 import { luminanceForHexColor } from './luminance';
+import { getSchemaName, getCredDefTag, fallbackDefaultCredentialNameValue, defaultCredDefTag } from './cred-def';
 export const isValidAnonCredsCredential = credential => {
   return credential && (credential.state === CredentialState.OfferReceived || Boolean(credential.metadata.get(AnonCredsCredentialMetadataKey)) && credential.credentials.find(c => c.credentialRecordType === 'anoncreds' || c.credentialRecordType === 'w3c'));
 };
@@ -28,4 +29,213 @@ export const getCredentialIdentifiers = credential => {
     schemaId: (_credential$metadata$2 = credential.metadata.get(AnonCredsCredentialMetadataKey)) === null || _credential$metadata$2 === void 0 ? void 0 : _credential$metadata$2.schemaId
   };
 };
+
+/**
+ * Attempts to resolve schema and credDef IDs from credential format data.
+ */
+async function resolveIdsFromFormatData(credential, agent, logger) {
+  try {
+    const {
+      offer
+    } = await agent.credentials.getFormatData(credential.id);
+    const formatOfferData = (offer === null || offer === void 0 ? void 0 : offer.anoncreds) ?? (offer === null || offer === void 0 ? void 0 : offer.indy);
+
+    // Type guard to check if formatOfferData has the expected structure
+    if (formatOfferData && typeof formatOfferData === 'object' && 'schema_id' in formatOfferData && typeof formatOfferData.schema_id === 'string') {
+      return {
+        schemaId: formatOfferData.schema_id,
+        credDefId: 'cred_def_id' in formatOfferData && typeof formatOfferData.cred_def_id === 'string' ? formatOfferData.cred_def_id : undefined
+      };
+    }
+  } catch (error) {
+    logger === null || logger === void 0 || logger.error('Failed to get format data', {
+      error: error
+    });
+  }
+  return {};
+}
+
+/**
+ * Resolves schema name from the given schema ID.
+ */
+async function resolveSchemaName(schemaId, agent, logger) {
+  try {
+    const {
+      schema: resolvedSchema
+    } = await agent.modules.anoncreds.getSchema(schemaId);
+    const schemaName = resolvedSchema === null || resolvedSchema === void 0 ? void 0 : resolvedSchema.name;
+    logger === null || logger === void 0 || logger.debug('Resolved schema name', {
+      schemaId,
+      schemaName
+    });
+    return schemaName;
+  } catch (error) {
+    logger === null || logger === void 0 || logger.warn('Failed to resolve schema', {
+      error: error,
+      schemaId
+    });
+    return undefined;
+  }
+}
+
+/**
+ * Resolves credential definition tag from the given cred def ID.
+ */
+async function resolveCredDefTag(credDefId, agent, logger) {
+  try {
+    const {
+      credentialDefinition: resolvedCredDef
+    } = await agent.modules.anoncreds.getCredentialDefinition(credDefId);
+    const credDefTag = resolvedCredDef === null || resolvedCredDef === void 0 ? void 0 : resolvedCredDef.tag;
+    logger === null || logger === void 0 || logger.debug('Resolved credential definition tag', {
+      credDefId,
+      credDefTag
+    });
+    return credDefTag;
+  } catch (error) {
+    logger === null || logger === void 0 || logger.warn('Failed to resolve credential definition', {
+      error: error,
+      credDefId
+    });
+    return undefined;
+  }
+}
+
+/**
+ * Determines the IDs to use for resolution, preferring offer data over existing metadata.
+ */
+async function determineSchemaAndCredDefIds(credential, agent, offerData, existingMetadata, logger) {
+  let schemaId = (offerData === null || offerData === void 0 ? void 0 : offerData.schema_id) || (existingMetadata === null || existingMetadata === void 0 ? void 0 : existingMetadata.schemaId);
+  let credDefId = (offerData === null || offerData === void 0 ? void 0 : offerData.cred_def_id) || (existingMetadata === null || existingMetadata === void 0 ? void 0 : existingMetadata.credentialDefinitionId);
+  const needsResolution = !schemaId || !credDefId;
+  if (needsResolution) {
+    const resolvedIds = await resolveIdsFromFormatData(credential, agent, logger);
+    schemaId = schemaId || resolvedIds.schemaId;
+    credDefId = credDefId || resolvedIds.credDefId;
+  }
+  return {
+    schemaId,
+    credDefId
+  };
+}
+
+/**
+ * Updates credential metadata with resolved schema name and cred def tag.
+ */
+async function updateCredentialMetadata(params) {
+  const {
+    credential,
+    agent,
+    existingMetadata,
+    schemaId,
+    credDefId,
+    schemaName,
+    credDefTag,
+    logger
+  } = params;
+  const metadataToStore = {
+    ...existingMetadata,
+    schemaId,
+    credentialDefinitionId: credDefId,
+    schemaName,
+    credDefTag
+  };
+  credential.metadata.add(AnonCredsCredentialMetadataKey, metadataToStore);
+  await agent.credentials.update(credential);
+  logger === null || logger === void 0 || logger.info('Credential metadata ensured', {
+    credentialId: credential.id,
+    schemaName,
+    credDefTag,
+    wasUpdated: true
+  });
+}
+
+/**
+ * Ensures credential has all required metadata cached. If any metadata is missing,
+ * it will be resolved and added to the credential.
+ *
+ * @param credential - The credential record to ensure metadata for
+ * @param agent - The agent instance for resolving schema/credDef
+ * @param offerData - Optional offer data containing schema_id and cred_def_id
+ * @param logger - Optional logger instance for logging
+ * @returns Promise<boolean> - Returns true if metadata was updated, false otherwise
+ */
+export async function ensureCredentialMetadata(credential, agent, offerData, logger) {
+  var _agent$modules;
+  if (!(agent !== null && agent !== void 0 && (_agent$modules = agent.modules) !== null && _agent$modules !== void 0 && _agent$modules.anoncreds)) {
+    return false;
+  }
+  const existingMetadata = credential.metadata.get(AnonCredsCredentialMetadataKey);
+  const {
+    schemaId,
+    credDefId
+  } = await determineSchemaAndCredDefIds(credential, agent, offerData, existingMetadata, logger);
+
+  // Check what's missing
+  const needsSchemaName = !(existingMetadata !== null && existingMetadata !== void 0 && existingMetadata.schemaName) && schemaId;
+  const needsCredDefTag = !(existingMetadata !== null && existingMetadata !== void 0 && existingMetadata.credDefTag) && credDefId;
+  const hasAllMetadata = !needsSchemaName && !needsCredDefTag;
+  if (hasAllMetadata) {
+    return false;
+  }
+
+  // Resolve missing metadata
+  const schemaName = needsSchemaName && schemaId ? await resolveSchemaName(schemaId, agent, logger) : existingMetadata === null || existingMetadata === void 0 ? void 0 : existingMetadata.schemaName;
+  const credDefTag = needsCredDefTag && credDefId ? await resolveCredDefTag(credDefId, agent, logger) : existingMetadata === null || existingMetadata === void 0 ? void 0 : existingMetadata.credDefTag;
+  await updateCredentialMetadata({
+    credential,
+    agent,
+    existingMetadata,
+    schemaId,
+    credDefId,
+    schemaName,
+    credDefTag,
+    logger
+  });
+  return true;
+}
+
+/**
+ * Validates whether a credential name is meaningful and should be used for display.
+ * Returns false for undefined, empty, whitespace-only, or default placeholder names.
+ *
+ * @param name - The name to validate
+ * @returns true if the name is valid and meaningful, false otherwise
+ */
+export function isValidCredentialName(name) {
+  return !!(name && name !== defaultCredDefTag && name !== fallbackDefaultCredentialNameValue && name.trim() !== '');
+}
+
+/**
+ * Determines the effective credential name using a priority waterfall:
+ * 1. OCA Bundle name (if present and meaningful)
+ * 2. Credential definition tag (if present)
+ * 3. Schema name (if present)
+ * 4. Default fallback name
+ *
+ * @param credential - The credential record
+ * @param ocaName - The name from OCA meta overlay
+ * @returns The effective name to use for display
+ */
+export function getEffectiveCredentialName(credential, ocaName) {
+  // 1. Try OCA Bundle name
+  if (isValidCredentialName(ocaName)) {
+    return ocaName;
+  }
+
+  // 2. Try credential definition tag
+  const credDefTag = getCredDefTag(credential);
+  if (isValidCredentialName(credDefTag)) {
+    return credDefTag;
+  }
+
+  // 3. Try schema name
+  const schemaName = getSchemaName(credential);
+  if (isValidCredentialName(schemaName)) {
+    return schemaName;
+  }
+
+  // 4. Return default fallback
+  return fallbackDefaultCredentialNameValue;
+}
 //# sourceMappingURL=credential.js.map

package/lib/module/utils/credential.js.map

@@ -1 +1 @@
-{"version":3,"names":["AnonCredsCredentialMetadataKey","CredentialState","luminanceForHexColor","isValidAnonCredsCredential","credential","state","OfferReceived","Boolean","metadata","get","credentials","find","c","credentialRecordType","credentialTextColor","ColorPalette","hex","midpoint","grayscale","darkGrey","white","toImageSource","source","uri","getCredentialIdentifiers","_credential$metadata$","_credential$metadata$2","credentialDefinitionId","schemaId"],"sourceRoot":"../../../src","sources":["utils/credential.ts"],"mappings":"AAAA,SAASA,8BAA8B,QAAQ,qBAAqB;AACpE,SAAmCC,eAAe,QAAQ,gBAAgB;AAG1E,SAASC,oBAAoB,QAAQ,aAAa;AAElD,OAAO,MAAMC,0BAA0B,GAAIC,UAAoC,IAAK;EAClF,OACEA,UAAU,KACTA,UAAU,CAACC,KAAK,KAAKJ,eAAe,CAACK,aAAa,IAChDC,OAAO,CAACH,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACT,8BAA8B,CAAC,CAAC,IAC/DI,UAAU,CAACM,WAAW,CAACC,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,oBAAoB,KAAK,WAAW,IAAID,CAAC,CAACC,oBAAoB,KAAK,KAAK,CAAE,CAAC;AAExH,CAAC;;AAED;AACA,OAAO,MAAMC,mBAAmB,GAAGA,CAACC,YAAiB,EAAEC,GAAY,KAAK;EACtE,MAAMC,QAAQ,GAAG,GAAG,GAAG,CAAC;EACxB,IAAI,CAACf,oBAAoB,CAACc,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,KAAKC,QAAQ,EAAE;IACtD,OAAOF,YAAY,CAACG,SAAS,CAACC,QAAQ;EACxC;EACA,OAAOJ,YAAY,CAACG,SAAS,CAACE,KAAK;AACrC,CAAC;AAED,OAAO,MAAMC,aAAa,GAAIC,MAAe,IAA0B;EACrE,IAAI,OAAOA,MAAM,KAAK,QAAQ,EAAE;IAC9B,OAAO;MAAEC,GAAG,EAAED;IAAiB,CAAC;EAClC;EACA,OAAOA,MAAM;AACf,CAAC;AAED,OAAO,MAAME,wBAAwB,GAAIpB,UAAoC,IAAK;EAAA,IAAAqB,qBAAA,EAAAC,sBAAA;EAChF,OAAO;IACLC,sBAAsB,GAAAF,qBAAA,GAAErB,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACT,8BAA8B,CAAC,cAAAyB,qBAAA,uBAAvDA,qBAAA,CAAyDE,sBAAsB;IACvGC,QAAQ,GAAAF,sBAAA,GAAEtB,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACT,8BAA8B,CAAC,cAAA0B,sBAAA,uBAAvDA,sBAAA,CAAyDE;EACrE,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"names":["AnonCredsCredentialMetadataKey","CredentialState","luminanceForHexColor","getSchemaName","getCredDefTag","fallbackDefaultCredentialNameValue","defaultCredDefTag","isValidAnonCredsCredential","credential","state","OfferReceived","Boolean","metadata","get","credentials","find","c","credentialRecordType","credentialTextColor","ColorPalette","hex","midpoint","grayscale","darkGrey","white","toImageSource","source","uri","getCredentialIdentifiers","_credential$metadata$","_credential$metadata$2","credentialDefinitionId","schemaId","resolveIdsFromFormatData","agent","logger","offer","getFormatData","id","formatOfferData","anoncreds","indy","schema_id","credDefId","cred_def_id","undefined","error","resolveSchemaName","schema","resolvedSchema","modules","getSchema","schemaName","name","debug","warn","resolveCredDefTag","credentialDefinition","resolvedCredDef","getCredentialDefinition","credDefTag","tag","determineSchemaAndCredDefIds","offerData","existingMetadata","needsResolution","resolvedIds","updateCredentialMetadata","params","metadataToStore","add","update","info","credentialId","wasUpdated","ensureCredentialMetadata","_agent$modules","needsSchemaName","needsCredDefTag","hasAllMetadata","isValidCredentialName","trim","getEffectiveCredentialName","ocaName"],"sourceRoot":"../../../src","sources":["utils/credential.ts"],"mappings":"AAAA,SAASA,8BAA8B,QAAQ,qBAAqB;AACpE,SAAmCC,eAAe,QAAQ,gBAAgB;AAI1E,SAASC,oBAAoB,QAAQ,aAAa;AAClD,SAASC,aAAa,EAAEC,aAAa,EAAEC,kCAAkC,EAAEC,iBAAiB,QAAQ,YAAY;AAGhH,OAAO,MAAMC,0BAA0B,GAAIC,UAAoC,IAAK;EAClF,OACEA,UAAU,KACTA,UAAU,CAACC,KAAK,KAAKR,eAAe,CAACS,aAAa,IAChDC,OAAO,CAACH,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACb,8BAA8B,CAAC,CAAC,IAC/DQ,UAAU,CAACM,WAAW,CAACC,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,oBAAoB,KAAK,WAAW,IAAID,CAAC,CAACC,oBAAoB,KAAK,KAAK,CAAE,CAAC;AAExH,CAAC;;AAED;AACA,OAAO,MAAMC,mBAAmB,GAAGA,CAACC,YAAiB,EAAEC,GAAY,KAAK;EACtE,MAAMC,QAAQ,GAAG,GAAG,GAAG,CAAC;EACxB,IAAI,CAACnB,oBAAoB,CAACkB,GAAG,IAAI,EAAE,CAAC,IAAI,CAAC,KAAKC,QAAQ,EAAE;IACtD,OAAOF,YAAY,CAACG,SAAS,CAACC,QAAQ;EACxC;EACA,OAAOJ,YAAY,CAACG,SAAS,CAACE,KAAK;AACrC,CAAC;AAED,OAAO,MAAMC,aAAa,GAAIC,MAAe,IAA0B;EACrE,IAAI,OAAOA,MAAM,KAAK,QAAQ,EAAE;IAC9B,OAAO;MAAEC,GAAG,EAAED;IAAiB,CAAC;EAClC;EACA,OAAOA,MAAM;AACf,CAAC;AAED,OAAO,MAAME,wBAAwB,GAAIpB,UAAoC,IAAK;EAAA,IAAAqB,qBAAA,EAAAC,sBAAA;EAChF,OAAO;IACLC,sBAAsB,GAAAF,qBAAA,GAAErB,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACb,8BAA8B,CAAC,cAAA6B,qBAAA,uBAAvDA,qBAAA,CAAyDE,sBAAsB;IACvGC,QAAQ,GAAAF,sBAAA,GAAEtB,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACb,8BAA8B,CAAC,cAAA8B,sBAAA,uBAAvDA,sBAAA,CAAyDE;EACrE,CAAC;AACH,CAAC;;AAED;AACA;AACA;AACA,eAAeC,wBAAwBA,CACrCzB,UAAoC,EACpC0B,KAAY,EACZC,MAAqB,EAC+B;EACpD,IAAI;IACF,MAAM;MAAEC;IAAM,CAAC,GAAG,MAAMF,KAAK,CAACpB,WAAW,CAACuB,aAAa,CAAC7B,UAAU,CAAC8B,EAAE,CAAC;IACtE,MAAMC,eAAe,GAAG,CAAAH,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEI,SAAS,MAAIJ,KAAK,aAALA,KAAK,uBAALA,KAAK,CAAEK,IAAI;;IAEvD;IACA,IACEF,eAAe,IACf,OAAOA,eAAe,KAAK,QAAQ,IACnC,WAAW,IAAIA,eAAe,IAC9B,OAAOA,eAAe,CAACG,SAAS,KAAK,QAAQ,EAC7C;MACA,OAAO;QACLV,QAAQ,EAAEO,eAAe,CAACG,SAAS;QACnCC,SAAS,EACP,aAAa,IAAIJ,eAAe,IAAI,OAAOA,eAAe,CAACK,WAAW,KAAK,QAAQ,GAC/EL,eAAe,CAACK,WAAW,GAC3BC;MACR,CAAC;IACH;EACF,CAAC,CAAC,OAAOC,KAAK,EAAE;IACdX,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEW,KAAK,CAAC,2BAA2B,EAAE;MAAEA,KAAK,EAAEA;IAAe,CAAC,CAAC;EACvE;EACA,OAAO,CAAC,CAAC;AACX;;AAEA;AACA;AACA;AACA,eAAeC,iBAAiBA,CAACf,QAAgB,EAAEE,KAAY,EAAEC,MAAqB,EAA+B;EACnH,IAAI;IACF,MAAM;MAAEa,MAAM,EAAEC;IAAe,CAAC,GAAG,MAAMf,KAAK,CAACgB,OAAO,CAACV,SAAS,CAACW,SAAS,CAACnB,QAAQ,CAAC;IACpF,MAAMoB,UAAU,GAAGH,cAAc,aAAdA,cAAc,uBAAdA,cAAc,CAAEI,IAAI;IACvClB,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEmB,KAAK,CAAC,sBAAsB,EAAE;MAAEtB,QAAQ;MAAEoB;IAAW,CAAC,CAAC;IAC/D,OAAOA,UAAU;EACnB,CAAC,CAAC,OAAON,KAAK,EAAE;IACdX,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEoB,IAAI,CAAC,0BAA0B,EAAE;MAAET,KAAK,EAAEA,KAAc;MAAEd;IAAS,CAAC,CAAC;IAC7E,OAAOa,SAAS;EAClB;AACF;;AAEA;AACA;AACA;AACA,eAAeW,iBAAiBA,CAACb,SAAiB,EAAET,KAAY,EAAEC,MAAqB,EAA+B;EACpH,IAAI;IACF,MAAM;MAAEsB,oBAAoB,EAAEC;IAAgB,CAAC,GAAG,MAAMxB,KAAK,CAACgB,OAAO,CAACV,SAAS,CAACmB,uBAAuB,CAAChB,SAAS,CAAC;IAClH,MAAMiB,UAAU,GAAGF,eAAe,aAAfA,eAAe,uBAAfA,eAAe,CAAEG,GAAG;IACvC1B,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEmB,KAAK,CAAC,oCAAoC,EAAE;MAAEX,SAAS;MAAEiB;IAAW,CAAC,CAAC;IAC9E,OAAOA,UAAU;EACnB,CAAC,CAAC,OAAOd,KAAK,EAAE;IACdX,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEoB,IAAI,CAAC,yCAAyC,EAAE;MAAET,KAAK,EAAEA,KAAc;MAAEH;IAAU,CAAC,CAAC;IAC7F,OAAOE,SAAS;EAClB;AACF;;AAEA;AACA;AACA;AACA,eAAeiB,4BAA4BA,CACzCtD,UAAoC,EACpC0B,KAAY,EACZ6B,SAAmE,EACnEC,gBAAqB,EACrB7B,MAAqB,EAC+B;EACpD,IAAIH,QAAQ,GAAG,CAAA+B,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAErB,SAAS,MAAIsB,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAEhC,QAAQ;EACjE,IAAIW,SAAS,GAAG,CAAAoB,SAAS,aAATA,SAAS,uBAATA,SAAS,CAAEnB,WAAW,MAAIoB,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAEjC,sBAAsB;EAElF,MAAMkC,eAAe,GAAG,CAACjC,QAAQ,IAAI,CAACW,SAAS;EAC/C,IAAIsB,eAAe,EAAE;IACnB,MAAMC,WAAW,GAAG,MAAMjC,wBAAwB,CAACzB,UAAU,EAAE0B,KAAK,EAAEC,MAAM,CAAC;IAC7EH,QAAQ,GAAGA,QAAQ,IAAIkC,WAAW,CAAClC,QAAQ;IAC3CW,SAAS,GAAGA,SAAS,IAAIuB,WAAW,CAACvB,SAAS;EAChD;EAEA,OAAO;IAAEX,QAAQ;IAAEW;EAAU,CAAC;AAChC;;AAEA;AACA;AACA;AACA,eAAewB,wBAAwBA,CAACC,MASvC,EAAiB;EAChB,MAAM;IAAE5D,UAAU;IAAE0B,KAAK;IAAE8B,gBAAgB;IAAEhC,QAAQ;IAAEW,SAAS;IAAES,UAAU;IAAEQ,UAAU;IAAEzB;EAAO,CAAC,GAAGiC,MAAM;EAE3G,MAAMC,eAAe,GAAG;IACtB,GAAGL,gBAAgB;IACnBhC,QAAQ;IACRD,sBAAsB,EAAEY,SAAS;IACjCS,UAAU;IACVQ;EACF,CAAC;EAEDpD,UAAU,CAACI,QAAQ,CAAC0D,GAAG,CAACtE,8BAA8B,EAAEqE,eAAe,CAAC;EACxE,MAAMnC,KAAK,CAACpB,WAAW,CAACyD,MAAM,CAAC/D,UAAU,CAAC;EAE1C2B,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEqC,IAAI,CAAC,6BAA6B,EAAE;IAC1CC,YAAY,EAAEjE,UAAU,CAAC8B,EAAE;IAC3Bc,UAAU;IACVQ,UAAU;IACVc,UAAU,EAAE;EACd,CAAC,CAAC;AACJ;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,wBAAwBA,CAC5CnE,UAAoC,EACpC0B,KAAY,EACZ6B,SAAwD,EACxD5B,MAAqB,EACH;EAAA,IAAAyC,cAAA;EAClB,IAAI,EAAC1C,KAAK,aAALA,KAAK,gBAAA0C,cAAA,GAAL1C,KAAK,CAAEgB,OAAO,cAAA0B,cAAA,eAAdA,cAAA,CAAgBpC,SAAS,GAAE;IAC9B,OAAO,KAAK;EACd;EAEA,MAAMwB,gBAAgB,GAAGxD,UAAU,CAACI,QAAQ,CAACC,GAAG,CAACb,8BAA8B,CAAC;EAEhF,MAAM;IAAEgC,QAAQ;IAAEW;EAAU,CAAC,GAAG,MAAMmB,4BAA4B,CAChEtD,UAAU,EACV0B,KAAK,EACL6B,SAAS,EACTC,gBAAgB,EAChB7B,MACF,CAAC;;EAED;EACA,MAAM0C,eAAe,GAAG,EAACb,gBAAgB,aAAhBA,gBAAgB,eAAhBA,gBAAgB,CAAEZ,UAAU,KAAIpB,QAAQ;EACjE,MAAM8C,eAAe,GAAG,EAACd,gBAAgB,aAAhBA,gBAAgB,eAAhBA,gBAAgB,CAAEJ,UAAU,KAAIjB,SAAS;EAElE,MAAMoC,cAAc,GAAG,CAACF,eAAe,IAAI,CAACC,eAAe;EAC3D,IAAIC,cAAc,EAAE;IAClB,OAAO,KAAK;EACd;;EAEA;EACA,MAAM3B,UAAU,GACdyB,eAAe,IAAI7C,QAAQ,GAAG,MAAMe,iBAAiB,CAACf,QAAQ,EAAEE,KAAK,EAAEC,MAAM,CAAC,GAAG6B,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAEZ,UAAU;EAE/G,MAAMQ,UAAU,GACdkB,eAAe,IAAInC,SAAS,GAAG,MAAMa,iBAAiB,CAACb,SAAS,EAAET,KAAK,EAAEC,MAAM,CAAC,GAAG6B,gBAAgB,aAAhBA,gBAAgB,uBAAhBA,gBAAgB,CAAEJ,UAAU;EAEjH,MAAMO,wBAAwB,CAAC;IAC7B3D,UAAU;IACV0B,KAAK;IACL8B,gBAAgB;IAChBhC,QAAQ;IACRW,SAAS;IACTS,UAAU;IACVQ,UAAU;IACVzB;EACF,CAAC,CAAC;EAEF,OAAO,IAAI;AACb;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAAS6C,qBAAqBA,CAAC3B,IAAwB,EAAW;EACvE,OAAO,CAAC,EAAEA,IAAI,IAAIA,IAAI,KAAK/C,iBAAiB,IAAI+C,IAAI,KAAKhD,kCAAkC,IAAIgD,IAAI,CAAC4B,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC;AACpH;;AAEA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,0BAA0BA,CAAC1E,UAAoC,EAAE2E,OAAgB,EAAU;EACzG;EACA,IAAIH,qBAAqB,CAACG,OAAO,CAAC,EAAE;IAClC,OAAOA,OAAO;EAChB;;EAEA;EACA,MAAMvB,UAAU,GAAGxD,aAAa,CAACI,UAAU,CAAC;EAC5C,IAAIwE,qBAAqB,CAACpB,UAAU,CAAC,EAAE;IACrC,OAAOA,UAAU;EACnB;;EAEA;EACA,MAAMR,UAAU,GAAGjD,aAAa,CAACK,UAAU,CAAC;EAC5C,IAAIwE,qBAAqB,CAAC5B,UAAU,CAAC,EAAE;IACrC,OAAOA,UAAU;EACnB;;EAEA;EACA,OAAO/C,kCAAkC;AAC3C","ignoreList":[]}

package/lib/module/utils/helpers.js

@@ -14,7 +14,8 @@ import { Role } from '../types/chat';
 import { BifoldError } from '../types/error';
 import { Screens, Stacks } from '../types/navigators';
 import { createAnonCredsProofRequest, filterInvalidProofRequestMatches, getDescriptorMetadata } from './anonCredsProofRequestMapper';
-import { getCredentialName } from './cred-def';
+import { fallbackDefaultCredentialNameValue, defaultCredDefTag } from './cred-def';
+import { getEffectiveCredentialName } from './credential';
 import { isOpenIdCredentialOffer, isOpenIdPresentationRequest } from './parsers';
 import { isMediatorInvitation } from './mediatorhelpers';
 export { parsedCredDefNameFromCredential } from './cred-def';
@@ -243,7 +244,53 @@ export const credentialSortFn = (a, b) => {
     return b.timestamp - a.timestamp;
   }
 };
-const credNameFromRestriction = async (queries, agent) => {
+export const resolveCredDefTag = async (cred_def_id, agent) => {
+  var _agent$modules;
+  if (cred_def_id && agent !== null && agent !== void 0 && (_agent$modules = agent.modules) !== null && _agent$modules !== void 0 && _agent$modules.anoncreds) {
+    try {
+      const {
+        credentialDefinition
+      } = await agent.modules.anoncreds.getCredentialDefinition(cred_def_id);
+      if (credentialDefinition !== null && credentialDefinition !== void 0 && credentialDefinition.tag && credentialDefinition.tag.toLowerCase() !== defaultCredDefTag && credentialDefinition.tag !== fallbackDefaultCredentialNameValue) {
+        return credentialDefinition.tag;
+      }
+    } catch (error) {
+      // Failed to resolve credential definition, return undefined
+      // This is expected when the credential definition doesn't exist or isn't accessible
+      // eslint-disable-next-line no-console
+      console.debug('Failed to resolve credential definition tag', {
+        cred_def_id,
+        error
+      });
+      return undefined;
+    }
+  }
+  return undefined;
+};
+export const resolveSchemaName = async (schema_id, agent) => {
+  var _agent$modules2;
+  if (schema_id && agent !== null && agent !== void 0 && (_agent$modules2 = agent.modules) !== null && _agent$modules2 !== void 0 && _agent$modules2.anoncreds) {
+    try {
+      const {
+        schema
+      } = await agent.modules.anoncreds.getSchema(schema_id);
+      if (schema !== null && schema !== void 0 && schema.name && schema.name !== fallbackDefaultCredentialNameValue) {
+        return schema.name;
+      }
+    } catch (error) {
+      // Failed to resolve schema, return undefined
+      // This is expected when the schema doesn't exist or isn't accessible
+      // eslint-disable-next-line no-console
+      console.debug('Failed to resolve schema name', {
+        schema_id,
+        error
+      });
+      return undefined;
+    }
+  }
+  return undefined;
+};
+export const credNameFromRestriction = async (queries, agent) => {
   let schema_name = '';
   let cred_def_id = '';
   let schema_id = '';
@@ -252,11 +299,26 @@ const credNameFromRestriction = async (queries, agent) => {
     cred_def_id = (query === null || query === void 0 ? void 0 : query.cred_def_id) ?? cred_def_id;
     schema_id = (query === null || query === void 0 ? void 0 : query.schema_id) ?? schema_id;
   });
-  if (schema_name && (schema_name.toLowerCase() !== 'default' || schema_name.toLowerCase() !== 'credential')) {
+
+  // Priority 1: Provided restriction schema name (from schema_name in restriction if meaningful)
+  if (schema_name && schema_name.toLowerCase() !== defaultCredDefTag && schema_name.toLowerCase() !== fallbackDefaultCredentialNameValue.toLowerCase()) {
     return schema_name;
-  } else {
-    return await getCredentialName(cred_def_id, schema_id, agent);
   }
+
+  // Priority 2: Try to resolve credential definition tag
+  const credDefTag = await resolveCredDefTag(cred_def_id, agent);
+  if (credDefTag) {
+    return credDefTag;
+  }
+
+  // Priority 3: Try to resolve schema name
+  const schemaName = await resolveSchemaName(schema_id, agent);
+  if (schemaName) {
+    return schemaName;
+  }
+
+  // Priority 4: Return default fallback
+  return fallbackDefaultCredentialNameValue;
 };
 export const credDefIdFromRestrictions = queries => {
   var _queries$filter$;
@@ -440,12 +502,6 @@ export const processProofAttributes = async (t, request, credentials, credential
     }
     //iterate over all credentials that satisfy the proof
     for (const credential of credentialList) {
-      var _credential$credentia, _credential$credentia2;
-      let credName = key;
-      if (credential !== null && credential !== void 0 && (_credential$credentia = credential.credentialInfo) !== null && _credential$credentia !== void 0 && _credential$credentia.credentialDefinitionId || credential !== null && credential !== void 0 && (_credential$credentia2 = credential.credentialInfo) !== null && _credential$credentia2 !== void 0 && _credential$credentia2.schemaId) {
-        var _credential$credentia3, _credential$credentia4;
-        credName = await getCredentialName(credential === null || credential === void 0 || (_credential$credentia3 = credential.credentialInfo) === null || _credential$credentia3 === void 0 ? void 0 : _credential$credentia3.credentialDefinitionId, credential === null || credential === void 0 || (_credential$credentia4 = credential.credentialInfo) === null || _credential$credentia4 === void 0 ? void 0 : _credential$credentia4.schemaId, agent);
-      }
       let revoked = false;
       let credExchangeRecord = undefined;
       if (credential) {
@@ -455,17 +511,20 @@ export const processProofAttributes = async (t, request, credentials, credential
       } else {
         continue;
       }
+
+      // Use cached metadata if we have the credential record
+      const credName = credExchangeRecord ? getEffectiveCredentialName(credExchangeRecord) : key;
       for (const attributeName of [...(names ?? (name && [name]) ?? [])]) {
         var _processedAttributes$4;
         if (!processedAttributes[credential.credentialId]) {
-          var _credential$credentia5, _credential$credentia6;
+          var _credential$credentia, _credential$credentia2;
           // init processedAttributes object
           processedAttributes[credential.credentialId] = {
             credExchangeRecord,
             altCredentials,
             credId: credential === null || credential === void 0 ? void 0 : credential.credentialId,
-            schemaId: (credential === null || credential === void 0 || (_credential$credentia5 = credential.credentialInfo) === null || _credential$credentia5 === void 0 ? void 0 : _credential$credentia5.schemaId) ?? proofSchemaId,
-            credDefId: (credential === null || credential === void 0 || (_credential$credentia6 = credential.credentialInfo) === null || _credential$credentia6 === void 0 ? void 0 : _credential$credentia6.credentialDefinitionId) ?? proofCredDefId,
+            schemaId: (credential === null || credential === void 0 || (_credential$credentia = credential.credentialInfo) === null || _credential$credentia === void 0 ? void 0 : _credential$credentia.schemaId) ?? proofSchemaId,
+            credDefId: (credential === null || credential === void 0 || (_credential$credentia2 = credential.credentialInfo) === null || _credential$credentia2 === void 0 ? void 0 : _credential$credentia2.credentialDefinitionId) ?? proofCredDefId,
             credName,
             attributes: []
           };
@@ -570,7 +629,7 @@ export const processProofPredicates = async (request, credentials, credentialRec
       }
     }
     for (const credential of credentialList) {
-      var _requestedProofPredic, _credential$credentia7, _credential$credentia8, _processedPredicates$3;
+      var _requestedProofPredic, _processedPredicates$3;
       let revoked = false;
       let credExchangeRecord = undefined;
       if (credential) {
@@ -588,11 +647,9 @@ export const processProofPredicates = async (request, credentials, credentialRec
         ...(credential === null || credential === void 0 ? void 0 : credential.credentialInfo)
       };
       const credNameRestriction = await credNameFromRestriction((_requestedProofPredic = requestedProofPredicates[key]) === null || _requestedProofPredic === void 0 ? void 0 : _requestedProofPredic.restrictions, agent);
-      let credName = credNameRestriction ?? key;
-      if (credential !== null && credential !== void 0 && (_credential$credentia7 = credential.credentialInfo) !== null && _credential$credentia7 !== void 0 && _credential$credentia7.credentialDefinitionId || credential !== null && credential !== void 0 && (_credential$credentia8 = credential.credentialInfo) !== null && _credential$credentia8 !== void 0 && _credential$credentia8.schemaId) {
-        var _credential$credentia9, _credential$credentia0;
-        credName = await getCredentialName(credential === null || credential === void 0 || (_credential$credentia9 = credential.credentialInfo) === null || _credential$credentia9 === void 0 ? void 0 : _credential$credentia9.credentialDefinitionId, credential === null || credential === void 0 || (_credential$credentia0 = credential.credentialInfo) === null || _credential$credentia0 === void 0 ? void 0 : _credential$credentia0.schemaId, agent);
-      }
+
+      // Use cached metadata if we have the credential record
+      const credName = credExchangeRecord ? getEffectiveCredentialName(credExchangeRecord) : credNameRestriction ?? key;
       if (!processedPredicates[credential.credentialId]) {
         processedPredicates[credential.credentialId] = {
           altCredentials,
@@ -815,8 +872,9 @@ export const sortCredentialsForAutoSelect = credentials => {
  * received invitations exist
  * @param agent an Agent instance
  * @param invitationId specifically a *received* invitation id
+ * @param logger optional logger instance
  */
-export const removeExistingInvitationsById = async (agent, invitationId) => {
+export const removeExistingInvitationsById = async (agent, invitationId, logger) => {
   // This is implemented just as findByReceivedInvitationId is
   // in Credo only this is able to return multiple if they exist
   const oobRecords = (await (agent === null || agent === void 0 ? void 0 : agent.oob.findAllByQuery({
@@ -825,7 +883,7 @@ export const removeExistingInvitationsById = async (agent, invitationId) => {
   }))) || [];
   for (const r of oobRecords) {
     await (agent === null || agent === void 0 ? void 0 : agent.oob.deleteById(r.id));
-    agent === null || agent === void 0 || agent.config.logger.info('Successfully removed an existing oob invitation');
+    logger === null || logger === void 0 || logger.info('Successfully removed an existing oob invitation');
   }
 };