fix: FindRegistry using uri then issuer

Signed-off-by: DaevMithran <[email protected]>

Author: DaevMithran

packages/cheqd/src/wrappers/CheqdTokenStatusListRegistry.ts

@@ -33,8 +33,8 @@ export class CheqdTokenStatusListRegistry implements TokenStatusListRegistry {
     }
     const { did } = parsedDid
 
-    if (options.previousStatusListUri && options.previousStatusListUri.method === 'did') {
-      const response = await cheqdDidResolver.resolveResource(agentContext, options.previousStatusListUri.didUrl)
+    if (options.uri) {
+      const response = await cheqdDidResolver.resolveResource(agentContext, options.uri)
       if (response.error || !response.resourceMetadata) {
         throw new CredoError(response.message)
       }
@@ -90,10 +90,10 @@ export class CheqdTokenStatusListRegistry implements TokenStatusListRegistry {
   /**
    * Retrieve a token status list JWT from the registry
    */
-  async retrieve(agentContext: AgentContext, statusListUri: SdJwtVcIssuerDid): Promise<string> {
+  async retrieve(agentContext: AgentContext, uri: string): Promise<string> {
     const cheqdDidResolver = agentContext.dependencyManager.resolve(CheqdDidResolver)
 
-    const response = await cheqdDidResolver.resolveResource(agentContext, statusListUri.didUrl)
+    const response = await cheqdDidResolver.resolveResource(agentContext, uri)
     if (response.error || !response.resourceMetadata) {
       throw new CredoError(response.message)
     }

packages/cheqd/tests/cheqd-token-status-list.e2e.test.ts

@@ -55,24 +55,21 @@ describe('Cheqd DID Token Status List Registry', () => {
     expect(result.uri).toBeDefined()
     expect(result.uri).toContain(did)
 
-    const statusListUri: SdJwtVcIssuer = {
-      method: 'did',
-      didUrl: result.uri as string,
-    }
+    const uri = result.uri as string
 
     // fetch token status list
-    const statusList = await tokenStatusListService.getStatusList(agent.context, statusListUri)
+    const statusList = await tokenStatusListService.getStatusList(agent.context, uri)
     expect(statusList).toBeDefined()
 
     // verify token status at index 0
-    const status = await tokenStatusListService.getStatus(agent.context, statusListUri, 0)
+    const status = await tokenStatusListService.getStatus(agent.context, uri, 0)
     expect(status).toBe(0)
 
     // revoke index 0
-    await tokenStatusListService.revokeIndex(agent.context, issuer, statusListUri, { indices: [0], publish: true })
+    await tokenStatusListService.revokeIndex(agent.context, issuer, { indices: [0], publish: true, uri })
 
     // verify token status at index 0
-    const isRevoked = await tokenStatusListService.getStatus(agent.context, statusListUri, 0)
+    const isRevoked = await tokenStatusListService.getStatus(agent.context, uri, 0)
     expect(isRevoked).toBe(1)
   })
 })

packages/core/src/modules/sd-jwt-vc/credential-status/token-status-list/TokenStatusList.ts

@@ -1,4 +1,5 @@
-import { StatusList, getListFromStatusListJWT, getStatusListFromJWT } from '@sd-jwt/jwt-status-list'
+import { StatusList, getListFromStatusListJWT } from '@sd-jwt/jwt-status-list'
+import { isURL } from 'class-validator'
 import { injectable } from 'tsyringe'
 import { AgentContext } from '../../../../agent'
 import { JwsService, Jwt, JwtPayload } from '../../../../crypto'
@@ -14,7 +15,6 @@ import {
   TokenStatusListJwtPayload,
   TokenStatusListRegistry,
 } from './TokenStatusListRegistry'
-import { isURL } from 'class-validator'
 
 export interface CreateTokenStatusListOptions extends PublishTokenStatusListOptions {
   size: number
@@ -27,7 +27,8 @@ export interface CreateTokenStatusListResult {
   uri?: string
 }
 
-export interface RevokeIndicesOptions {
+export interface RevokeIndicesOptions extends PublishTokenStatusListOptions {
+  uri: string
   indices: number[]
   publish: boolean
 }
@@ -46,8 +47,7 @@ export class TokenStatusListService {
   async createStatusList(
     agentContext: AgentContext,
     issuer: SdJwtVcIssuer,
-    uri?: string,
-    options?: CreateTokenStatusListOptions
+    options: CreateTokenStatusListOptions
   ): Promise<CreateTokenStatusListResult> {
     const sdJwtService = agentContext.dependencyManager.resolve(SdJwtVcService)
     const jwsService = agentContext.dependencyManager.resolve(JwsService)
@@ -80,7 +80,7 @@ export class TokenStatusListService {
     })
 
     if (options.publish) {
-      const result = await this.publishStatusList(agentContext, issuer, jwt, uri, options)
+      const result = await this.publishStatusList(agentContext, issuer, jwt, options)
       return { jwt, uri: result }
     }
 
@@ -90,15 +90,14 @@ export class TokenStatusListService {
   async revokeIndex(
     agentContext: AgentContext,
     issuer: SdJwtVcIssuer,
-    uri: string,
     options: RevokeIndicesOptions
   ): Promise<boolean> {
     const sdJwtService = agentContext.dependencyManager.resolve(SdJwtVcService)
     const jwsService = agentContext.dependencyManager.resolve(JwsService)
 
     const { indices, publish, ...publishOptions } = options
 
-    const currentStatusListJwt = await this.getStatusList(agentContext, uri)
+    const currentStatusListJwt = await this.getStatusList(agentContext, options.uri)
     const parsedStatusListJwt = Jwt.fromSerializedJwt(currentStatusListJwt)
 
     // extract and validate iss
@@ -143,7 +142,7 @@ export class TokenStatusListService {
     })
 
     if (options.publish) {
-      await this.publishStatusList(agentContext, issuer, jwt, uri, publishOptions)
+      await this.publishStatusList(agentContext, issuer, jwt, publishOptions)
     }
 
     return true
@@ -155,20 +154,13 @@ export class TokenStatusListService {
     return statusList.getStatus(index)
   }
 
-  async getStatusList(agentContext: AgentContext, uri: string): Promise<string> {  
-    const registry = this.findRegistry(uri)
+  async getStatusList(agentContext: AgentContext, uri: string): Promise<string> {
+    const registry = this.findRegistry({ uri })
     if (!registry) {
       throw new TokenStatusListError(`No token status list registry registered for uri ${uri}`)
     }
-    const jwt = await registry.retrieve(agentContext, uri)
 
-    // verify jwt
-    // const verified = await this.verifyStatusList(agentContext, uri, jwt)
-    // if (!verified.isValid) {
-    //   throw new TokenStatusListError('Invalid Jwt in the provided uri')
-    // }
-
-    return jwt
+    return await registry.retrieve(agentContext, uri)
   }
 
   getStatusListFetcher(agentContext: AgentContext) {
@@ -181,7 +173,6 @@ export class TokenStatusListService {
     agentContext: AgentContext,
     issuer: SdJwtVcIssuer,
     jwt: string,
-    uri: string,
     options: PublishTokenStatusListOptions
   ): Promise<string> {
     // verify jwt
@@ -190,21 +181,28 @@ export class TokenStatusListService {
       throw new TokenStatusListError('Invalid Jwt in the provided statusListUri')
     }
 
-    const registry = this.findRegistry(uri)
+    const registry = this.findRegistry({ uri: options.uri, issuer })
     if (!registry) {
       throw new TokenStatusListError(`No token status list registry registered for issuer ${issuer}`)
     }
-    return await registry.publish(agentContext, issuer, jwt, uri, options)
+    return await registry.publish(agentContext, issuer, jwt, options)
   }
 
-  private findRegistry(uri: string): TokenStatusListRegistry | null {
+  private findRegistry({ uri, issuer }: { uri?: string; issuer?: SdJwtVcIssuer }): TokenStatusListRegistry | null {
     let method: string
-    if (isDid(uri)) {
-      method = parseDid(uri).method
-    } else if (isURL(uri)) {
-      method = 'http'
+
+    if (uri) {
+      if (isDid(uri)) {
+        method = parseDid(uri).method
+      } else if (isURL(uri)) {
+        method = 'http'
+      } else {
+        throw new TokenStatusListError('Status List Uri is not supported')
+      }
+    } else if (issuer && issuer.method === 'did') {
+      method = parseDid(issuer.didUrl).method
     } else {
-        throw new TokenStatusListError("Status List Uri is not supported")
+      throw new TokenStatusListError('Status List Uri is not provided')
     }
 
     return this.sdJwtVcModuleConfig.registries.find((r) => r.supportedMethods.includes(method)) ?? null

packages/core/src/modules/sd-jwt-vc/credential-status/token-status-list/TokenStatusListRegistry.ts

@@ -3,6 +3,7 @@ import type { AgentContext } from '../../../../agent'
 import { SdJwtVcIssuer } from '../../SdJwtVcOptions'
 
 export interface PublishTokenStatusListOptions {
+  uri?: string
   name?: string
   version?: string
 
@@ -30,12 +31,11 @@ export interface TokenStatusListRegistry {
     agentContext: AgentContext,
     issuer: SdJwtVcIssuer,
     jwt: string,
-    statusListUri?: string,
     options?: PublishTokenStatusListOptions
   ): Promise<string>
 
   /**
    * Retrieve a token status list JWT from the registry
    */
-  retrieve(agentContext: AgentContext, statusListUri: SdJwtVcIssuer): Promise<string>
+  retrieve(agentContext: AgentContext, uri: string): Promise<string>
 }