@bifold/core 3.0.0 → 3.0.2

package/lib/module/modules/openid/features/OpenIDProofPresentation/components/OpenIDProofRequestHeader.js

@@ -0,0 +1,44 @@
+import { StyleSheet, Text, View } from 'react-native';
+import { useTranslation } from 'react-i18next';
+import { useTheme } from '../../../../../contexts/theme';
+import { testIdWithKey } from '../../../../../utils/testable';
+const OpenIDProofRequestHeader = ({
+  selectedCredentialsSubmission,
+  verifierName = '',
+  reason = ''
+}) => {
+  const {
+    ListItems,
+    TextTheme,
+    Spacing
+  } = useTheme();
+  const {
+    t
+  } = useTranslation();
+  const styles = StyleSheet.create({
+    headerTextContainer: {
+      paddingVertical: Spacing.md,
+      paddingHorizontal: Spacing.sm
+    },
+    headerText: {
+      ...ListItems.recordAttributeText,
+      flexShrink: 1,
+      paddingBottom: Spacing.sm
+    }
+  });
+  if (!selectedCredentialsSubmission) return;
+  return /*#__PURE__*/React.createElement(View, {
+    style: styles.headerTextContainer
+  }, /*#__PURE__*/React.createElement(Text, {
+    style: styles.headerText,
+    testID: testIdWithKey('HeaderText')
+  }, /*#__PURE__*/React.createElement(Text, {
+    style: TextTheme.normal
+  }, t('ProofRequest.ReceiveProofTitle')), /*#__PURE__*/React.createElement(Text, {
+    style: TextTheme.title
+  }, " $", verifierName)), /*#__PURE__*/React.createElement(Text, {
+    style: TextTheme.normal
+  }, reason));
+};
+export default OpenIDProofRequestHeader;
+//# sourceMappingURL=OpenIDProofRequestHeader.js.map

package/lib/module/modules/openid/features/OpenIDProofPresentation/components/OpenIDProofRequestHeader.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["StyleSheet","Text","View","useTranslation","useTheme","testIdWithKey","OpenIDProofRequestHeader","selectedCredentialsSubmission","verifierName","reason","ListItems","TextTheme","Spacing","t","styles","create","headerTextContainer","paddingVertical","md","paddingHorizontal","sm","headerText","recordAttributeText","flexShrink","paddingBottom","React","createElement","style","testID","normal","title"],"sourceRoot":"../../../../../../../src","sources":["modules/openid/features/OpenIDProofPresentation/components/OpenIDProofRequestHeader.tsx"],"mappings":"AAAA,SAASA,UAAU,EAAEC,IAAI,EAAEC,IAAI,QAAQ,cAAc;AACrD,SAASC,cAAc,QAAQ,eAAe;AAE9C,SAASC,QAAQ,QAAQ,+BAA+B;AACxD,SAASC,aAAa,QAAQ,+BAA+B;AAS7D,MAAMC,wBAAiE,GAAGA,CAAC;EACzEC,6BAA6B;EAC7BC,YAAY,GAAG,EAAE;EACjBC,MAAM,GAAG;AACX,CAAC,KAAK;EAEJ,MAAM;IAAEC,SAAS;IAAEC,SAAS;IAAEC;EAAQ,CAAC,GAAGR,QAAQ,CAAC,CAAC;EACpD,MAAM;IAAES;EAAE,CAAC,GAAGV,cAAc,CAAC,CAAC;EAE5B,MAAMW,MAAM,GAAGd,UAAU,CAACe,MAAM,CAAC;IAC7BC,mBAAmB,EAAE;MACjBC,eAAe,EAAEL,OAAO,CAACM,EAAE;MAC3BC,iBAAiB,EAAEP,OAAO,CAACQ;IAC/B,CAAC;IACDC,UAAU,EAAE;MACR,GAAGX,SAAS,CAACY,mBAAmB;MAChCC,UAAU,EAAE,CAAC;MACbC,aAAa,EAAEZ,OAAO,CAACQ;IAC3B;EACJ,CAAC,CAAC;EAEF,IAAI,CAACb,6BAA6B,EAAE;EAEpC,oBACIkB,KAAA,CAAAC,aAAA,CAACxB,IAAI;IAACyB,KAAK,EAAEb,MAAM,CAACE;EAAoB,gBACtCS,KAAA,CAAAC,aAAA,CAACzB,IAAI;IAAC0B,KAAK,EAAEb,MAAM,CAACO,UAAW;IAACO,MAAM,EAAEvB,aAAa,CAAC,YAAY;EAAE,gBAChEoB,KAAA,CAAAC,aAAA,CAACzB,IAAI;IAAC0B,KAAK,EAAEhB,SAAS,CAACkB;EAAO,GAAEhB,CAAC,CAAC,gCAAgC,CAAQ,CAAC,eAC7EY,KAAA,CAAAC,aAAA,CAACzB,IAAI;IAAC0B,KAAK,EAAEhB,SAAS,CAACmB;EAAM,GAAC,IAAE,EAACtB,YAAmB,CAChD,CAAC,eACPiB,KAAA,CAAAC,aAAA,CAACzB,IAAI;IAAC0B,KAAK,EAAEhB,SAAS,CAACkB;EAAO,GAAEpB,MAAa,CACzC,CAAC;AAEf,CAAC;AAED,eAAeH,wBAAwB","ignoreList":[]}

package/lib/module/modules/openid/hooks/openid.js

