feat: Use threads for jws verification

Exposes necessary functionality to use threads for jws verification.

Author: dbcfd

packages/dids/src/did.ts

@@ -138,7 +138,7 @@ export class DID {
     if (capability) {
       this._capability = capability
       this._parentId = this._capability.p.iss
-      if (this._parentId.startsWith('did:pkh:eip155:1:')) {
+      if (this._parentId?.startsWith('did:pkh:eip155:1:')) {
         // Lower case ethereum address for compatibility with Ceramic
         this._parentId = this._parentId.toLowerCase()
       }
@@ -268,25 +268,6 @@ export class DID {
     return this._id
   }
 
-  /**
-   * Request a JWS from this did's client
-   * @param options
-   * @param payload
-   */
-  async requestJWS<T extends string | Record<string, any>>(
-      options: CreateJWSOptions,
-      payload: T
-  ): Promise<GeneralJWS> {
-    if (this._client == null) throw new Error('No provider available')
-    if (this._id == null) throw new Error('DID is not authenticated')
-    const { jws } = await this._client.request('did_createJWS', {
-      did: this._id,
-      ...options,
-      payload,
-    })
-    return jws
-  }
-
   /**
    * Create a JWS encoded signature over the given payload.
    * Will be signed by the currently authenticated DID.
@@ -306,6 +287,25 @@ export class DID {
     })
   }
 
+  /**
+   * Request a JWS from this did's client
+   * @param options
+   * @param payload
+   */
+  async requestJWS<T extends string | Record<string, any>>(
+      options: CreateJWSOptions,
+      payload: T
+  ): Promise<GeneralJWS> {
+    if (this._client == null) throw new Error('No provider available')
+    if (this._id == null) throw new Error('DID is not authenticated')
+    const { jws } = await this._client.request('did_createJWS', {
+      did: this._id,
+      ...options,
+      payload,
+    })
+    return jws
+  }
+
   /**
    * Create an IPFS compatibe DagJWS encoded signature over the given payload.
    * Will be signed by the currently authenticated DID.
@@ -472,6 +472,69 @@ export type VerifyCacaoParameters = {
   disableExpirationCheck?: boolean
 }
 
+export type CreateJWSUsingParameters<T extends string | Record<string, any>> = {
+  capability?: Cacao
+  payload: T
+  options: CreateJWSOptions
+  request: (options: CreateJWSOptions, payload: T) => Promise<DagJWS>
+}
+
+export async function createJWSUsing<T extends string | Record<string, any>>(
+    params: CreateJWSUsingParameters<T>
+): Promise<DagJWS> {
+  if (params.capability) {
+    const exp = params.capability.p.exp
+    if (exp && Date.parse(exp) < Date.now()) {
+      throw new Error('Capability is expired, cannot create a valid signature')
+    }
+    const cacaoBlock = await CacaoBlock.fromCacao(params.capability)
+    const capCID = CID.asCID(cacaoBlock.cid)
+    if (!capCID) {
+      throw new Error(
+          `Capability CID of the JWS cannot be set to the capability payload cid as they are incompatible`
+      )
+    }
+    params.options.protected = params.options.protected || {}
+    params.options.protected.cap = `ipfs://${capCID?.toString()}`
+  }
+  return await params.request(params.options, params.payload)
+}
+
+export type CreateDagJWSUsingParameters = {
+  capability?: Cacao
+  payload: Record<string, any>
+  options: CreateJWSOptions
+  request: (options: CreateJWSOptions, payload: string) => Promise<DagJWS>
+}
+
+export async function createDagJWSUsing(
+    params: CreateDagJWSUsingParameters
+): Promise<DagJWSResult> {
+  const { cid, linkedBlock } = await encodePayload(params.payload)
+  const payloadCid = encodeBase64Url(cid.bytes)
+  Object.assign(params.options, { linkedBlock: encodeBase64(linkedBlock) })
+  const jws = await createJWSUsing({
+    capability: params.capability,
+    payload: payloadCid,
+    options: params.options,
+    request: params.request,
+  })
+
+  const compatibleCID = CID.asCID(cid)
+  if (!compatibleCID) {
+    throw new Error(
+        'CID of the JWS cannot be set to the encoded payload cid as they are incompatible'
+    )
+  }
+  jws.link = compatibleCID
+
+  if (params.capability) {
+    const cacaoBlock = await CacaoBlock.fromCacao(params.capability)
+    return { jws, linkedBlock, cacaoBlock: cacaoBlock.bytes }
+  }
+  return { jws, linkedBlock }
+}
+
 export type VerifyJWSUsingParameters = {
   resolve: (url: string) => Promise<DIDResolutionResult>
   verifyCacao: (cacao: Cacao, opts: VerifyCacaoParameters) => Promise<void>
@@ -511,7 +574,8 @@ export async function verifyJWSUsing(params: VerifyJWSUsingParameters): Promise<
   const signerDid = didResolutionResult.didDocument?.id
   if (
       options.issuer &&
-      options.issuer === options.capability?.p.iss &&
+      options.capability &&
+      issuerEquals(options.issuer, options.capability?.p.iss) &&
       signerDid === options.capability.p.aud
   ) {
     await params.verifyCacao(options.capability, {
@@ -553,67 +617,4 @@ export async function verifyJWSUsing(params: VerifyJWSUsingParameters): Promise<
     // If an error is thrown it means that the payload is a CID.
   }
   return { kid, payload, didResolutionResult }
-}
-
-export type CreateDagJWSUsingParameters = {
-  capability?: Cacao
-  payload: Record<string, any>
-  options: CreateJWSOptions
-  request: (options: CreateJWSOptions, payload: string) => Promise<DagJWS>
-}
-
-export async function createDagJWSUsing(
-    params: CreateDagJWSUsingParameters
-): Promise<DagJWSResult> {
-  const { cid, linkedBlock } = await encodePayload(params.payload)
-  const payloadCid = encodeBase64Url(cid.bytes)
-  Object.assign(params.options, { linkedBlock: encodeBase64(linkedBlock) })
-  const jws = await createJWSUsing({
-    capability: params.capability,
-    payload: payloadCid,
-    options: params.options,
-    request: params.request,
-  })
-
-  const compatibleCID = CID.asCID(cid)
-  if (!compatibleCID) {
-    throw new Error(
-        'CID of the JWS cannot be set to the encoded payload cid as they are incompatible'
-    )
-  }
-  jws.link = compatibleCID
-
-  if (params.capability) {
-    const cacaoBlock = await CacaoBlock.fromCacao(params.capability)
-    return { jws, linkedBlock, cacaoBlock: cacaoBlock.bytes }
-  }
-  return { jws, linkedBlock }
-}
-
-export type CreateJWSUsingParameters<T extends string | Record<string, any>> = {
-  capability?: Cacao
-  payload: T
-  options: CreateJWSOptions
-  request: (options: CreateJWSOptions, payload: T) => Promise<DagJWS>
-}
-
-export async function createJWSUsing<T extends string | Record<string, any>>(
-    params: CreateJWSUsingParameters<T>
-): Promise<DagJWS> {
-  if (params.capability) {
-    const exp = params.capability.p.exp
-    if (exp && Date.parse(exp) < Date.now()) {
-      throw new Error('Capability is expired, cannot create a valid signature')
-    }
-    const cacaoBlock = await CacaoBlock.fromCacao(params.capability)
-    const capCID = CID.asCID(cacaoBlock.cid)
-    if (!capCID) {
-      throw new Error(
-          `Capability CID of the JWS cannot be set to the capability payload cid as they are incompatible`
-      )
-    }
-    params.options.protected = params.options.protected || {}
-    params.options.protected.cap = `ipfs://${capCID?.toString()}`
-  }
-  return await params.request(params.options, params.payload)
 }