@bifold/core 3.0.0 → 3.0.1

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

@@ -1,42 +1,31 @@
 // modules/openid/refresh/RefreshOrchestrator.ts
-import { ClaimFormat, SdJwtVcRecord, W3cCredentialRecord } from '@credo-ts/core';
-import { refreshAccessToken } from './refreshToken';
-import { reissueCredentialWithAccessToken } from './reIssuance';
-import { RefreshStatus } from './types';
+
+import { OpenIDCredentialRefreshFlowType, RefreshStatus } from './types';
 import { credentialRegistry } from './registry';
 import { verifyCredentialStatus } from './verifyCredentialStatus';
 import { getRefreshCredentialMetadata, markOpenIDCredentialStatus, persistCredentialRecord, setRefreshCredentialMetadata } from '../metadata';
-const defaultToLite = rec => {
-  var _rec$createdAt;
-  return {
-    id: rec.id,
-    // best-effort: SdJwt/W3C both expose claimFormat via tags in many setups.
-    // Fallback to JwtVc if unknown so UI has *some* value.
-    format: rec instanceof W3cCredentialRecord && ClaimFormat.JwtVc || rec instanceof SdJwtVcRecord && ClaimFormat.SdJwtW3cVc || ClaimFormat.JwtVc,
-    // TODO: Won't these checks against ClaimFormat always be true?
-    createdAt: (_rec$createdAt = rec.createdAt) === null || _rec$createdAt === void 0 ? void 0 : _rec$createdAt.toISOString(),
-    issuer: undefined
-  };
-};
+import { toOpenIDCredentialLite } from '../credentialRecord';
+import { refreshAndQueueReplacement } from './operations';
 export class RefreshOrchestrator {
   intervalOn = false; // interval enabled?
   runningOnce = false; // a run is in progress?
 
   recentlyIssued = new Map();
-  checkStatusOnly = true;
   constructor(logger, bridge, opts) {
     this.logger = logger;
     this.opts = {
       intervalMs: 15 * 60 * 1000,
       autoStart: true,
+      flowType: OpenIDCredentialRefreshFlowType.FullReplacement,
       onError: e => this.logger.error(String(e)),
       listRecords: async () => [],
-      toLite: defaultToLite,
+      toLite: toOpenIDCredentialLite,
       ...(opts ?? {})
     };
     logger.info(`🔧 [RefreshOrchestrator] initialized -> ${JSON.stringify({
       intervalMs: this.opts.intervalMs,
-      autoStart: this.opts.autoStart
+      autoStart: this.opts.autoStart,
+      flowType: this.opts.flowType
     })}`);
     bridge.onReady(agent => {
       this.agent = agent;
@@ -59,7 +48,8 @@ export class RefreshOrchestrator {
     };
     this.logger.info(`🔧 [RefreshOrchestrator] configure -> ${JSON.stringify({
       intervalMs: this.opts.intervalMs,
-      autoStart: this.opts.autoStart
+      autoStart: this.opts.autoStart,
+      flowType: this.opts.flowType
     })}`);
     const nowIntervalMs = this.opts.intervalMs ?? null;
     const nowAutoStart = this.opts.autoStart ?? true;
@@ -133,8 +123,11 @@ export class RefreshOrchestrator {
       for (const rec of records) {
         // don’t block whole batch if one fails
         try {
-          await this.checkRecordStatus(rec);
-          // await this.refreshRecord(rec)
+          if (this.opts.flowType === OpenIDCredentialRefreshFlowType.FullReplacement) {
+            await this.refreshRecord(rec);
+          } else {
+            await this.checkRecordStatus(rec);
+          }
         } catch (e) {
           var _this$opts$onError, _this$opts;
           this.logger.error(`💥 [Refresh] record ${rec.id} failed: ${String(e)}`);
@@ -165,6 +158,7 @@ export class RefreshOrchestrator {
       shouldSkip,
       markRefreshing,
       clearRefreshing,
+      clearExpired,
       upsert,
       markInvalid,
       setLastSweep
@@ -189,19 +183,22 @@ export class RefreshOrchestrator {
     this.logger.info(`🧭 [Refresh] check credential ${id}`);
     try {
       // 3) verification
-      const isValid = await verifyCredentialStatus(rec, this.logger);
+      const status = await verifyCredentialStatus(rec, this.logger);
       const now = Date.now();
       const meta = getRefreshCredentialMetadata(rec) ?? {};
-      meta.lastCheckResult = isValid ? RefreshStatus.Valid : RefreshStatus.Invalid;
+      meta.lastCheckResult = status;
       meta.lastCheckedAt = now;
       meta.attemptCount = (meta.attemptCount ?? 0) + 1;
       setRefreshCredentialMetadata(rec, meta);
       await persistCredentialRecord(this.agent.context, rec);
-      if (isValid) {
+      if (status === RefreshStatus.Valid) {
         this.logger.info(`✅ [Refresh] valid → ${id}`);
-      } else {
+        clearExpired(id);
+      } else if (status === RefreshStatus.Invalid) {
         this.logger.info(`❌ [Refresh] invalid → ${id}`);
-        markInvalid(id); // <-- key change: we only flag invalid here
+        markInvalid(id);
+      } else {
+        this.logger.warn(`⚠️ [Refresh] status check error → ${id}`);
       }
       setLastSweep(new Date(now).toISOString());
     } catch (error) {
@@ -218,9 +215,8 @@ export class RefreshOrchestrator {
       markRefreshing,
       clearRefreshing,
       clearExpired,
-      markExpiredWithReplacement,
-      blockAsFailed,
       blockAsSucceeded,
+      markInvalid,
       upsert
     } = credentialRegistry.getState();
     const id = rec.id;
@@ -243,8 +239,8 @@ export class RefreshOrchestrator {
     this.logger.info(`🧭 [Refresh] check credential ${id}`);
     try {
       // 3) verification
-      const isValid = await verifyCredentialStatus(rec, this.logger);
-      if (isValid) {
+      const status = await verifyCredentialStatus(rec, this.logger);
+      if (status === RefreshStatus.Valid) {
         this.logger.info(`✅ [Refresh] valid → ${id}`);
         // If it was previously expired for any reason, clear that and block as succeeded
         clearExpired(id);
@@ -252,6 +248,15 @@ export class RefreshOrchestrator {
         // blockAsSucceeded(id)
         return;
       }
+      if (status === RefreshStatus.Error) {
+        this.logger.warn(`⚠️ [Refresh] status check failed; deferring re-issue → ${id}`);
+        await markOpenIDCredentialStatus({
+          credential: rec,
+          status: RefreshStatus.Error,
+          agentContext: this.agent.context
+        });
+        return;
+      }
 
       // Invalid case:
 
@@ -260,48 +265,28 @@ export class RefreshOrchestrator {
         status: RefreshStatus.Invalid,
         agentContext: this.agent.context
       });
-
-      // 4) needs refresh → get access token
       this.logger.info(`♻️ [Refresh] invalid, attempting re-issue → ${id}`);
-      const token = await refreshAccessToken({
-        logger: this.logger,
-        cred: rec,
-        agentContext: this.agent.context
-      });
-      if (!token) {
-        const msg = `no refresh token available`;
-        this.logger.warn(`⚠️ [Refresh] ${msg} for ${id}`);
-        blockAsFailed(id, msg);
-        return;
-      }
-
-      // 5) re-issue
-      const newRecord = await reissueCredentialWithAccessToken({
+      const newRecord = await refreshAndQueueReplacement({
         agent: this.agent,
         logger: this.logger,
         record: rec,
-        tokenResponse: token
+        toLite: this.opts.toLite
       });
-      if (newRecord) {
-        this.logger.info(`💾 [Refresh] new credential → ${newRecord.id}`);
-        // Queue a replacement for UI/notifications and block the old one as succeeded
-        markExpiredWithReplacement(id, this.opts.toLite(newRecord));
-        blockAsSucceeded(id);
-        this.recentlyIssued.set(newRecord.id, newRecord);
-      } else {
-        const msg = `re-issue returned no record`;
+      if (!newRecord) {
+        const msg = 'credential refresh did not yield a replacement';
         this.logger.warn(`⚠️ [Refresh] ${msg} for ${id}`);
-        blockAsFailed(id, msg);
-        await markOpenIDCredentialStatus({
-          credential: rec,
-          status: RefreshStatus.Invalid,
-          agentContext: this.agent.context
-        });
+        markInvalid(id);
+        return;
       }
+      this.logger.info(`💾 [Refresh] new credential → ${newRecord.id}`);
+      blockAsSucceeded(id);
+      this.recentlyIssued.set(newRecord.id, newRecord);
     } catch (e) {
+      var _this$opts$onError4, _this$opts4;
       const err = String(e);
       this.logger.error(`💥 [Refresh] error on ${id}: ${err}`);
-      blockAsFailed(id, err);
+      (_this$opts$onError4 = (_this$opts4 = this.opts).onError) === null || _this$opts$onError4 === void 0 || _this$opts$onError4.call(_this$opts4, e);
+      markInvalid(id);
     } finally {
       // 6) clear in-flight marker
       clearRefreshing(id);

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

@@ -1 +1 @@
-{"version":3,"names":["ClaimFormat","SdJwtVcRecord","W3cCredentialRecord","refreshAccessToken","reissueCredentialWithAccessToken","RefreshStatus","credentialRegistry","verifyCredentialStatus","getRefreshCredentialMetadata","markOpenIDCredentialStatus","persistCredentialRecord","setRefreshCredentialMetadata","defaultToLite","rec","_rec$createdAt","id","format","JwtVc","SdJwtW3cVc","createdAt","toISOString","issuer","undefined","RefreshOrchestrator","intervalOn","runningOnce","recentlyIssued","Map","checkStatusOnly","constructor","logger","bridge","opts","intervalMs","autoStart","onError","e","error","String","listRecords","toLite","info","JSON","stringify","onReady","agent","start","configure","next","prev","agentReady","nowIntervalMs","nowAutoStart","stop","isRunning","timer","setInterval","runOnce","clearInterval","reason","_this$agent","warn","isInitialized","records","length","checkRecordStatus","_this$opts$onError","_this$opts","call","_this$opts$onError2","_this$opts2","setIntervalMs","resolveFull","get","shouldSkip","markRefreshing","clearRefreshing","upsert","markInvalid","setLastSweep","getState","isValid","now","Date","meta","lastCheckResult","Valid","Invalid","lastCheckedAt","attemptCount","context","_this$opts$onError3","_this$opts3","refreshRecord","clearExpired","markExpiredWithReplacement","blockAsFailed","blockAsSucceeded","credential","status","agentContext","token","cred","msg","newRecord","record","tokenResponse","set","err"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/refreshOrchestrator.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["OpenIDCredentialRefreshFlowType","RefreshStatus","credentialRegistry","verifyCredentialStatus","getRefreshCredentialMetadata","markOpenIDCredentialStatus","persistCredentialRecord","setRefreshCredentialMetadata","toOpenIDCredentialLite","refreshAndQueueReplacement","RefreshOrchestrator","intervalOn","runningOnce","recentlyIssued","Map","constructor","logger","bridge","opts","intervalMs","autoStart","flowType","FullReplacement","onError","e","error","String","listRecords","toLite","info","JSON","stringify","onReady","agent","start","configure","next","prev","agentReady","nowIntervalMs","nowAutoStart","stop","isRunning","timer","setInterval","runOnce","clearInterval","undefined","reason","_this$agent","warn","isInitialized","records","length","rec","refreshRecord","checkRecordStatus","_this$opts$onError","_this$opts","id","call","_this$opts$onError2","_this$opts2","setIntervalMs","resolveFull","get","shouldSkip","markRefreshing","clearRefreshing","clearExpired","upsert","markInvalid","setLastSweep","getState","status","now","Date","meta","lastCheckResult","lastCheckedAt","attemptCount","context","Valid","Invalid","toISOString","_this$opts$onError3","_this$opts3","blockAsSucceeded","Error","credential","agentContext","newRecord","record","msg","set","_this$opts$onError4","_this$opts4","err"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/refreshOrchestrator.ts"],"mappings":"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","ignoreList":[]}

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

@@ -14,20 +14,16 @@ export async function refreshAccessToken({
   logger.info(`[refreshAccessToken] Found refresh metadata for credential: ${cred.id}`);
   const {
     refreshToken,
-    authServer
+    tokenEndpoint
   } = refreshMetaData;
   try {
-    if (!authServer) {
-      throw new Error('No authorization server found in the credential offer metadata');
+    if (!tokenEndpoint) {
+      throw new Error('No token endpoint found in the credential offer metadata');
     }
-    logger.info(`[refreshAccessToken] Found auth server for credential: ${cred.id}: ${authServer}`);
+    logger.info(`[refreshAccessToken] Found token endpoint for credential: ${cred.id}: ${tokenEndpoint}`);
 
     // Build token endpoint:
-    // React-Native-safe URL build
-    const tokenUrl = authServer.endsWith('/') ? authServer.slice(0, -1) : authServer;
-    // const tokenUrl = new URL('token', authServer)
-    // tokenUrl.searchParams.set('force', 'false')
-
+    const tokenUrl = tokenEndpoint.endsWith('/') ? tokenEndpoint.slice(0, -1) : tokenEndpoint;
     logger.info(`[refreshAccessToken] Refreshing access token at URL: ${tokenUrl} for credential: ${cred.id}`);
     const body = new URLSearchParams({
       grant_type: 'refresh_token',
@@ -45,20 +41,24 @@ export async function refreshAccessToken({
       },
       body: body.toString()
     });
-    logger.info(`[refreshAccessToken] Response status: ${JSON.stringify(res)}`);
+    logger.info(`[refreshAccessToken] Token endpoint response status: ${res.status}`);
     if (!res.ok) {
       const errText = await res.text();
       throw new Error(`Refresh failed ${res.status}: ${errText}`);
     }
     const data = await res.json();
-    logger.info(`[refreshAccessToken] New access token acquired: ${JSON.stringify(data)}`);
+    logger.info(`[refreshAccessToken] Token refresh succeeded: ${JSON.stringify({
+      token_type: data.token_type,
+      expires_in: data.expires_in,
+      has_access_token: Boolean(data.access_token),
+      has_refresh_token: Boolean(data.refresh_token)
+    })}`);
 
     // If refresh token rotated, persist it
     if (data.refresh_token && data.refresh_token !== refreshToken) {
       logger.info(`[refreshAccessToken] Refresh token rotated; saving new one`);
       setRefreshCredentialMetadata(cred, {
         ...refreshMetaData,
-        authServer: authServer,
         refreshToken: data.refresh_token
       });
       await persistCredentialRecord(agentContext, cred);

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

@@ -1 +1 @@
-{"version":3,"names":["getRefreshCredentialMetadata","persistCredentialRecord","setRefreshCredentialMetadata","refreshAccessToken","logger","cred","agentContext","info","id","refreshMetaData","error","refreshToken","authServer","Error","tokenUrl","endsWith","slice","body","URLSearchParams","grant_type","refresh_token","pre_authorized_code","pre_authorized_code_alt","user_pin","res","fetch","toString","method","headers","accept","JSON","stringify","ok","errText","text","status","data","json"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/refreshToken.ts"],"mappings":"AAGA,SAASA,4BAA4B,EAAEC,uBAAuB,EAAEC,4BAA4B,QAAQ,aAAa;AAEjH,OAAO,eAAeC,kBAAkBA,CAAC;EACvCC,MAAM;EACNC,IAAI;EACJC;AAKF,CAAC,EAAwC;EACvCF,MAAM,CAACG,IAAI,CAAC,4DAA4DF,IAAI,CAACG,EAAE,EAAE,CAAC;EAClF;EACA,MAAMC,eAAe,GAAGT,4BAA4B,CAACK,IAAI,CAAC;EAC1D,IAAI,CAACI,eAAe,EAAE;IACpBL,MAAM,CAACM,KAAK,CAAC,kEAAkEL,IAAI,CAACG,EAAE,EAAE,CAAC;IACzF;EACF;EAEAJ,MAAM,CAACG,IAAI,CAAC,+DAA+DF,IAAI,CAACG,EAAE,EAAE,CAAC;EACrF,MAAM;IAAEG,YAAY;IAAEC;EAAW,CAAC,GAAGH,eAAe;EAEpD,IAAI;IACF,IAAI,CAACG,UAAU,EAAE;MACf,MAAM,IAAIC,KAAK,CAAC,gEAAgE,CAAC;IACnF;IAEAT,MAAM,CAACG,IAAI,CAAC,0DAA0DF,IAAI,CAACG,EAAE,KAAKI,UAAU,EAAE,CAAC;;IAE/F;IACA;IACA,MAAME,QAAQ,GAAIF,UAAU,CAACG,QAAQ,CAAC,GAAG,CAAC,GAAGH,UAAU,CAACI,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAGJ,UAAW;IAClF;IACA;;IAEAR,MAAM,CAACG,IAAI,CAAC,wDAAwDO,QAAQ,oBAAoBT,IAAI,CAACG,EAAE,EAAE,CAAC;IAE1G,MAAMS,IAAI,GAAG,IAAIC,eAAe,CAAC;MAC/BC,UAAU,EAAE,eAAe;MAC3BC,aAAa,EAAET,YAAY;MAC3B;MACAU,mBAAmB,EAAE,EAAE;MACvBC,uBAAuB,EAAE,EAAE;MAC3BC,QAAQ,EAAE;IACZ,CAAC,CAAC;IAEF,MAAMC,GAAG,GAAG,MAAMC,KAAK,CAACX,QAAQ,CAACY,QAAQ,CAAC,CAAC,EAAE;MAC3CC,MAAM,EAAE,MAAM;MACdC,OAAO,EAAE;QACPC,MAAM,EAAE,kBAAkB;QAC1B,cAAc,EAAE;MAClB,CAAC;MACDZ,IAAI,EAAEA,IAAI,CAACS,QAAQ,CAAC;IACtB,CAAC,CAAC;IAEFtB,MAAM,CAACG,IAAI,CAAC,yCAAyCuB,IAAI,CAACC,SAAS,CAACP,GAAG,CAAC,EAAE,CAAC;IAE3E,IAAI,CAACA,GAAG,CAACQ,EAAE,EAAE;MACX,MAAMC,OAAO,GAAG,MAAMT,GAAG,CAACU,IAAI,CAAC,CAAC;MAChC,MAAM,IAAIrB,KAAK,CAAC,kBAAkBW,GAAG,CAACW,MAAM,KAAKF,OAAO,EAAE,CAAC;IAC7D;IAEA,MAAMG,IAAqB,GAAG,MAAMZ,GAAG,CAACa,IAAI,CAAC,CAAC;IAC9CjC,MAAM,CAACG,IAAI,CAAC,mDAAmDuB,IAAI,CAACC,SAAS,CAACK,IAAI,CAAC,EAAE,CAAC;;IAEtF;IACA,IAAIA,IAAI,CAAChB,aAAa,IAAIgB,IAAI,CAAChB,aAAa,KAAKT,YAAY,EAAE;MAC7DP,MAAM,CAACG,IAAI,CAAC,4DAA4D,CAAC;MACzEL,4BAA4B,CAACG,IAAI,EAAE;QACjC,GAAGI,eAAe;QAClBG,UAAU,EAAEA,UAAU;QACtBD,YAAY,EAAEyB,IAAI,CAAChB;MACrB,CAAC,CAAC;MAEF,MAAMnB,uBAAuB,CAACK,YAAY,EAAED,IAAI,CAAC;IACnD;IAEA,OAAO+B,IAAI;EACb,CAAC,CAAC,OAAO1B,KAAK,EAAE;IACdN,MAAM,CAACM,KAAK,CAAC,iDAAiDA,KAAK,EAAE,CAAC;IACtE,MAAMA,KAAK;EACb;AACF","ignoreList":[]}
+{"version":3,"names":["getRefreshCredentialMetadata","persistCredentialRecord","setRefreshCredentialMetadata","refreshAccessToken","logger","cred","agentContext","info","id","refreshMetaData","error","refreshToken","tokenEndpoint","Error","tokenUrl","endsWith","slice","body","URLSearchParams","grant_type","refresh_token","pre_authorized_code","pre_authorized_code_alt","user_pin","res","fetch","toString","method","headers","accept","status","ok","errText","text","data","json","JSON","stringify","token_type","expires_in","has_access_token","Boolean","access_token","has_refresh_token"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/refreshToken.ts"],"mappings":"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","ignoreList":[]}

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

@@ -106,7 +106,7 @@ export const credentialRegistry = createStore((set, get) => ({
   shouldSkip: id => {
     const s = get();
     if (s.refreshing[id]) return true; // in-progress
-    if (s.expired.includes(id)) return true; // replacement already queued
+    if (s.expired.includes(id) && Boolean(s.replacements[id])) return true; // replacement already queued
     if (s.blocked[id]) return true; // previously succeeded/failed
     return false;
   },

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

@@ -1 +1 @@
-{"version":3,"names":["createStore","credentialRegistry","set","get","byId","expired","checked","replacements","refreshing","blocked","lastSweepAt","undefined","upsert","cred","s","id","markRefreshing","clearRefreshing","_drop","rest","markExpiredWithReplacement","oldId","replacement","includes","markInvalid","acceptReplacement","repl","restRepl","filter","x","reason","at","Date","toISOString","clearExpired","blockAsSucceeded","blockAsFailed","error","unblock","shouldSkip","setLastSweep","iso","reset","readRegistry","getState","mutateRegistry","updater","setState","selectOldIdByReplacementId","replacementId","Object","entries"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/registry.ts"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["createStore","credentialRegistry","set","get","byId","expired","checked","replacements","refreshing","blocked","lastSweepAt","undefined","upsert","cred","s","id","markRefreshing","clearRefreshing","_drop","rest","markExpiredWithReplacement","oldId","replacement","includes","markInvalid","acceptReplacement","repl","restRepl","filter","x","reason","at","Date","toISOString","clearExpired","blockAsSucceeded","blockAsFailed","error","unblock","shouldSkip","Boolean","setLastSweep","iso","reset","readRegistry","getState","mutateRegistry","updater","setState","selectOldIdByReplacementId","replacementId","Object","entries"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/registry.ts"],"mappings":"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","ignoreList":[]}

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

@@ -4,6 +4,17 @@ export let RefreshStatus = /*#__PURE__*/function (RefreshStatus) {
   RefreshStatus["Error"] = "error";
   return RefreshStatus;
 }({});
+
+/**
+ * Controls how invalid OpenID credentials are handled after status checks.
+ * - InvalidThenOnDemand: show invalid notification; replacement is attempted on user action.
+ * - FullReplacement: orchestrator attempts replacement immediately and surfaces replacement notification when available.
+ */
+export let OpenIDCredentialRefreshFlowType = /*#__PURE__*/function (OpenIDCredentialRefreshFlowType) {
+  OpenIDCredentialRefreshFlowType["InvalidThenOnDemand"] = "invalid-then-on-demand";
+  OpenIDCredentialRefreshFlowType["FullReplacement"] = "full-replacement";
+  return OpenIDCredentialRefreshFlowType;
+}({});
 export let OpenIDCustomNotificationType = /*#__PURE__*/function (OpenIDCustomNotificationType) {
   OpenIDCustomNotificationType["CredentialReplacementAvailable"] = "CustomNotificationOpenIDCredential";
   OpenIDCustomNotificationType["CredentialExpired"] = "CredentialExpired";

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

@@ -1 +1 @@
-{"version":3,"names":["RefreshStatus","OpenIDCustomNotificationType"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/types.ts"],"mappings":"AAoBA,WAAYA,aAAa,0BAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAA,OAAbA,aAAa;AAAA;AAoDzB,WAAYC,4BAA4B,0BAA5BA,4BAA4B;EAA5BA,4BAA4B;EAA5BA,4BAA4B;EAAA,OAA5BA,4BAA4B;AAAA","ignoreList":[]}
+{"version":3,"names":["RefreshStatus","OpenIDCredentialRefreshFlowType","OpenIDCustomNotificationType"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/types.ts"],"mappings":"AAeA,WAAYA,aAAa,0BAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAbA,aAAa;EAAA,OAAbA,aAAa;AAAA;;AAMzB;AACA;AACA;AACA;AACA;AACA,WAAYC,+BAA+B,0BAA/BA,+BAA+B;EAA/BA,+BAA+B;EAA/BA,+BAA+B;EAAA,OAA/BA,+BAA+B;AAAA;AAkD3C,WAAYC,4BAA4B,0BAA5BA,4BAA4B;EAA5BA,4BAA4B;EAA5BA,4BAA4B;EAAA,OAA5BA,4BAA4B;AAAA","ignoreList":[]}

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

@@ -1,28 +1,28 @@
 // modules/openid/refresh/verifyCredentialStatus.ts
 
 import { getListFromStatusListJWT, getStatusListFromJWT } from '@sd-jwt/jwt-status-list';
+import { RefreshStatus } from './types';
 /**
  * Verifies credential status for Sd-JWT credentials using status lists.
  * Non–Sd-JWT credentials (W3C jwt_vc_json without status list, or mdoc) are treated as valid here.
- * Returns true if valid; false if revoked/invalid or on error.
  */
 export async function verifyCredentialStatus(rec, logger) {
   try {
     // Only Sd-JWT creds have compactSdJwtVc in this codebase
-    if (!('compactSdJwtVc' in rec)) return true;
+    if (!('compactSdJwtVc' in rec)) return RefreshStatus.Valid;
     logger === null || logger === void 0 || logger.info(`[Verifier] Verifying credential status for Sd-JWT credential: ${rec.id}`);
     const ref = getStatusListFromJWT(rec.firstCredential.compact);
     const res = await fetch(ref.uri);
     if (!res.ok) throw new Error(`HTTP ${res.status}`);
     const jwt = await res.text();
     const list = getListFromStatusListJWT(jwt);
-    const ok = list.getStatus(ref.idx) === 0;
-    logger === null || logger === void 0 || logger.info(`${ok ? '✅' : '❌'} [Verifier] ${rec.id} → ${ok ? 'valid' : 'revoked'}`);
-    return ok;
+    const status = list.getStatus(ref.idx) === 0 ? RefreshStatus.Valid : RefreshStatus.Invalid;
+    logger === null || logger === void 0 || logger.info(`${status === RefreshStatus.Valid ? '✅' : '❌'} [Verifier] ${rec.id} → ${status}`);
+    return status;
   } catch (e) {
     var _logger$error;
     logger === null || logger === void 0 || (_logger$error = logger.error) === null || _logger$error === void 0 || _logger$error.call(logger, `💥 [Verifier] ${'id' in rec ? rec.id : 'unknown'} verify failed: ${String(e)}`);
-    return false;
+    return RefreshStatus.Error;
   }
 }
 //# sourceMappingURL=verifyCredentialStatus.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["getListFromStatusListJWT","getStatusListFromJWT","verifyCredentialStatus","rec","logger","info","id","ref","firstCredential","compact","res","fetch","uri","ok","Error","status","jwt","text","list","getStatus","idx","e","_logger$error","error","call","String"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/verifyCredentialStatus.ts"],"mappings":"AAAA;;AAEA,SAASA,wBAAwB,EAAEC,oBAAoB,QAAQ,yBAAyB;AAKxF;AACA;AACA;AACA;AACA;AACA,OAAO,eAAeC,sBAAsBA,CAACC,GAAY,EAAEC,MAAqB,EAAoB;EAClG,IAAI;IACF;IACA,IAAI,EAAE,gBAAgB,IAAID,GAAG,CAAC,EAAE,OAAO,IAAI;IAE3CC,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEC,IAAI,CAAC,iEAAiEF,GAAG,CAACG,EAAE,EAAE,CAAC;IAEvF,MAAMC,GAAG,GAAGN,oBAAoB,CAACE,GAAG,CAACK,eAAe,CAACC,OAAO,CAAC;IAC7D,MAAMC,GAAG,GAAG,MAAMC,KAAK,CAACJ,GAAG,CAACK,GAAG,CAAC;IAChC,IAAI,CAACF,GAAG,CAACG,EAAE,EAAE,MAAM,IAAIC,KAAK,CAAC,QAAQJ,GAAG,CAACK,MAAM,EAAE,CAAC;IAClD,MAAMC,GAAG,GAAG,MAAMN,GAAG,CAACO,IAAI,CAAC,CAAC;IAE5B,MAAMC,IAAI,GAAGlB,wBAAwB,CAACgB,GAAG,CAAC;IAC1C,MAAMH,EAAE,GAAGK,IAAI,CAACC,SAAS,CAACZ,GAAG,CAACa,GAAG,CAAC,KAAK,CAAC;IAExChB,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEC,IAAI,CAAC,GAAGQ,EAAE,GAAG,GAAG,GAAG,GAAG,eAAeV,GAAG,CAACG,EAAE,MAAMO,EAAE,GAAG,OAAO,GAAG,SAAS,EAAE,CAAC;IACpF,OAAOA,EAAE;EACX,CAAC,CAAC,OAAOQ,CAAC,EAAE;IAAA,IAAAC,aAAA;IACVlB,MAAM,aAANA,MAAM,gBAAAkB,aAAA,GAANlB,MAAM,CAAEmB,KAAK,cAAAD,aAAA,eAAbA,aAAA,CAAAE,IAAA,CAAApB,MAAM,EAAU,iBAAiB,IAAI,IAAID,GAAG,GAAGA,GAAG,CAACG,EAAE,GAAG,SAAS,mBAAmBmB,MAAM,CAACJ,CAAC,CAAC,EAAE,CAAC;IAChG,OAAO,KAAK;EACd;AACF","ignoreList":[]}
+{"version":3,"names":["getListFromStatusListJWT","getStatusListFromJWT","RefreshStatus","verifyCredentialStatus","rec","logger","Valid","info","id","ref","firstCredential","compact","res","fetch","uri","ok","Error","status","jwt","text","list","getStatus","idx","Invalid","e","_logger$error","error","call","String"],"sourceRoot":"../../../../../src","sources":["modules/openid/refresh/verifyCredentialStatus.ts"],"mappings":"AAAA;;AAEA,SAASA,wBAAwB,EAAEC,oBAAoB,QAAQ,yBAAyB;AAExF,SAASC,aAAa,QAAQ,SAAS;AAIvC;AACA;AACA;AACA;AACA,OAAO,eAAeC,sBAAsBA,CAACC,GAAY,EAAEC,MAAqB,EAA0B;EACxG,IAAI;IACF;IACA,IAAI,EAAE,gBAAgB,IAAID,GAAG,CAAC,EAAE,OAAOF,aAAa,CAACI,KAAK;IAE1DD,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEE,IAAI,CAAC,iEAAiEH,GAAG,CAACI,EAAE,EAAE,CAAC;IAEvF,MAAMC,GAAG,GAAGR,oBAAoB,CAACG,GAAG,CAACM,eAAe,CAACC,OAAO,CAAC;IAC7D,MAAMC,GAAG,GAAG,MAAMC,KAAK,CAACJ,GAAG,CAACK,GAAG,CAAC;IAChC,IAAI,CAACF,GAAG,CAACG,EAAE,EAAE,MAAM,IAAIC,KAAK,CAAC,QAAQJ,GAAG,CAACK,MAAM,EAAE,CAAC;IAClD,MAAMC,GAAG,GAAG,MAAMN,GAAG,CAACO,IAAI,CAAC,CAAC;IAE5B,MAAMC,IAAI,GAAGpB,wBAAwB,CAACkB,GAAG,CAAC;IAC1C,MAAMD,MAAM,GAAGG,IAAI,CAACC,SAAS,CAACZ,GAAG,CAACa,GAAG,CAAC,KAAK,CAAC,GAAGpB,aAAa,CAACI,KAAK,GAAGJ,aAAa,CAACqB,OAAO;IAE1FlB,MAAM,aAANA,MAAM,eAANA,MAAM,CAAEE,IAAI,CAAC,GAAGU,MAAM,KAAKf,aAAa,CAACI,KAAK,GAAG,GAAG,GAAG,GAAG,eAAeF,GAAG,CAACI,EAAE,MAAMS,MAAM,EAAE,CAAC;IAC9F,OAAOA,MAAM;EACf,CAAC,CAAC,OAAOO,CAAC,EAAE;IAAA,IAAAC,aAAA;IACVpB,MAAM,aAANA,MAAM,gBAAAoB,aAAA,GAANpB,MAAM,CAAEqB,KAAK,cAAAD,aAAA,eAAbA,aAAA,CAAAE,IAAA,CAAAtB,MAAM,EAAU,iBAAiB,IAAI,IAAID,GAAG,GAAGA,GAAG,CAACI,EAAE,GAAG,SAAS,mBAAmBoB,MAAM,CAACJ,CAAC,CAAC,EAAE,CAAC;IAChG,OAAOtB,aAAa,CAACc,KAAK;EAC5B;AACF","ignoreList":[]}

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

@@ -1,5 +1,3 @@
-import { Jwt, X509ModuleConfig } from '@credo-ts/core';
-import q from 'query-string';
 import { getHostNameFromUrl } from './utils/utils';
 import { Linking } from 'react-native';
 function handleTextResponse(text) {
@@ -82,98 +80,13 @@ export async function fetchInvitationDataUrl(dataUrl) {
     throw new Error(`[retrieve_invitation_error] Unable to retrieve invitation: ${error}`);
   }
 }
-const extractCertificateFromJwt = jwt => {
-  const jwtHeader = Jwt.fromSerializedJwt(jwt).header;
-  return Array.isArray(jwtHeader.x5c) && typeof jwtHeader.x5c[0] === 'string' ? jwtHeader.x5c[0] : null;
-};
-
-/**
- * This is a temp method to allow for untrusted certificates to still work with the wallet.
- */
-export const extractCertificateFromAuthorizationRequest = async ({
-  data,
-  uri
-}) => {
-  try {
-    if (data) {
-      return {
-        data,
-        certificate: extractCertificateFromJwt(data)
-      };
-    }
-    if (uri) {
-      const query = q.parseUrl(uri).query;
-      if (query.request_uri && typeof query.request_uri === 'string') {
-        const result = await fetchInvitationDataUrl(query.request_uri);
-        if (result.success && result.result.type === 'openid-authorization-request' && typeof result.result.data === 'string') {
-          return {
-            data: result.result.data,
-            certificate: extractCertificateFromJwt(result.result.data)
-          };
-        }
-      } else if (query.request && typeof query.request === 'string') {
-        const _res = {
-          data: query.request,
-          certificate: extractCertificateFromJwt(query.request)
-        };
-        return _res;
-      }
-    }
-    return {
-      data: null,
-      certificate: null
-    };
-  } catch {
-    return {
-      data: null,
-      certificate: null
-    };
-  }
-};
-export async function withTrustedCertificate(agent,
-//This should maybe be AgentContext instead
-certificate, method) {
-  const x509ModuleConfig = agent.dependencyManager.resolve(X509ModuleConfig);
-  const currentTrustedCertificates = x509ModuleConfig.trustedCertificates ? [...x509ModuleConfig.trustedCertificates] : [];
-  try {
-    if (certificate) agent.modules.x509.addTrustedCertificate(certificate);
-    return await method();
-  } finally {
-    if (certificate) x509ModuleConfig.setTrustedCertificates(currentTrustedCertificates);
-  }
-}
-
-//This settings should be moved to an injectable config
-const allowUntrustedCertificates = false;
 export const getCredentialsForProofRequest = async ({
   agent,
-  data,
-  uri
+  request
 }) => {
-  let requestUri = uri;
   try {
-    const {
-      certificate = null,
-      data: newData = null
-    } = allowUntrustedCertificates ? await extractCertificateFromAuthorizationRequest({
-      data,
-      uri
-    }) : {};
-    if (newData) {
-      // FIXME: Credo only support request string, but we already parsed it before. So we construct an request here
-      // but in the future we need to support the parsed request in Credo directly
-      requestUri = `openid://?request=${encodeURIComponent(newData)}`;
-    } else if (uri) {
-      requestUri = uri;
-    } else {
-      throw new Error('Either data or uri must be provided');
-    }
-    agent.config.logger.info(`$$Receiving openid uri ${requestUri}`);
-
-    // Temp solution to add and remove the trusted certificate
-    const resolved = await withTrustedCertificate(agent, certificate, () => {
-      return agent.modules.openid4vc.holder.resolveOpenId4VpAuthorizationRequest(String(requestUri)); // Could throw instead of using constructor here
-    });
+    agent.config.logger.info(`$$Receiving openid authorization request ${request}`);
+    const resolved = await agent.modules.openid4vc.holder.resolveOpenId4VpAuthorizationRequest(request);
     if (!resolved.presentationExchange) {
       throw new Error('No presentation exchange found in authorization request.');
     }
@@ -213,18 +126,12 @@ export const shareProof = async ({
     return [entry.inputDescriptorId, [credential.credentialRecord]];
   })));
   try {
-    // Temp solution to add and remove the trusted certicaite
-    // const certificate =
-    //   authorizationRequest.jwt && allowUntrustedCertificate ? extractCertificateFromJwt(authorizationRequest) : null
-
-    // Need to figure out how to include this certificate, does not seem like the JWT is included in the authorizationRequest any more.
-
-    const result = await withTrustedCertificate(agent, null, () => agent.openid4vc.holder.acceptOpenId4VpAuthorizationRequest({
+    const result = await agent.openid4vc.holder.acceptOpenId4VpAuthorizationRequest({
       authorizationRequest: authorizationRequest,
       presentationExchange: {
         credentials
       }
-    }));
+    });
 
     // if redirect_uri is provided, open it in the browser
     // Even if the response returned an error, we must open this uri

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

@@ -1 +1 @@
-{"version":3,"names":["Jwt","X509ModuleConfig","q","getHostNameFromUrl","Linking","handleTextResponse","text","startsWith","success","result","format","type","data","json","JSON","parse","handleJsonResponse","error","Error","Array","isArray","fetchInvitationDataUrl","dataUrl","abortController","AbortController","timeout","setTimeout","abort","response","fetch","headers","Accept","clearTimeout","ok","contentType","get","includes","extractCertificateFromJwt","jwt","jwtHeader","fromSerializedJwt","header","x5c","extractCertificateFromAuthorizationRequest","uri","certificate","query","parseUrl","request_uri","request","_res","withTrustedCertificate","agent","method","x509ModuleConfig","dependencyManager","resolve","currentTrustedCertificates","trustedCertificates","modules","x509","addTrustedCertificate","setTrustedCertificates","allowUntrustedCertificates","getCredentialsForProofRequest","requestUri","newData","encodeURIComponent","config","logger","info","resolved","openid4vc","holder","resolveOpenId4VpAuthorizationRequest","String","presentationExchange","requestRecord","authorizationRequestPayload","verifierHostName","response_uri","undefined","createdAt","Date","verifier","clientIdPrefix","effectiveClientId","err","message","shareProof","authorizationRequest","credentialsForRequest","selectedCredentials","areRequirementsSatisfied","credentials","Object","fromEntries","requirements","flatMap","requirement","submissionEntry","map","entry","credentialId","inputDescriptorId","id","credential","verifiableCredentials","find","vc","credentialRecord","acceptOpenId4VpAuthorizationRequest","serverResponse","body","redirect_uri","openURL","status"],"sourceRoot":"../../../../src","sources":["modules/openid/resolverProof.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getHostNameFromUrl","Linking","handleTextResponse","text","startsWith","success","result","format","type","data","json","JSON","parse","handleJsonResponse","error","Error","Array","isArray","fetchInvitationDataUrl","dataUrl","abortController","AbortController","timeout","setTimeout","abort","response","fetch","headers","Accept","clearTimeout","ok","contentType","get","includes","getCredentialsForProofRequest","agent","request","config","logger","info","resolved","modules","openid4vc","holder","resolveOpenId4VpAuthorizationRequest","presentationExchange","requestRecord","authorizationRequestPayload","verifierHostName","response_uri","String","undefined","createdAt","Date","verifier","clientIdPrefix","effectiveClientId","err","message","shareProof","authorizationRequest","credentialsForRequest","selectedCredentials","areRequirementsSatisfied","credentials","Object","fromEntries","requirements","flatMap","requirement","submissionEntry","map","entry","credentialId","inputDescriptorId","id","credential","verifiableCredentials","find","vc","credentialRecord","acceptOpenId4VpAuthorizationRequest","serverResponse","body","redirect_uri","openURL","status"],"sourceRoot":"../../../../src","sources":["modules/openid/resolverProof.tsx"],"mappings":"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","ignoreList":[]}