@@ -41,9 +41,6 @@ export const useOpenID = ({
       if (!configID) {
         throw new Error('No credential configuration ID found in the credential offer metadata');
       }
-      if (!authServer) {
-        throw new Error('No authorization server found in the credential offer metadata');
-      }
       if (!credentialIssuer) {
         throw new Error('No credential issuer found in the credential offer metadata');
       }
@@ -58,9 +55,8 @@ export const useOpenID = ({
         resolvedCredentialOffer,
         tokenResponse: tokenResponse
       });
-      if (refreshToken && authServer) {
+      if (refreshToken) {
         setRefreshCredentialMetadata(credential, {
-          authServer: tokenEndpoint,
           tokenEndpoint: tokenEndpoint,
           refreshToken: refreshToken,
           issuerMetadataCache: {
@@ -80,7 +76,8 @@ export const useOpenID = ({
       }
       return credential;
     } catch (err) {
-      const error = new BifoldError(t('Error.Title1024'), t('Error.Message1024'), (err === null || err === void 0 ? void 0 : err.message) ?? err, 1043);
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      const error = new BifoldError(t('Error.Title1024'), errorMessage, errorMessage, 1043);
       DeviceEventEmitter.emit(EventTypes.OPENID_CONNECTION_ERROR, error);
     }
   }, [agent, t]);
@@ -91,11 +88,12 @@ export const useOpenID = ({
     try {
       const record = await getCredentialsForProofRequest({
         agent: agent,
-        uri: uri
+        request: uri
       });
       return record;
     } catch (err) {
-      const error = new BifoldError(t('Error.Title1043'), t('Error.Message1043'), (err === null || err === void 0 ? void 0 : err.message) ?? err, 1043);
+      const errorMessage = err instanceof Error ? err.message : String(err);
+      const error = new BifoldError(t('Error.Title1043'), errorMessage, errorMessage, 1043);
       DeviceEventEmitter.emit(EventTypes.OPENID_CONNECTION_ERROR, error);
     }
   }, [agent, t]);

package/lib/module/modules/openid/hooks/openid.js.map

@@ -1 +1 @@
-{"version":3,"names":["useAgent","useCallback","useEffect","useState","useTranslation","DeviceEventEmitter","EventTypes","BifoldError","acquirePreAuthorizedAccessToken","receiveCredentialFromOpenId4VciOffer","resolveOpenId4VciOffer","getCredentialsForProofRequest","getCredentialConfigurationIds","setRefreshCredentialMetadata","RefreshStatus","temporaryMetaVanillaObject","useOpenID","openIDUri","openIDPresentationUri","openIdRecord","setOpenIdRecord","agent","t","resolveOpenIDCredential","uri","_getCredentialConfigu","resolvedCredentialOffer","authServers","metadata","credentialIssuer","authorization_servers","authServer","authorizationServers","issuer","issuerMetadata","configID","tokenEndpoint","token_endpoint","credentialEndpoint","credential_endpoint","Error","tokenResponse","refreshToken","credential","issuerMetadataCache","credential_issuer","credential_configurations_supported","credentialConfigurationId","lastCheckedAt","Date","now","lastCheckResult","Valid","attemptCount","err","error","message","emit","OPENID_CONNECTION_ERROR","resolveOpenIDPresentationRequest","record","then","value"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/openid.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useAgent","useCallback","useEffect","useState","useTranslation","DeviceEventEmitter","EventTypes","BifoldError","acquirePreAuthorizedAccessToken","receiveCredentialFromOpenId4VciOffer","resolveOpenId4VciOffer","getCredentialsForProofRequest","getCredentialConfigurationIds","setRefreshCredentialMetadata","RefreshStatus","temporaryMetaVanillaObject","useOpenID","openIDUri","openIDPresentationUri","openIdRecord","setOpenIdRecord","agent","t","resolveOpenIDCredential","uri","_getCredentialConfigu","resolvedCredentialOffer","authServers","metadata","credentialIssuer","authorization_servers","authServer","authorizationServers","issuer","issuerMetadata","configID","tokenEndpoint","token_endpoint","credentialEndpoint","credential_endpoint","Error","tokenResponse","refreshToken","credential","issuerMetadataCache","credential_issuer","credential_configurations_supported","credentialConfigurationId","lastCheckedAt","Date","now","lastCheckResult","Valid","attemptCount","err","errorMessage","message","String","error","emit","OPENID_CONNECTION_ERROR","resolveOpenIDPresentationRequest","record","request","then","value"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/openid.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/openid/hooks/useAcceptReplacement.js

@@ -1,22 +1,20 @@
-// modules/openid/hooks/useAcceptReplacement.ts
-
 import { useCallback } from 'react';
 import { TOKENS, useServices } from '../../../container-api';
+import { useAppAgent } from '../../../utils/agent';
 import { useOpenIDCredentials } from '../context/OpenIDCredentialRecordProvider';
 import { credentialRegistry, selectOldIdByReplacementId } from '../refresh/registry';
-import { OpenIDCredentialType } from '../types';
-const sleep = ms => new Promise(res => setTimeout(res, ms));
+import { deleteOpenIDCredential, findOpenIDCredentialById, storeOpenIDCredential } from '../credentialRecord';
 /**
  * A hook that provides functions to accept newly issued credentials, handling replacements if applicable.
  */
 
 export function useAcceptReplacement() {
   const {
-    storeCredential,
-    removeCredential,
-    getW3CCredentialById,
-    getSdJwtCredentialById
+    getCredentialById
   } = useOpenIDCredentials();
+  const {
+    agent
+  } = useAppAgent();
   const [logger] = useServices([TOKENS.UTIL_LOGGER]);
 
   /**
@@ -26,10 +24,13 @@ export function useAcceptReplacement() {
    * 3) update the registry (acceptReplacement)
    */
   const acceptNewCredential = useCallback(async newCred => {
+    if (!agent) {
+      throw new Error('Agent not ready');
+    }
     logger.info(`🟢 [useAcceptReplacement] accepting new credential → ${newCred.id}`);
 
     // 1) persist new
-    await storeCredential(newCred);
+    await storeOpenIDCredential(agent, newCred);
 
     // 2) check if it replaces an old credential
     const oldId = selectOldIdByReplacementId(newCred.id);
@@ -38,36 +39,32 @@ export function useAcceptReplacement() {
       return;
     }
 
-    // 3) fetch old via provider (always)
-    const oldRecord = await getSdJwtCredentialById(oldId);
+    // 3) fetch old record across OpenID credential stores
+    const oldRecord = await findOpenIDCredentialById(agent, oldId);
     if (!oldRecord) {
       logger.warn(`⚠️ [useAcceptReplacement] old record ${oldId} not found — skipping delete`);
       // still accept swap in registry to avoid stuck state
       credentialRegistry.getState().acceptReplacement(oldId);
       return;
     }
-    await sleep(200);
 
     // 4) delete old
-    await removeCredential(oldRecord, OpenIDCredentialType.SdJwtVc);
+    await deleteOpenIDCredential(agent, oldRecord);
 
     // 5) finalize the swap in registry
     credentialRegistry.getState().acceptReplacement(oldId);
     logger.info(`✅ [useAcceptReplacement] replacement complete: old=${oldId} → new=${newCred.id}`);
-  }, [storeCredential, removeCredential, getSdJwtCredentialById, logger]);
+  }, [agent, logger]);
 
   /**
    * Convenience: accept by new credential id (fetch via provider first).
    * Useful if your screen only carries the new id.
    */
   const acceptById = useCallback(async newId => {
-    // try W3C first, then Sd-JWT
-    const newW3c = await getW3CCredentialById(newId);
-    const newSd = newW3c ? undefined : await getSdJwtCredentialById(newId);
-    const rec = newW3c ?? newSd;
+    const rec = await getCredentialById(newId);
     if (!rec) throw new Error(`New credential not found for id=${newId}`);
     await acceptNewCredential(rec);
-  }, [getW3CCredentialById, getSdJwtCredentialById, acceptNewCredential]);
+  }, [getCredentialById, acceptNewCredential]);
   return {
     acceptNewCredential,
     acceptById

package/lib/module/modules/openid/hooks/useAcceptReplacement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","TOKENS","useServices","useOpenIDCredentials","credentialRegistry","selectOldIdByReplacementId","OpenIDCredentialType","sleep","ms","Promise","res","setTimeout","useAcceptReplacement","storeCredential","removeCredential","getW3CCredentialById","getSdJwtCredentialById","logger","UTIL_LOGGER","acceptNewCredential","newCred","info","id","oldId","oldRecord","warn","getState","acceptReplacement","SdJwtVc","acceptById","newId","newW3c","newSd","undefined","rec","Error"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useAcceptReplacement.ts"],"mappings":"AAAA;;AAEA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,MAAM,EAAEC,WAAW,QAAQ,wBAAwB;AAC5D,SAASC,oBAAoB,QAAQ,2CAA2C;AAChF,SAASC,kBAAkB,EAAEC,0BAA0B,QAAQ,qBAAqB;AACpF,SAASC,oBAAoB,QAAQ,UAAU;AAI/C,MAAMC,KAAK,GAAIC,EAAU,IAAK,IAAIC,OAAO,CAAQC,GAAG,IAAKC,UAAU,CAACD,GAAG,EAAEF,EAAE,CAAC,CAAC;AAC7E;AACA;AACA;;AAEA,OAAO,SAASI,oBAAoBA,CAAA,EAAG;EACrC,MAAM;IAAEC,eAAe;IAAEC,gBAAgB;IAAEC,oBAAoB;IAAEC;EAAuB,CAAC,GAAGb,oBAAoB,CAAC,CAAC;EAClH,MAAM,CAACc,MAAM,CAAC,GAAGf,WAAW,CAAC,CAACD,MAAM,CAACiB,WAAW,CAAC,CAAC;;EAElD;AACF;AACA;AACA;AACA;AACA;EACE,MAAMC,mBAAmB,GAAGnB,WAAW,CACrC,MAAOoB,OAAgB,IAAK;IAC1BH,MAAM,CAACI,IAAI,CAAC,wDAAwDD,OAAO,CAACE,EAAE,EAAE,CAAC;;IAEjF;IACA,MAAMT,eAAe,CAACO,OAAO,CAAC;;IAE9B;IACA,MAAMG,KAAK,GAAGlB,0BAA0B,CAACe,OAAO,CAACE,EAAE,CAAC;IACpD,IAAI,CAACC,KAAK,EAAE;MACVN,MAAM,CAACI,IAAI,CAAC,wDAAwDD,OAAO,CAACE,EAAE,SAAS,CAAC;MACxF;IACF;;IAEA;IACA,MAAME,SAAS,GAAG,MAAMR,sBAAsB,CAACO,KAAK,CAAC;IAErD,IAAI,CAACC,SAAS,EAAE;MACdP,MAAM,CAACQ,IAAI,CAAC,wCAAwCF,KAAK,8BAA8B,CAAC;MACxF;MACAnB,kBAAkB,CAACsB,QAAQ,CAAC,CAAC,CAACC,iBAAiB,CAACJ,KAAK,CAAC;MACtD;IACF;IAEA,MAAMhB,KAAK,CAAC,GAAG,CAAC;;IAEhB;IACA,MAAMO,gBAAgB,CAACU,SAAS,EAAElB,oBAAoB,CAACsB,OAAO,CAAC;;IAE/D;IACAxB,kBAAkB,CAACsB,QAAQ,CAAC,CAAC,CAACC,iBAAiB,CAACJ,KAAK,CAAC;IAEtDN,MAAM,CAACI,IAAI,CAAC,sDAAsDE,KAAK,UAAUH,OAAO,CAACE,EAAE,EAAE,CAAC;EAChG,CAAC,EACD,CAACT,eAAe,EAAEC,gBAAgB,EAAEE,sBAAsB,EAAEC,MAAM,CACpE,CAAC;;EAED;AACF;AACA;AACA;EACE,MAAMY,UAAU,GAAG7B,WAAW,CAC5B,MAAO8B,KAAa,IAAK;IACvB;IACA,MAAMC,MAAM,GAAG,MAAMhB,oBAAoB,CAACe,KAAK,CAAC;IAChD,MAAME,KAAK,GAAGD,MAAM,GAAGE,SAAS,GAAG,MAAMjB,sBAAsB,CAACc,KAAK,CAAC;IACtE,MAAMI,GAAG,GAAIH,MAAM,IAAIC,KAA6B;IACpD,IAAI,CAACE,GAAG,EAAE,MAAM,IAAIC,KAAK,CAAC,mCAAmCL,KAAK,EAAE,CAAC;IACrE,MAAMX,mBAAmB,CAACe,GAAG,CAAC;EAChC,CAAC,EACD,CAACnB,oBAAoB,EAAEC,sBAAsB,EAAEG,mBAAmB,CACpE,CAAC;EAED,OAAO;IAAEA,mBAAmB;IAAEU;EAAW,CAAC;AAC5C","ignoreList":[]}
+{"version":3,"names":["useCallback","TOKENS","useServices","useAppAgent","useOpenIDCredentials","credentialRegistry","selectOldIdByReplacementId","deleteOpenIDCredential","findOpenIDCredentialById","storeOpenIDCredential","useAcceptReplacement","getCredentialById","agent","logger","UTIL_LOGGER","acceptNewCredential","newCred","Error","info","id","oldId","oldRecord","warn","getState","acceptReplacement","acceptById","newId","rec"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useAcceptReplacement.ts"],"mappings":"AAAA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,MAAM,EAAEC,WAAW,QAAQ,wBAAwB;AAC5D,SAASC,WAAW,QAAQ,sBAAsB;AAClD,SAASC,oBAAoB,QAAQ,2CAA2C;AAChF,SAASC,kBAAkB,EAAEC,0BAA0B,QAAQ,qBAAqB;AACpF,SACEC,sBAAsB,EACtBC,wBAAwB,EAExBC,qBAAqB,QAChB,qBAAqB;AAC5B;AACA;AACA;;AAEA,OAAO,SAASC,oBAAoBA,CAAA,EAAG;EACrC,MAAM;IAAEC;EAAkB,CAAC,GAAGP,oBAAoB,CAAC,CAAC;EACpD,MAAM;IAAEQ;EAAM,CAAC,GAAGT,WAAW,CAAC,CAAC;EAC/B,MAAM,CAACU,MAAM,CAAC,GAAGX,WAAW,CAAC,CAACD,MAAM,CAACa,WAAW,CAAC,CAAC;;EAElD;AACF;AACA;AACA;AACA;AACA;EACE,MAAMC,mBAAmB,GAAGf,WAAW,CACrC,MAAOgB,OAA+B,IAAK;IACzC,IAAI,CAACJ,KAAK,EAAE;MACV,MAAM,IAAIK,KAAK,CAAC,iBAAiB,CAAC;IACpC;IAEAJ,MAAM,CAACK,IAAI,CAAC,wDAAwDF,OAAO,CAACG,EAAE,EAAE,CAAC;;IAEjF;IACA,MAAMV,qBAAqB,CAACG,KAAK,EAAEI,OAAO,CAAC;;IAE3C;IACA,MAAMI,KAAK,GAAGd,0BAA0B,CAACU,OAAO,CAACG,EAAE,CAAC;IACpD,IAAI,CAACC,KAAK,EAAE;MACVP,MAAM,CAACK,IAAI,CAAC,wDAAwDF,OAAO,CAACG,EAAE,SAAS,CAAC;MACxF;IACF;;IAEA;IACA,MAAME,SAAS,GAAG,MAAMb,wBAAwB,CAACI,KAAK,EAAEQ,KAAK,CAAC;IAE9D,IAAI,CAACC,SAAS,EAAE;MACdR,MAAM,CAACS,IAAI,CAAC,wCAAwCF,KAAK,8BAA8B,CAAC;MACxF;MACAf,kBAAkB,CAACkB,QAAQ,CAAC,CAAC,CAACC,iBAAiB,CAACJ,KAAK,CAAC;MACtD;IACF;;IAEA;IACA,MAAMb,sBAAsB,CAACK,KAAK,EAAES,SAAS,CAAC;;IAE9C;IACAhB,kBAAkB,CAACkB,QAAQ,CAAC,CAAC,CAACC,iBAAiB,CAACJ,KAAK,CAAC;IAEtDP,MAAM,CAACK,IAAI,CAAC,sDAAsDE,KAAK,UAAUJ,OAAO,CAACG,EAAE,EAAE,CAAC;EAChG,CAAC,EACD,CAACP,KAAK,EAAEC,MAAM,CAChB,CAAC;;EAED;AACF;AACA;AACA;EACE,MAAMY,UAAU,GAAGzB,WAAW,CAC5B,MAAO0B,KAAa,IAAK;IACvB,MAAMC,GAAG,GAAG,MAAMhB,iBAAiB,CAACe,KAAK,CAAC;IAC1C,IAAI,CAACC,GAAG,EAAE,MAAM,IAAIV,KAAK,CAAC,mCAAmCS,KAAK,EAAE,CAAC;IACrE,MAAMX,mBAAmB,CAACY,GAAG,CAAC;EAChC,CAAC,EACD,CAAChB,iBAAiB,EAAEI,mBAAmB,CACzC,CAAC;EAED,OAAO;IAAEA,mBAAmB;IAAEU;EAAW,CAAC;AAC5C","ignoreList":[]}

package/lib/module/modules/openid/hooks/useDeclineReplacement.js

@@ -1,15 +1,6 @@
 // modules/openid/hooks/useDeclineReplacement.ts
 import { useCallback } from 'react';
-import { credentialRegistry } from '../refresh/registry';
-function findOldIdByNewId(newId) {
-  const s = credentialRegistry.getState();
-  // replacements: { [oldId]: { id: newId, ... } }
-  for (const [oldId, lite] of Object.entries(s.replacements)) {
-    if ((lite === null || lite === void 0 ? void 0 : lite.id) === newId) return oldId;
-  }
-  return undefined;
-}
-
+import { credentialRegistry, selectOldIdByReplacementId } from '../refresh/registry';
 /**
  * Decline a replacement offer: clears the registry entry so the notification disappears.
  * No repo operations (no save/delete) are performed.
@@ -49,7 +40,7 @@ export function useDeclineReplacement(opts = {}) {
    * Decline by NEW credential id (use this from the Offer screen where you only know newId)
    */
   const declineByNewId = useCallback(async newId => {
-    const oldId = findOldIdByNewId(newId);
+    const oldId = selectOldIdByReplacementId(newId);
     if (!oldId) {
       logger === null || logger === void 0 || logger.warn(`🧹 [Decline] No matching oldId found for newId=${newId}`);
       return;

package/lib/module/modules/openid/hooks/useDeclineReplacement.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","credentialRegistry","findOldIdByNewId","newId","s","getState","oldId","lite","Object","entries","replacements","id","undefined","useDeclineReplacement","opts","logger","declineByOldId","setState","prev","_dropRepl","restRepl","_dropRef","restRefreshing","refreshing","expired","checked","filter","info","declineByNewId","warn","declineFromNotification","notif","_notif$metadata","_notif$metadata2","metadata","replacementId"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useDeclineReplacement.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","credentialRegistry","selectOldIdByReplacementId","useDeclineReplacement","opts","logger","declineByOldId","oldId","setState","prev","_dropRepl","restRepl","replacements","_dropRef","restRefreshing","refreshing","expired","checked","filter","id","info","declineByNewId","newId","warn","declineFromNotification","notif","_notif$metadata","_notif$metadata2","metadata","replacementId"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useDeclineReplacement.ts"],"mappings":"AAAA;AACA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,kBAAkB,EAAEC,0BAA0B,QAAQ,qBAAqB;AAQpF;AACA;AACA;AACA;AACA,OAAO,SAASC,qBAAqBA,CAACC,IAAa,GAAG,CAAC,CAAC,EAAE;EACxD,MAAM;IAAEC;EAAO,CAAC,GAAGD,IAAI;;EAEvB;AACF;AACA;EACE,MAAME,cAAc,GAAGN,WAAW,CAChC,MAAOO,KAAa,IAAK;IACvBN,kBAAkB,CAACO,QAAQ,CAAEC,IAAI,IAAK;MACpC;MACA,MAAM;QAAE,CAACF,KAAK,GAAGG,SAAS;QAAE,GAAGC;MAAS,CAAC,GAAGF,IAAI,CAACG,YAAY;MAC7D;MACA,MAAM;QAAE,CAACL,KAAK,GAAGM,QAAQ;QAAE,GAAGC;MAAe,CAAC,GAAGL,IAAI,CAACM,UAAU;MAChE,OAAO;QACL,GAAGN,IAAI;QACPO,OAAO,EAAEP,IAAI,CAACO,OAAO;QACrBC,OAAO,EAAER,IAAI,CAACQ,OAAO,CAACC,MAAM,CAAEC,EAAE,IAAKA,EAAE,KAAKZ,KAAK,CAAC;QAClDK,YAAY,EAAED,QAAQ;QACtBI,UAAU,EAAED;MACd,CAAC;IACH,CAAC,CAAC;IACFT,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEe,IAAI,CAAC,2DAA2Db,KAAK,EAAE,CAAC;EAClF,CAAC,EACD,CAACF,MAAM,CACT,CAAC;;EAED;AACF;AACA;EACE,MAAMgB,cAAc,GAAGrB,WAAW,CAChC,MAAOsB,KAAa,IAAK;IACvB,MAAMf,KAAK,GAAGL,0BAA0B,CAACoB,KAAK,CAAC;IAC/C,IAAI,CAACf,KAAK,EAAE;MACVF,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEkB,IAAI,CAAC,kDAAkDD,KAAK,EAAE,CAAC;MACvE;IACF;IACA,MAAMhB,cAAc,CAACC,KAAK,CAAC;EAC7B,CAAC,EACD,CAACD,cAAc,EAAED,MAAM,CACzB,CAAC;;EAED;AACF;AACA;EACE,MAAMmB,uBAAuB,GAAGxB,WAAW,CACzC,MAAOyB,KAAyB,IAAK;IAAA,IAAAC,eAAA,EAAAC,gBAAA;IACnC,MAAMpB,KAAK,GAAGkB,KAAK,aAALA,KAAK,gBAAAC,eAAA,GAALD,KAAK,CAAEG,QAAQ,cAAAF,eAAA,uBAAfA,eAAA,CAAiBnB,KAA2B;IAC1D,IAAIA,KAAK,EAAE;MACT,MAAMD,cAAc,CAACC,KAAK,CAAC;MAC3B;IACF;IACA,MAAMe,KAAK,GAAGG,KAAK,aAALA,KAAK,gBAAAE,gBAAA,GAALF,KAAK,CAAEG,QAAQ,cAAAD,gBAAA,uBAAfA,gBAAA,CAAiBE,aAAmC;IAClE,IAAIP,KAAK,EAAE;MACT,MAAMD,cAAc,CAACC,KAAK,CAAC;MAC3B;IACF;IACAjB,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEkB,IAAI,CAAC,2DAA2D,CAAC;EAC3E,CAAC,EACD,CAACjB,cAAc,EAAEe,cAAc,EAAEhB,MAAM,CACzC,CAAC;EAED,OAAO;IAAEC,cAAc;IAAEe,cAAc;IAAEG;EAAwB,CAAC;AACpE","ignoreList":[]}

package/lib/module/modules/openid/hooks/useExpiredNotifications.js

@@ -12,7 +12,7 @@ export const useExpiredNotifications = () => {
   } = useDeclineReplacement({
     logger
   });
-  const build = useCallback(s => s.expired.filter(oldId => s.checked.includes(oldId)).map(oldId => {
+  const build = useCallback(s => s.expired.filter(oldId => s.checked.includes(oldId) && !s.replacements[oldId]).map(oldId => {
     const lite = s.byId[oldId];
     const n = {
       type: OpenIDCustomNotificationType.CredentialExpired,

package/lib/module/modules/openid/hooks/useExpiredNotifications.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useEffect","useState","credentialRegistry","OpenIDCustomNotificationType","TOKENS","useServices","useDeclineReplacement","useExpiredNotifications","items","setItems","logger","UTIL_LOGGER","declineByOldId","build","s","expired","filter","oldId","checked","includes","map","lite","byId","n","type","CredentialExpired","title","pageTitle","buttonTitle","description","createdAt","Date","onPressAction","onCloseAction","component","metadata","format","getState","unsub","subscribe"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useExpiredNotifications.ts"],"mappings":"AAAA;AACA,SAASA,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AACxD,SAASC,kBAAkB,QAAuB,qBAAqB;AAEvE,SAASC,4BAA4B,QAAQ,kBAAkB;AAC/D,SAASC,MAAM,EAAEC,WAAW,QAAQ,wBAAwB;AAC5D,SAASC,qBAAqB,QAAQ,yBAAyB;AAE/D,OAAO,MAAMC,uBAAuB,GAAGA,CAAA,KAA4B;EACjE,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAGR,QAAQ,CAAuB,EAAE,CAAC;EAC5D,MAAM,CAACS,MAAM,CAAC,GAAGL,WAAW,CAAC,CAACD,MAAM,CAACO,WAAW,CAAC,CAAC;EAClD,MAAM;IAAEC;EAAe,CAAC,GAAGN,qBAAqB,CAAC;IAAEI;EAAO,CAAC,CAAC;EAE5D,MAAMG,KAAK,GAAGd,WAAW,CACtBe,CAAgB,IACfA,CAAC,CAACC,OAAO,CACNC,MAAM,CAAEC,KAAK,IAAKH,CAAC,CAACI,OAAO,CAACC,QAAQ,CAACF,KAAK,CAAC,CAAC,CAC5CG,GAAG,CAAEH,KAAK,IAAK;IACd,MAAMI,IAAI,GAAGP,CAAC,CAACQ,IAAI,CAACL,KAAK,CAAC;IAC1B,MAAMM,CAAqB,GAAG;MAC5BC,IAAI,EAAErB,4BAA4B,CAACsB,iBAAiB;MACpDC,KAAK,EAAE,oBAAoB;MAC3BC,SAAS,EAAE,oBAAoB;MAC/BC,WAAW,EAAE,QAAQ;MACrBC,WAAW,EAAE,mFAAmF;MAChGC,SAAS,EAAE,IAAIC,IAAI,CAAC,CAAC;MACrBC,aAAa,EAAEA,CAAA,KAAM,CAAC,CAAC;MACvBC,aAAa,EAAEA,CAAA,KAAMrB,cAAc,CAACK,KAAK,CAAC;MAC1CiB,SAAS,EAAEA,CAAA,KAAM,IAAI;MACrBC,QAAQ,EAAE;QACRlB,KAAK;QACLmB,MAAM,EAAEf,IAAI,aAAJA,IAAI,uBAAJA,IAAI,CAAEe;MAChB;IACF,CAAC;IACD,OAAOb,CAAC;EACV,CAAC,CAAC,EACN,CAACX,cAAc,CACjB,CAAC;EAEDZ,SAAS,CAAC,MAAM;IACdS,QAAQ,CAACI,KAAK,CAACX,kBAAkB,CAACmC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAMC,KAAK,GAAGpC,kBAAkB,CAACqC,SAAS,CAAEzB,CAAC,IAAKL,QAAQ,CAACI,KAAK,CAACC,CAAC,CAAC,CAAC,CAAC;IACrE,OAAOwB,KAAK;EACd,CAAC,EAAE,CAACzB,KAAK,CAAC,CAAC;EAEX,OAAOL,KAAK;AACd,CAAC","ignoreList":[]}
+{"version":3,"names":["useCallback","useEffect","useState","credentialRegistry","OpenIDCustomNotificationType","TOKENS","useServices","useDeclineReplacement","useExpiredNotifications","items","setItems","logger","UTIL_LOGGER","declineByOldId","build","s","expired","filter","oldId","checked","includes","replacements","map","lite","byId","n","type","CredentialExpired","title","pageTitle","buttonTitle","description","createdAt","Date","onPressAction","onCloseAction","component","metadata","format","getState","unsub","subscribe"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useExpiredNotifications.ts"],"mappings":"AAAA;AACA,SAASA,WAAW,EAAEC,SAAS,EAAEC,QAAQ,QAAQ,OAAO;AACxD,SAASC,kBAAkB,QAAuB,qBAAqB;AAEvE,SAASC,4BAA4B,QAAQ,kBAAkB;AAC/D,SAASC,MAAM,EAAEC,WAAW,QAAQ,wBAAwB;AAC5D,SAASC,qBAAqB,QAAQ,yBAAyB;AAE/D,OAAO,MAAMC,uBAAuB,GAAGA,CAAA,KAA4B;EACjE,MAAM,CAACC,KAAK,EAAEC,QAAQ,CAAC,GAAGR,QAAQ,CAAuB,EAAE,CAAC;EAC5D,MAAM,CAACS,MAAM,CAAC,GAAGL,WAAW,CAAC,CAACD,MAAM,CAACO,WAAW,CAAC,CAAC;EAClD,MAAM;IAAEC;EAAe,CAAC,GAAGN,qBAAqB,CAAC;IAAEI;EAAO,CAAC,CAAC;EAE5D,MAAMG,KAAK,GAAGd,WAAW,CACtBe,CAAgB,IACfA,CAAC,CAACC,OAAO,CACNC,MAAM,CAAEC,KAAK,IAAKH,CAAC,CAACI,OAAO,CAACC,QAAQ,CAACF,KAAK,CAAC,IAAI,CAACH,CAAC,CAACM,YAAY,CAACH,KAAK,CAAC,CAAC,CACtEI,GAAG,CAAEJ,KAAK,IAAK;IACd,MAAMK,IAAI,GAAGR,CAAC,CAACS,IAAI,CAACN,KAAK,CAAC;IAC1B,MAAMO,CAAqB,GAAG;MAC5BC,IAAI,EAAEtB,4BAA4B,CAACuB,iBAAiB;MACpDC,KAAK,EAAE,oBAAoB;MAC3BC,SAAS,EAAE,oBAAoB;MAC/BC,WAAW,EAAE,QAAQ;MACrBC,WAAW,EAAE,mFAAmF;MAChGC,SAAS,EAAE,IAAIC,IAAI,CAAC,CAAC;MACrBC,aAAa,EAAEA,CAAA,KAAM,CAAC,CAAC;MACvBC,aAAa,EAAEA,CAAA,KAAMtB,cAAc,CAACK,KAAK,CAAC;MAC1CkB,SAAS,EAAEA,CAAA,KAAM,IAAI;MACrBC,QAAQ,EAAE;QACRnB,KAAK;QACLoB,MAAM,EAAEf,IAAI,aAAJA,IAAI,uBAAJA,IAAI,CAAEe;MAChB;IACF,CAAC;IACD,OAAOb,CAAC;EACV,CAAC,CAAC,EACN,CAACZ,cAAc,CACjB,CAAC;EAEDZ,SAAS,CAAC,MAAM;IACdS,QAAQ,CAACI,KAAK,CAACX,kBAAkB,CAACoC,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC9C,MAAMC,KAAK,GAAGrC,kBAAkB,CAACsC,SAAS,CAAE1B,CAAC,IAAKL,QAAQ,CAACI,KAAK,CAACC,CAAC,CAAC,CAAC,CAAC;IACrE,OAAOyB,KAAK;EACd,CAAC,EAAE,CAAC1B,KAAK,CAAC,CAAC;EAEX,OAAOL,KAAK;AACd,CAAC","ignoreList":[]}

package/lib/module/modules/openid/hooks/useUpgradeExpiredCredential.js

@@ -3,82 +3,48 @@ import { useCallback } from 'react';
 import { useNavigation } from '@react-navigation/native';
 import { useAgent } from '@bifold/react-hooks';
 import { Screens, Stacks } from '../../../types/navigators';
-import { refreshAccessToken } from '../refresh/refreshToken';
-import { reissueCredentialWithAccessToken } from '../refresh/reIssuance';
 import { useOpenIDCredentials } from '../context/OpenIDCredentialRecordProvider';
-import { credentialRegistry } from '../refresh/registry';
 import { TOKENS, useServices } from '../../../container-api';
+import { refreshAndQueueReplacement } from '../refresh/operations';
 export const useUpgradeExpiredCredential = () => {
   const navigation = useNavigation();
   const {
     agent
   } = useAgent();
   const {
-    getSdJwtCredentialById
+    getCredentialById
   } = useOpenIDCredentials();
   const [logger] = useServices([TOKENS.UTIL_LOGGER]);
   const upgrade = useCallback(async oldId => {
-    var _newRecord$createdAt;
     if (!agent) {
       logger === null || logger === void 0 || logger.warn('⚠️ [Upgrade] Agent not ready, cannot upgrade credential');
       return;
     }
     logger === null || logger === void 0 || logger.info(`🔁 [Upgrade] Starting upgrade flow for oldId=${oldId}`);
-
-    // 1. Load the “old” record
-    const byId = credentialRegistry.getState().byId[oldId];
-    if (!byId) {
-      logger === null || logger === void 0 || logger.warn(`⚠️ [Upgrade] No lite record for oldId=${oldId}`);
-      return;
-    }
-
-    // We try all three repos – you can refine this using byId.format if you want
-    const rec = await getSdJwtCredentialById(oldId);
+    const rec = await getCredentialById(oldId);
     if (!rec) {
       logger === null || logger === void 0 || logger.warn(`⚠️ [Upgrade] No full record found for oldId=${oldId}`);
       return;
     }
-
-    // 2. Use refresh token to get new access token
-    const token = await refreshAccessToken({
-      logger,
-      cred: rec,
-      agentContext: agent.context
-    });
-    if (!token) {
-      logger === null || logger === void 0 || logger.warn(`⚠️ [Upgrade] No refresh token available for oldId=${oldId}`);
-      return;
-    }
-
-    // 3. Re-issue credential using access token
-    const newRecord = await reissueCredentialWithAccessToken({
+    const newRecord = await refreshAndQueueReplacement({
       agent,
       logger,
-      record: rec,
-      tokenResponse: token
+      record: rec
     });
     if (!newRecord) {
-      logger === null || logger === void 0 || logger.warn(`⚠️ [Upgrade] Re-issue returned no record for oldId=${oldId}`);
+      logger === null || logger === void 0 || logger.warn(`⚠️ [Upgrade] Could not issue replacement for oldId=${oldId}`);
       return;
     }
     logger === null || logger === void 0 || logger.info(`💾 [Upgrade] New credential issued ${newRecord.id} from oldId=${oldId}`);
 
-    // 4. Update registry mapping old -> new (so offer screen can resolve)
-    credentialRegistry.getState().markExpiredWithReplacement(oldId, {
-      id: newRecord.id,
-      format: byId.format,
-      createdAt: (_newRecord$createdAt = newRecord.createdAt) === null || _newRecord$createdAt === void 0 ? void 0 : _newRecord$createdAt.toISOString(),
-      issuer: byId.issuer
-    });
-
-    // 5. Navigate to the OpenID offer screen, passing the new record directly
+    // Navigate to the OpenID offer screen, passing the new record directly
     navigation.navigate(Stacks.ConnectionStack, {
       screen: Screens.OpenIDCredentialOffer,
       params: {
         credential: newRecord
       }
     });
-  }, [agent, logger, navigation, getSdJwtCredentialById]);
+  }, [agent, logger, navigation, getCredentialById]);
   return {
     upgrade
   };

package/lib/module/modules/openid/hooks/useUpgradeExpiredCredential.js.map

@@ -1 +1 @@
-{"version":3,"names":["useCallback","useNavigation","useAgent","Screens","Stacks","refreshAccessToken","reissueCredentialWithAccessToken","useOpenIDCredentials","credentialRegistry","TOKENS","useServices","useUpgradeExpiredCredential","navigation","agent","getSdJwtCredentialById","logger","UTIL_LOGGER","upgrade","oldId","_newRecord$createdAt","warn","info","byId","getState","rec","token","cred","agentContext","context","newRecord","record","tokenResponse","id","markExpiredWithReplacement","format","createdAt","toISOString","issuer","navigate","ConnectionStack","screen","OpenIDCredentialOffer","params","credential"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useUpgradeExpiredCredential.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["useCallback","useNavigation","useAgent","Screens","Stacks","useOpenIDCredentials","TOKENS","useServices","refreshAndQueueReplacement","useUpgradeExpiredCredential","navigation","agent","getCredentialById","logger","UTIL_LOGGER","upgrade","oldId","warn","info","rec","newRecord","record","id","navigate","ConnectionStack","screen","OpenIDCredentialOffer","params","credential"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useUpgradeExpiredCredential.ts"],"mappings":"AAAA;AACA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAAyBC,aAAa,QAAQ,0BAA0B;AACxE,SAASC,QAAQ,QAAQ,qBAAqB;AAE9C,SAA0BC,OAAO,EAAEC,MAAM,QAAQ,2BAA2B;AAC5E,SAASC,oBAAoB,QAAQ,2CAA2C;AAChF,SAASC,MAAM,EAAEC,WAAW,QAAQ,wBAAwB;AAC5D,SAASC,0BAA0B,QAAQ,uBAAuB;AAElE,OAAO,MAAMC,2BAA2B,GAAGA,CAAA,KAAM;EAC/C,MAAMC,UAAU,GAAGT,aAAa,CAAkC,CAAC;EACnE,MAAM;IAAEU;EAAM,CAAC,GAAGT,QAAQ,CAAC,CAAC;EAC5B,MAAM;IAAEU;EAAkB,CAAC,GAAGP,oBAAoB,CAAC,CAAC;EACpD,MAAM,CAACQ,MAAM,CAAC,GAAGN,WAAW,CAAC,CAACD,MAAM,CAACQ,WAAW,CAAC,CAAC;EAElD,MAAMC,OAAO,GAAGf,WAAW,CACzB,MAAOgB,KAAa,IAAK;IACvB,IAAI,CAACL,KAAK,EAAE;MACVE,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEI,IAAI,CAAC,yDAAyD,CAAC;MACvE;IACF;IAEAJ,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEK,IAAI,CAAC,gDAAgDF,KAAK,EAAE,CAAC;IAErE,MAAMG,GAAG,GAAG,MAAMP,iBAAiB,CAACI,KAAK,CAAC;IAE1C,IAAI,CAACG,GAAG,EAAE;MACRN,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEI,IAAI,CAAC,+CAA+CD,KAAK,EAAE,CAAC;MACpE;IACF;IAEA,MAAMI,SAAS,GAAG,MAAMZ,0BAA0B,CAAC;MACjDG,KAAK;MACLE,MAAM;MACNQ,MAAM,EAAEF;IACV,CAAC,CAAC;IAEF,IAAI,CAACC,SAAS,EAAE;MACdP,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEI,IAAI,CAAC,sDAAsDD,KAAK,EAAE,CAAC;MAC3E;IACF;IAEAH,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEK,IAAI,CAAC,sCAAsCE,SAAS,CAACE,EAAE,eAAeN,KAAK,EAAE,CAAC;;IAEtF;IACAN,UAAU,CAACa,QAAQ,CAACnB,MAAM,CAACoB,eAAe,EAAE;MAC1CC,MAAM,EAAEtB,OAAO,CAACuB,qBAAqB;MACrCC,MAAM,EAAE;QACNC,UAAU,EAAER;MACd;IACF,CAAC,CAAC;EACJ,CAAC,EACD,CAACT,KAAK,EAAEE,MAAM,EAAEH,UAAU,EAAEE,iBAAiB,CAC/C,CAAC;EAED,OAAO;IAAEG;EAAQ,CAAC;AACpB,CAAC","ignoreList":[]}

package/lib/module/modules/openid/metadata.js

@@ -1,4 +1,4 @@
-import { W3cCredentialRecord, SdJwtVcRecord, MdocRecord, W3cCredentialRepository, SdJwtVcRepository, MdocRepository } from '@credo-ts/core';
+import { W3cCredentialRecord, SdJwtVcRecord, MdocRecord, W3cV2CredentialRecord, W3cCredentialRepository, W3cV2CredentialRepository, SdJwtVcRepository, MdocRepository } from '@credo-ts/core';
 export const openId4VcCredentialMetadataKey = '_bifold/openId4VcCredentialMetadata';
 export const refreshCredentialMetadataKey = '_bifold/refreshCredentialMetadata';
 export function extractOpenId4VcCredentialMetadata(credentialMetadata, serverMetadata) {
@@ -52,6 +52,8 @@ export function deleteRefreshCredentialMetadata(credentialRecord) {
 export async function persistCredentialRecord(agentContext, record) {
   if (record instanceof W3cCredentialRecord) {
     await agentContext.dependencyManager.resolve(W3cCredentialRepository).update(agentContext, record);
+  } else if (record instanceof W3cV2CredentialRecord) {
+    await agentContext.dependencyManager.resolve(W3cV2CredentialRepository).update(agentContext, record);
   } else if (record instanceof SdJwtVcRecord) {
     await agentContext.dependencyManager.resolve(SdJwtVcRepository).update(agentContext, record);
   } else if (record instanceof MdocRecord) {

package/lib/module/modules/openid/metadata.js.map

@@ -1 +1 @@
-{"version":3,"names":["W3cCredentialRecord","SdJwtVcRecord","MdocRecord","W3cCredentialRepository","SdJwtVcRepository","MdocRepository","openId4VcCredentialMetadataKey","refreshCredentialMetadataKey","extractOpenId4VcCredentialMetadata","credentialMetadata","serverMetadata","credential","display","order","credential_subject","issuer","id","getOpenId4VcCredentialMetadata","credentialRecord","metadata","get","setOpenId4VcCredentialMetadata","set","getRefreshCredentialMetadata","setRefreshCredentialMetadata","deleteRefreshCredentialMetadata","delete","persistCredentialRecord","agentContext","record","dependencyManager","resolve","update","Error","markOpenIDCredentialStatus","status","refreshMetadata","lastCheckResult","temporaryMetaVanillaObject","notificationMetadata","undefined","tokenResponse"],"sourceRoot":"../../../../src","sources":["modules/openid/metadata.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["W3cCredentialRecord","SdJwtVcRecord","MdocRecord","W3cV2CredentialRecord","W3cCredentialRepository","W3cV2CredentialRepository","SdJwtVcRepository","MdocRepository","openId4VcCredentialMetadataKey","refreshCredentialMetadataKey","extractOpenId4VcCredentialMetadata","credentialMetadata","serverMetadata","credential","display","order","credential_subject","issuer","id","getOpenId4VcCredentialMetadata","credentialRecord","metadata","get","setOpenId4VcCredentialMetadata","set","getRefreshCredentialMetadata","setRefreshCredentialMetadata","deleteRefreshCredentialMetadata","delete","persistCredentialRecord","agentContext","record","dependencyManager","resolve","update","Error","markOpenIDCredentialStatus","status","refreshMetadata","lastCheckResult","temporaryMetaVanillaObject","notificationMetadata","undefined","tokenResponse"],"sourceRoot":"../../../../src","sources":["modules/openid/metadata.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/openid/offerResolve.js

@@ -1,6 +1,21 @@
 import { OpenId4VciCredentialFormatProfile } from '@credo-ts/openid4vc';
 import { DidJwk, DidKey, Kms } from '@credo-ts/core';
 import { extractOpenId4VcCredentialMetadata, setOpenId4VcCredentialMetadata } from './metadata';
+const getCredentialConfigurationIdsToRequest = ({
+  resolvedCredentialOffer,
+  credentialConfigurationIdsToRequest
+}) => {
+  const credentialConfigurationIds = credentialConfigurationIdsToRequest ?? [Object.keys(resolvedCredentialOffer.offeredCredentialConfigurations)[0]];
+  if (credentialConfigurationIds.length === 0 || !credentialConfigurationIds[0]) {
+    throw new Error('No credential configuration ID found in the credential offer.');
+  }
+  for (const credentialConfigurationId of credentialConfigurationIds) {
+    if (!resolvedCredentialOffer.offeredCredentialConfigurations[credentialConfigurationId]) {
+      throw new Error(`Parameter 'credentialConfigurationIdsToRequest' with values ${credentialConfigurationIdsToRequest} is not a credential_configuration_id in the credential offer.`);
+    }
+  }
+  return credentialConfigurationIds;
+};
 export const resolveOpenId4VciOffer = async ({
   agent,
   data,
@@ -22,7 +37,7 @@ export const resolveOpenId4VciOffer = async ({
   });
   const resolvedCredentialOffer = await agent.openid4vc.holder.resolveCredentialOffer(offerUri);
   if (authorization) {
-    throw new Error('Authorization flow is not supported yet as of Credo 0.5.13');
+    throw new Error('Authorization code flow is not implemented in this OpenID credential offer flow.');
   }
   return resolvedCredentialOffer;
 };
@@ -31,7 +46,7 @@ export async function acquirePreAuthorizedAccessToken({
   resolvedCredentialOffer,
   txCode
 }) {
-  return await agent.modules.openid4vc.holder.requestToken({
+  return await agent.openid4vc.holder.requestToken({
     resolvedCredentialOffer,
     txCode
   });
@@ -45,13 +60,7 @@ export const customCredentialBindingResolver = async ({
   proofTypes
 }) => {
   var _proofTypes$jwt;
-  // First, we try to pick a did method
-  // Prefer did:jwk, otherwise use did:key, otherwise use undefined
   let didMethod = supportsAllDidMethods || supportedDidMethods !== null && supportedDidMethods !== void 0 && supportedDidMethods.includes('did:jwk') ? 'jwk' : supportedDidMethods !== null && supportedDidMethods !== void 0 && supportedDidMethods.includes('did:key') ? 'key' : undefined;
-
-  // If supportedDidMethods is undefined, and supportsJwk is false, we will default to did:key
-  // this is important as part of MATTR launchpad support which MUST use did:key but doesn't
-  // define which did methods they support
   if (!supportedDidMethods && !supportsJwk) {
     didMethod = 'key';
   }
@@ -69,21 +78,20 @@ export const customCredentialBindingResolver = async ({
     if (didResult.didState.state !== 'finished') {
       throw new Error('DID creation failed.');
     }
-    let verificationMethodId;
+    let didUrl;
     if (didMethod === 'jwk') {
-      const didJwk = DidJwk.fromDid(didResult.didState.did);
-      verificationMethodId = didJwk.verificationMethodId;
+      didUrl = DidJwk.fromDid(didResult.didState.did).verificationMethodId;
     } else {
       const didKey = DidKey.fromDid(didResult.didState.did);
-      verificationMethodId = `${didKey.did}#${didKey.publicJwk.fingerprint}`;
+      didUrl = `${didKey.did}#${didKey.publicJwk.fingerprint}`;
     }
     return {
-      didUrls: [verificationMethodId],
-      method: 'did'
+      method: 'did',
+      didUrls: [didUrl]
     };
   }
 
-  // Otherwise we also support plain jwk for sd-jwt only
+  // Fallback: plain jwk for sd-jwt/mdoc only
   if (supportsJwk && (credentialFormat === OpenId4VciCredentialFormatProfile.SdJwtVc || credentialFormat === OpenId4VciCredentialFormatProfile.MsoMdoc)) {
     return {
       method: 'jwk',
@@ -97,31 +105,29 @@ export const receiveCredentialFromOpenId4VciOffer = async ({
   resolvedCredentialOffer,
   tokenResponse,
   credentialConfigurationIdsToRequest,
-  clientId,
-  pidSchemes
+  clientId
 }) => {
-  const offeredCredentialsToRequest = credentialConfigurationIdsToRequest ? Object.entries(resolvedCredentialOffer.offeredCredentialConfigurations).filter(([k]) => credentialConfigurationIdsToRequest.includes(k)) : [Object.values(resolvedCredentialOffer.offeredCredentialConfigurations)[0]];
-  if (offeredCredentialsToRequest.length === 0) {
-    throw new Error(`Parameter 'credentialConfigurationIdsToRequest' with values ${credentialConfigurationIdsToRequest} is not a credential_configuration_id in the credential offer.`);
-  }
+  const credentialConfigurationIds = getCredentialConfigurationIdsToRequest({
+    resolvedCredentialOffer,
+    credentialConfigurationIdsToRequest
+  });
   const credentials = await agent.openid4vc.holder.requestCredentials({
     resolvedCredentialOffer,
     ...tokenResponse,
     clientId,
-    credentialConfigurationIds: credentialConfigurationIdsToRequest,
+    credentialConfigurationIds,
     verifyCredentialStatus: false,
     allowedProofOfPossessionSignatureAlgorithms: [
     // NOTE: MATTR launchpad for JFF MUST use EdDSA. So it is important that the default (first allowed one)
     // is EdDSA. The list is ordered by preference, so if no suites are defined by the issuer, the first one
     // will be used
-    "EdDSA", "ES256"],
+    'EdDSA', 'ES256'],
     credentialBindingResolver: async ({
       supportedDidMethods,
       proofTypes,
       supportsAllDidMethods,
       supportsJwk,
-      credentialFormat,
-      credentialConfigurationId
+      credentialFormat
     }) => {
       return customCredentialBindingResolver({
         agent,
@@ -129,10 +135,7 @@ export const receiveCredentialFromOpenId4VciOffer = async ({
         proofTypes,
         supportsAllDidMethods,
         supportsJwk,
-        credentialFormat,
-        credentialConfigurationId,
-        resolvedCredentialOffer,
-        pidSchemes
+        credentialFormat
       });
     }
   });
@@ -144,36 +147,9 @@ export const receiveCredentialFromOpenId4VciOffer = async ({
     throw new Error('Error retrieving credential using pre authorized flow: firstCredential is string.');
   }
   const record = firstCredential.record;
-
-  // This block likely not necessary anymore? The record seems to be defined on this object already.
-
-  // if ('compact' in firstCredential.) {
-  //   // TODO: add claimFormat to SdJwtVc
-  //   record = new SdJwtVcRecord({
-  //     credentialInstances: firstCredential.credential.compact,
-  //   })
-  // } else if (firstCredential.credential instanceof Mdoc) {
-  //   record = new MdocRecord({
-  //     mdoc: firstCredential.credential,
-  //   })
-  // } else {
-  //   record = new W3cCredentialRecord({
-  //     credential: firstCredential.credential as W3cJwtVerifiableCredential | W3cJsonLdVerifiableCredential,
-  //     // We don't support expanded types right now, but would become problem when we support JSON-LD
-  //     tags: {},
-  //   })
-  // }
-
-  // TODO: Confirm how this should be handled, notificationMetadata for openid4vc may have been removed
-
-  // const notificationMetadata = { ...firstCredential.notificationMetadata }
-  // if (notificationMetadata) {
-  //   temporaryMetaVanillaObject.notificationMetadata = notificationMetadata
-  // }
-
-  const openId4VcMetadata = extractOpenId4VcCredentialMetadata(Object.values(resolvedCredentialOffer.offeredCredentialConfigurations)[0], {
+  const requestedCredentialConfiguration = resolvedCredentialOffer.offeredCredentialConfigurations[credentialConfigurationIds[0]];
+  const openId4VcMetadata = extractOpenId4VcCredentialMetadata(requestedCredentialConfiguration, {
     id: resolvedCredentialOffer.metadata.credentialIssuer.credential_issuer,
-    // This might not be correct
     display: resolvedCredentialOffer.metadata.credentialIssuer.display
   });
   setOpenId4VcCredentialMetadata(record, openId4VcMetadata);