@bifold/core 3.0.0 → 3.0.1

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":"AAAA;AACA,SAASA,WAAW,QAAQ,OAAO;AACnC,SAASC,kBAAkB,QAAQ,qBAAqB;AAQxD,SAASC,gBAAgBA,CAACC,KAAa,EAAsB;EAC3D,MAAMC,CAAC,GAAGH,kBAAkB,CAACI,QAAQ,CAAC,CAAC;EACvC;EACA,KAAK,MAAM,CAACC,KAAK,EAAEC,IAAI,CAAC,IAAIC,MAAM,CAACC,OAAO,CAACL,CAAC,CAACM,YAAY,CAAC,EAAE;IAC1D,IAAI,CAAAH,IAAI,aAAJA,IAAI,uBAAJA,IAAI,CAAEI,EAAE,MAAKR,KAAK,EAAE,OAAOG,KAAK;EACtC;EACA,OAAOM,SAAS;AAClB;;AAEA;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,GAAGhB,WAAW,CAChC,MAAOM,KAAa,IAAK;IACvBL,kBAAkB,CAACgB,QAAQ,CAAEC,IAAI,IAAK;MACpC;MACA,MAAM;QAAE,CAACZ,KAAK,GAAGa,SAAS;QAAE,GAAGC;MAAS,CAAC,GAAGF,IAAI,CAACR,YAAY;MAC7D;MACA,MAAM;QAAE,CAACJ,KAAK,GAAGe,QAAQ;QAAE,GAAGC;MAAe,CAAC,GAAGJ,IAAI,CAACK,UAAU;MAChE,OAAO;QACL,GAAGL,IAAI;QACPM,OAAO,EAAEN,IAAI,CAACM,OAAO;QACrBC,OAAO,EAAEP,IAAI,CAACO,OAAO,CAACC,MAAM,CAAEf,EAAE,IAAKA,EAAE,KAAKL,KAAK,CAAC;QAClDI,YAAY,EAAEU,QAAQ;QACtBG,UAAU,EAAED;MACd,CAAC;IACH,CAAC,CAAC;IACFP,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEY,IAAI,CAAC,2DAA2DrB,KAAK,EAAE,CAAC;EAClF,CAAC,EACD,CAACS,MAAM,CACT,CAAC;;EAED;AACF;AACA;EACE,MAAMa,cAAc,GAAG5B,WAAW,CAChC,MAAOG,KAAa,IAAK;IACvB,MAAMG,KAAK,GAAGJ,gBAAgB,CAACC,KAAK,CAAC;IACrC,IAAI,CAACG,KAAK,EAAE;MACVS,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEc,IAAI,CAAC,kDAAkD1B,KAAK,EAAE,CAAC;MACvE;IACF;IACA,MAAMa,cAAc,CAACV,KAAK,CAAC;EAC7B,CAAC,EACD,CAACU,cAAc,EAAED,MAAM,CACzB,CAAC;;EAED;AACF;AACA;EACE,MAAMe,uBAAuB,GAAG9B,WAAW,CACzC,MAAO+B,KAAyB,IAAK;IAAA,IAAAC,eAAA,EAAAC,gBAAA;IACnC,MAAM3B,KAAK,GAAGyB,KAAK,aAALA,KAAK,gBAAAC,eAAA,GAALD,KAAK,CAAEG,QAAQ,cAAAF,eAAA,uBAAfA,eAAA,CAAiB1B,KAA2B;IAC1D,IAAIA,KAAK,EAAE;MACT,MAAMU,cAAc,CAACV,KAAK,CAAC;MAC3B;IACF;IACA,MAAMH,KAAK,GAAG4B,KAAK,aAALA,KAAK,gBAAAE,gBAAA,GAALF,KAAK,CAAEG,QAAQ,cAAAD,gBAAA,uBAAfA,gBAAA,CAAiBE,aAAmC;IAClE,IAAIhC,KAAK,EAAE;MACT,MAAMyB,cAAc,CAACzB,KAAK,CAAC;MAC3B;IACF;IACAY,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEc,IAAI,CAAC,2DAA2D,CAAC;EAC3E,CAAC,EACD,CAACb,cAAc,EAAEY,cAAc,EAAEb,MAAM,CACzC,CAAC;EAED,OAAO;IAAEC,cAAc;IAAEY,cAAc;IAAEE;EAAwB,CAAC;AACpE","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);

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

