@bifold/core 3.0.0 → 3.0.1

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

@@ -8,11 +8,9 @@ var _react = require("react");
 var _native = require("@react-navigation/native");
 var _reactHooks = require("@bifold/react-hooks");
 var _navigators = require("../../../types/navigators");
-var _refreshToken = require("../refresh/refreshToken");
-var _reIssuance = require("../refresh/reIssuance");
 var _OpenIDCredentialRecordProvider = require("../context/OpenIDCredentialRecordProvider");
-var _registry = require("../refresh/registry");
 var _containerApi = require("../../../container-api");
+var _operations = require("../refresh/operations");
 // modules/openid/hooks/useUpgradeExpiredCredential.ts
 
 const useUpgradeExpiredCredential = () => {
@@ -21,71 +19,39 @@ const useUpgradeExpiredCredential = () => {
     agent
   } = (0, _reactHooks.useAgent)();
   const {
-    getSdJwtCredentialById
+    getCredentialById
   } = (0, _OpenIDCredentialRecordProvider.useOpenIDCredentials)();
   const [logger] = (0, _containerApi.useServices)([_containerApi.TOKENS.UTIL_LOGGER]);
   const upgrade = (0, _react.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 = _registry.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 (0, _refreshToken.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 (0, _reIssuance.reissueCredentialWithAccessToken)({
+    const newRecord = await (0, _operations.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)
-    _registry.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(_navigators.Stacks.ConnectionStack, {
       screen: _navigators.Screens.OpenIDCredentialOffer,
       params: {
         credential: newRecord
       }
     });
-  }, [agent, logger, navigation, getSdJwtCredentialById]);
+  }, [agent, logger, navigation, getCredentialById]);
   return {
     upgrade
   };

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

@@ -1 +1 @@
-{"version":3,"names":["_react","require","_native","_reactHooks","_navigators","_refreshToken","_reIssuance","_OpenIDCredentialRecordProvider","_registry","_containerApi","useUpgradeExpiredCredential","navigation","useNavigation","agent","useAgent","getSdJwtCredentialById","useOpenIDCredentials","logger","useServices","TOKENS","UTIL_LOGGER","upgrade","useCallback","oldId","_newRecord$createdAt","warn","info","byId","credentialRegistry","getState","rec","token","refreshAccessToken","cred","agentContext","context","newRecord","reissueCredentialWithAccessToken","record","tokenResponse","id","markExpiredWithReplacement","format","createdAt","toISOString","issuer","navigate","Stacks","ConnectionStack","screen","Screens","OpenIDCredentialOffer","params","credential","exports"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useUpgradeExpiredCredential.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["_react","require","_native","_reactHooks","_navigators","_OpenIDCredentialRecordProvider","_containerApi","_operations","useUpgradeExpiredCredential","navigation","useNavigation","agent","useAgent","getCredentialById","useOpenIDCredentials","logger","useServices","TOKENS","UTIL_LOGGER","upgrade","useCallback","oldId","warn","info","rec","newRecord","refreshAndQueueReplacement","record","id","navigate","Stacks","ConnectionStack","screen","Screens","OpenIDCredentialOffer","params","credential","exports"],"sourceRoot":"../../../../../src","sources":["modules/openid/hooks/useUpgradeExpiredCredential.ts"],"mappings":";;;;;;AACA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,WAAA,GAAAF,OAAA;AAEA,IAAAG,WAAA,GAAAH,OAAA;AACA,IAAAI,+BAAA,GAAAJ,OAAA;AACA,IAAAK,aAAA,GAAAL,OAAA;AACA,IAAAM,WAAA,GAAAN,OAAA;AARA;;AAUO,MAAMO,2BAA2B,GAAGA,CAAA,KAAM;EAC/C,MAAMC,UAAU,GAAG,IAAAC,qBAAa,EAAkC,CAAC;EACnE,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,oBAAQ,EAAC,CAAC;EAC5B,MAAM;IAAEC;EAAkB,CAAC,GAAG,IAAAC,oDAAoB,EAAC,CAAC;EACpD,MAAM,CAACC,MAAM,CAAC,GAAG,IAAAC,yBAAW,EAAC,CAACC,oBAAM,CAACC,WAAW,CAAC,CAAC;EAElD,MAAMC,OAAO,GAAG,IAAAC,kBAAW,EACzB,MAAOC,KAAa,IAAK;IACvB,IAAI,CAACV,KAAK,EAAE;MACVI,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEO,IAAI,CAAC,yDAAyD,CAAC;MACvE;IACF;IAEAP,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEQ,IAAI,CAAC,gDAAgDF,KAAK,EAAE,CAAC;IAErE,MAAMG,GAAG,GAAG,MAAMX,iBAAiB,CAACQ,KAAK,CAAC;IAE1C,IAAI,CAACG,GAAG,EAAE;MACRT,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEO,IAAI,CAAC,+CAA+CD,KAAK,EAAE,CAAC;MACpE;IACF;IAEA,MAAMI,SAAS,GAAG,MAAM,IAAAC,sCAA0B,EAAC;MACjDf,KAAK;MACLI,MAAM;MACNY,MAAM,EAAEH;IACV,CAAC,CAAC;IAEF,IAAI,CAACC,SAAS,EAAE;MACdV,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEO,IAAI,CAAC,sDAAsDD,KAAK,EAAE,CAAC;MAC3E;IACF;IAEAN,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEQ,IAAI,CAAC,sCAAsCE,SAAS,CAACG,EAAE,eAAeP,KAAK,EAAE,CAAC;;IAEtF;IACAZ,UAAU,CAACoB,QAAQ,CAACC,kBAAM,CAACC,eAAe,EAAE;MAC1CC,MAAM,EAAEC,mBAAO,CAACC,qBAAqB;MACrCC,MAAM,EAAE;QACNC,UAAU,EAAEX;MACd;IACF,CAAC,CAAC;EACJ,CAAC,EACD,CAACd,KAAK,EAAEI,MAAM,EAAEN,UAAU,EAAEI,iBAAiB,CAC/C,CAAC;EAED,OAAO;IAAEM;EAAQ,CAAC;AACpB,CAAC;AAAAkB,OAAA,CAAA7B,2BAAA,GAAAA,2BAAA","ignoreList":[]}

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

@@ -68,6 +68,8 @@ function deleteRefreshCredentialMetadata(credentialRecord) {
 async function persistCredentialRecord(agentContext, record) {
   if (record instanceof _core.W3cCredentialRecord) {
     await agentContext.dependencyManager.resolve(_core.W3cCredentialRepository).update(agentContext, record);
+  } else if (record instanceof _core.W3cV2CredentialRecord) {
+    await agentContext.dependencyManager.resolve(_core.W3cV2CredentialRepository).update(agentContext, record);
   } else if (record instanceof _core.SdJwtVcRecord) {
     await agentContext.dependencyManager.resolve(_core.SdJwtVcRepository).update(agentContext, record);
   } else if (record instanceof _core.MdocRecord) {

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

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

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

@@ -8,6 +8,21 @@ exports.resolveOpenId4VciOffer = exports.receiveCredentialFromOpenId4VciOffer =
 var _openid4vc = require("@credo-ts/openid4vc");
 var _core = require("@credo-ts/core");
 var _metadata = require("./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;
+};
 const resolveOpenId4VciOffer = async ({
   agent,
   data,
@@ -29,7 +44,7 @@ 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;
 };
@@ -39,7 +54,7 @@ async function acquirePreAuthorizedAccessToken({
   resolvedCredentialOffer,
   txCode
 }) {
-  return await agent.modules.openid4vc.holder.requestToken({
+  return await agent.openid4vc.holder.requestToken({
     resolvedCredentialOffer,
     txCode
   });
@@ -53,13 +68,7 @@ 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';
   }
@@ -77,21 +86,20 @@ const customCredentialBindingResolver = async ({
     if (didResult.didState.state !== 'finished') {
       throw new Error('DID creation failed.');
     }
-    let verificationMethodId;
+    let didUrl;
     if (didMethod === 'jwk') {
-      const didJwk = _core.DidJwk.fromDid(didResult.didState.did);
-      verificationMethodId = didJwk.verificationMethodId;
+      didUrl = _core.DidJwk.fromDid(didResult.didState.did).verificationMethodId;
     } else {
       const didKey = _core.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 === _openid4vc.OpenId4VciCredentialFormatProfile.SdJwtVc || credentialFormat === _openid4vc.OpenId4VciCredentialFormatProfile.MsoMdoc)) {
     return {
       method: 'jwk',
@@ -106,31 +114,29 @@ 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,
@@ -138,10 +144,7 @@ const receiveCredentialFromOpenId4VciOffer = async ({
         proofTypes,
         supportsAllDidMethods,
         supportsJwk,
-        credentialFormat,
-        credentialConfigurationId,
-        resolvedCredentialOffer,
-        pidSchemes
+        credentialFormat
       });
     }
   });
@@ -153,36 +156,9 @@ 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 = (0, _metadata.extractOpenId4VcCredentialMetadata)(Object.values(resolvedCredentialOffer.offeredCredentialConfigurations)[0], {
+  const requestedCredentialConfiguration = resolvedCredentialOffer.offeredCredentialConfigurations[credentialConfigurationIds[0]];
+  const openId4VcMetadata = (0, _metadata.extractOpenId4VcCredentialMetadata)(requestedCredentialConfiguration, {
     id: resolvedCredentialOffer.metadata.credentialIssuer.credential_issuer,
-    // This might not be correct
     display: resolvedCredentialOffer.metadata.credentialIssuer.display
   });
   (0, _metadata.setOpenId4VcCredentialMetadata)(record, openId4VcMetadata);

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

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

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

@@ -0,0 +1,37 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.refreshAndQueueReplacement = refreshAndQueueReplacement;
+var _credentialRecord = require("../credentialRecord");
+var _refreshToken = require("./refreshToken");
+var _registry = require("./registry");
+var _reIssuance = require("./reIssuance");
+async function refreshAndQueueReplacement({
+  agent,
+  logger,
+  record,
+  toLite = _credentialRecord.toOpenIDCredentialLite
+}) {
+  const token = await (0, _refreshToken.refreshAccessToken)({
+    logger,
+    cred: record,
+    agentContext: agent.context
+  });
+  if (!token) {
+    return undefined;
+  }
+  const newRecord = await (0, _reIssuance.reissueCredentialWithAccessToken)({
+    agent,
+    logger,
+    record,
+    tokenResponse: token
+  });
+  if (!newRecord) {
+    return undefined;
+  }
+  _registry.credentialRegistry.getState().markExpiredWithReplacement(record.id, toLite(newRecord));
+  return newRecord;
+}
+//# sourceMappingURL=operations.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["_credentialRecord","require","_refreshToken","_registry","_reIssuance","refreshAndQueueReplacement","agent","logger","record","toLite","toOpenIDCredentialLite","token","refreshAccessToken","cred","agentContext","context","undefined","newRecord","reissueCredentialWithAccessToken","tokenResponse","credentialRegistry","getState","markExpiredWithReplacement","id"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/operations.ts"],"mappings":";;;;;;AAEA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,aAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,WAAA,GAAAH,OAAA;AAUO,eAAeI,0BAA0BA,CAAC;EAC/CC,KAAK;EACLC,MAAM;EACNC,MAAM;EACNC,MAAM,GAAGC;AACc,CAAC,EAAE;EAC1B,MAAMC,KAAK,GAAG,MAAM,IAAAC,gCAAkB,EAAC;IAAEL,MAAM;IAAEM,IAAI,EAAEL,MAAM;IAAEM,YAAY,EAAER,KAAK,CAACS;EAAQ,CAAC,CAAC;EAC7F,IAAI,CAACJ,KAAK,EAAE;IACV,OAAOK,SAAS;EAClB;EAEA,MAAMC,SAAS,GAAG,MAAM,IAAAC,4CAAgC,EAAC;IACvDZ,KAAK;IACLC,MAAM;IACNC,MAAM;IACNW,aAAa,EAAER;EACjB,CAAC,CAAC;EAEF,IAAI,CAACM,SAAS,EAAE;IACd,OAAOD,SAAS;EAClB;EAEAI,4BAAkB,CAACC,QAAQ,CAAC,CAAC,CAACC,0BAA0B,CAACd,MAAM,CAACe,EAAE,EAAEd,MAAM,CAACQ,SAAS,CAAC,CAAC;EACtF,OAAOA,SAAS;AAClB","ignoreList":[]}

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

@@ -12,8 +12,7 @@ async function reissueCredentialWithAccessToken({
   logger,
   record,
   tokenResponse,
-  clientId,
-  pidSchemes
+  clientId
 }) {
   if (!record) {
     throw new Error('No credential record provided for re-issuance.');
@@ -35,26 +34,23 @@ 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 => (0, _offerResolve.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 ***.');
@@ -76,7 +72,8 @@ async function reissueCredentialWithAccessToken({
   //   })
   // }
 
-  const openId4VcMetadata = (0, _metadata.extractOpenId4VcCredentialMetadata)(resolvedCredentialOffer.offeredCredentialConfigurations, {
+  const requestedCredentialConfiguration = resolvedCredentialOffer.offeredCredentialConfigurations[credentialConfigurationId];
+  const openId4VcMetadata = (0, _metadata.extractOpenId4VcCredentialMetadata)(requestedCredentialConfiguration, {
     id: resolvedCredentialOffer.metadata.credentialIssuer.credential_issuer,
     display: resolvedCredentialOffer.metadata.credentialIssuer.display
   });

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

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