@@ -1 +1 @@
-{"version":3,"names":["OpenId4VciCredentialFormatProfile","DidJwk","DidKey","Kms","extractOpenId4VcCredentialMetadata","setOpenId4VcCredentialMetadata","resolveOpenId4VciOffer","agent","data","uri","authorization","offerUri","encodeURIComponent","JSON","stringify","Error","config","logger","info","resolvedCredentialOffer","openid4vc","holder","resolveCredentialOffer","acquirePreAuthorizedAccessToken","txCode","modules","requestToken","customCredentialBindingResolver","supportedDidMethods","supportsAllDidMethods","supportsJwk","credentialFormat","proofTypes","_proofTypes$jwt","didMethod","includes","undefined","key","kms","createKeyForSignatureAlgorithm","algorithm","jwt","supportedSignatureAlgorithms","publicJwk","PublicJwk","fromPublicJwk","didResult","dids","create","method","options","keyId","didState","state","verificationMethodId","didJwk","fromDid","did","didKey","fingerprint","didUrls","SdJwtVc","MsoMdoc","keys","join","receiveCredentialFromOpenId4VciOffer","tokenResponse","credentialConfigurationIdsToRequest","clientId","pidSchemes","offeredCredentialsToRequest","Object","entries","offeredCredentialConfigurations","filter","k","values","length","credentials","requestCredentials","credentialConfigurationIds","verifyCredentialStatus","allowedProofOfPossessionSignatureAlgorithms","credentialBindingResolver","credentialConfigurationId","firstCredential","record","openId4VcMetadata","id","metadata","credentialIssuer","credential_issuer","display"],"sourceRoot":"../../../../src","sources":["modules/openid/offerResolve.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["OpenId4VciCredentialFormatProfile","DidJwk","DidKey","Kms","extractOpenId4VcCredentialMetadata","setOpenId4VcCredentialMetadata","getCredentialConfigurationIdsToRequest","resolvedCredentialOffer","credentialConfigurationIdsToRequest","credentialConfigurationIds","Object","keys","offeredCredentialConfigurations","length","Error","credentialConfigurationId","resolveOpenId4VciOffer","agent","data","uri","authorization","offerUri","encodeURIComponent","JSON","stringify","config","logger","info","openid4vc","holder","resolveCredentialOffer","acquirePreAuthorizedAccessToken","txCode","requestToken","customCredentialBindingResolver","supportedDidMethods","supportsAllDidMethods","supportsJwk","credentialFormat","proofTypes","_proofTypes$jwt","didMethod","includes","undefined","key","kms","createKeyForSignatureAlgorithm","algorithm","jwt","supportedSignatureAlgorithms","publicJwk","PublicJwk","fromPublicJwk","didResult","dids","create","method","options","keyId","didState","state","didUrl","fromDid","did","verificationMethodId","didKey","fingerprint","didUrls","SdJwtVc","MsoMdoc","join","receiveCredentialFromOpenId4VciOffer","tokenResponse","clientId","credentials","requestCredentials","verifyCredentialStatus","allowedProofOfPossessionSignatureAlgorithms","credentialBindingResolver","firstCredential","record","requestedCredentialConfiguration","openId4VcMetadata","id","metadata","credentialIssuer","credential_issuer","display"],"sourceRoot":"../../../../src","sources":["modules/openid/offerResolve.tsx"],"mappings":"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","ignoreList":[]}

package/lib/module/modules/openid/refresh/operations.js

@@ -0,0 +1,31 @@
+import { toOpenIDCredentialLite } from '../credentialRecord';
+import { refreshAccessToken } from './refreshToken';
+import { credentialRegistry } from './registry';
+import { reissueCredentialWithAccessToken } from './reIssuance';
+export async function refreshAndQueueReplacement({
+  agent,
+  logger,
+  record,
+  toLite = toOpenIDCredentialLite
+}) {
+  const token = await refreshAccessToken({
+    logger,
+    cred: record,
+    agentContext: agent.context
+  });
+  if (!token) {
+    return undefined;
+  }
+  const newRecord = await reissueCredentialWithAccessToken({
+    agent,
+    logger,
+    record,
+    tokenResponse: token
+  });
+  if (!newRecord) {
+    return undefined;
+  }
+  credentialRegistry.getState().markExpiredWithReplacement(record.id, toLite(newRecord));
+  return newRecord;
+}
+//# sourceMappingURL=operations.js.map

package/lib/module/modules/openid/refresh/operations.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["toOpenIDCredentialLite","refreshAccessToken","credentialRegistry","reissueCredentialWithAccessToken","refreshAndQueueReplacement","agent","logger","record","toLite","token","cred","agentContext","context","undefined","newRecord","tokenResponse","getState","markExpiredWithReplacement","id"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/operations.ts"],"mappings":"AAEA,SAAiCA,sBAAsB,QAAQ,qBAAqB;AACpF,SAASC,kBAAkB,QAAQ,gBAAgB;AACnD,SAASC,kBAAkB,QAAQ,YAAY;AAC/C,SAASC,gCAAgC,QAAQ,cAAc;AAU/D,OAAO,eAAeC,0BAA0BA,CAAC;EAC/CC,KAAK;EACLC,MAAM;EACNC,MAAM;EACNC,MAAM,GAAGR;AACc,CAAC,EAAE;EAC1B,MAAMS,KAAK,GAAG,MAAMR,kBAAkB,CAAC;IAAEK,MAAM;IAAEI,IAAI,EAAEH,MAAM;IAAEI,YAAY,EAAEN,KAAK,CAACO;EAAQ,CAAC,CAAC;EAC7F,IAAI,CAACH,KAAK,EAAE;IACV,OAAOI,SAAS;EAClB;EAEA,MAAMC,SAAS,GAAG,MAAMX,gCAAgC,CAAC;IACvDE,KAAK;IACLC,MAAM;IACNC,MAAM;IACNQ,aAAa,EAAEN;EACjB,CAAC,CAAC;EAEF,IAAI,CAACK,SAAS,EAAE;IACd,OAAOD,SAAS;EAClB;EAEAX,kBAAkB,CAACc,QAAQ,CAAC,CAAC,CAACC,0BAA0B,CAACV,MAAM,CAACW,EAAE,EAAEV,MAAM,CAACM,SAAS,CAAC,CAAC;EACtF,OAAOA,SAAS;AAClB","ignoreList":[]}

package/lib/module/modules/openid/refresh/reIssuance.js

@@ -6,8 +6,7 @@ export async function reissueCredentialWithAccessToken({
   logger,
   record,
   tokenResponse,
-  clientId,
-  pidSchemes
+  clientId
 }) {
   if (!record) {
     throw new Error('No credential record provided for re-issuance.');
@@ -29,26 +28,23 @@ export async function reissueCredentialWithAccessToken({
   logger.info('*** Starting to get new credential via re-issuance flow ***');
   // Request a **new** credential using the *existing* configuration id
 
-  const creds = await agent.modules.openid4vc.holder.requestCredentials({
+  const creds = await agent.openid4vc.holder.requestCredentials({
     resolvedCredentialOffer,
     accessToken: tokenResponse.access_token,
     tokenType: tokenResponse.token_type || 'Bearer',
     cNonce: tokenResponse.c_nonce,
     clientId,
-    credentialsToRequest: [credentialConfigurationId],
+    credentialConfigurationIds: [credentialConfigurationId],
     verifyCredentialStatus: false,
     // you’ll check after storing
     allowedProofOfPossessionSignatureAlgorithms: ['EdDSA', 'ES256'],
     credentialBindingResolver: async opts => customCredentialBindingResolver({
       agent,
       supportedDidMethods: opts.supportedDidMethods,
-      // keyType: opts.keyType,
+      proofTypes: opts.proofTypes,
       supportsAllDidMethods: opts.supportsAllDidMethods,
       supportsJwk: opts.supportsJwk,
-      credentialFormat: opts.credentialFormat,
-      // supportedCredentialId: opts.supportedCredentialId,
-      resolvedCredentialOffer: resolvedCredentialOffer,
-      pidSchemes
+      credentialFormat: opts.credentialFormat
     })
   });
   logger.info('*** New credential received via re-issuance flow ***.');
@@ -70,7 +66,8 @@ export async function reissueCredentialWithAccessToken({
   //   })
   // }
 
-  const openId4VcMetadata = extractOpenId4VcCredentialMetadata(resolvedCredentialOffer.offeredCredentialConfigurations, {
+  const requestedCredentialConfiguration = resolvedCredentialOffer.offeredCredentialConfigurations[credentialConfigurationId];
+  const openId4VcMetadata = extractOpenId4VcCredentialMetadata(requestedCredentialConfiguration, {
     id: resolvedCredentialOffer.metadata.credentialIssuer.credential_issuer,
     display: resolvedCredentialOffer.metadata.credentialIssuer.display
   });

package/lib/module/modules/openid/refresh/reIssuance.js.map

@@ -1 +1 @@
-{"version":3,"names":["customCredentialBindingResolver","extractOpenId4VcCredentialMetadata","getRefreshCredentialMetadata","setOpenId4VcCredentialMetadata","setRefreshCredentialMetadata","RefreshStatus","reissueCredentialWithAccessToken","agent","logger","record","tokenResponse","clientId","pidSchemes","Error","refreshMetaData","credentialConfigurationId","resolvedCredentialOffer","access_token","info","creds","modules","openid4vc","holder","requestCredentials","accessToken","tokenType","token_type","cNonce","c_nonce","credentialsToRequest","verifyCredentialStatus","allowedProofOfPossessionSignatureAlgorithms","credentialBindingResolver","opts","supportedDidMethods","supportsAllDidMethods","supportsJwk","credentialFormat","firstCredential","credentials","newRecord","openId4VcMetadata","offeredCredentialConfigurations","id","metadata","credentialIssuer","credential_issuer","display","refreshToken","refresh_token","lastCheckedAt","Date","now","lastCheckResult","Valid"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/reIssuance.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["customCredentialBindingResolver","extractOpenId4VcCredentialMetadata","getRefreshCredentialMetadata","setOpenId4VcCredentialMetadata","setRefreshCredentialMetadata","RefreshStatus","reissueCredentialWithAccessToken","agent","logger","record","tokenResponse","clientId","Error","refreshMetaData","credentialConfigurationId","resolvedCredentialOffer","access_token","info","creds","openid4vc","holder","requestCredentials","accessToken","tokenType","token_type","cNonce","c_nonce","credentialConfigurationIds","verifyCredentialStatus","allowedProofOfPossessionSignatureAlgorithms","credentialBindingResolver","opts","supportedDidMethods","proofTypes","supportsAllDidMethods","supportsJwk","credentialFormat","firstCredential","credentials","newRecord","requestedCredentialConfiguration","offeredCredentialConfigurations","openId4VcMetadata","id","metadata","credentialIssuer","credential_issuer","display","refreshToken","refresh_token","lastCheckedAt","Date","now","lastCheckResult","Valid"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/reIssuance.ts"],"mappings":"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","ignoreList":[]}