iso-ucan 0.5.2 → 1.0.0

package/dist/src/invocation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"invocation.d.ts","sourceRoot":"","sources":["../../src/invocation.js"],"names":[],"mappings":"AA6OA;;;;GAIG;AACH,sCAHW,OAAO,YAAY,EAAE,iBAAiB,UACtC,UAAU,EAAE,WA6DtB;AA3RD;;;GAGG;AAEH;;GAEG;AACH;IAuCE;;;OAGG;IACH,qBAFW,OAAO,YAAY,EAAE,qBAAqB,uBAgEpD;IAED;;OAEG;IACH,uBAFW,OAAO,YAAY,EAAE,iBAAiB,uBAgEhD;IAtJD;;;;;;;OAOG;IACH,sBANW,OAAO,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC,SAC3C,UAAU,OACV,GAAG,eACH,UAAU,EAAE,aACZ,MAAM,EAShB;IApCD;;OAEG;IACH,aAFU,UAAU,EAAE,CAEX;IAEX;;OAEG;IACH,KAFU,GAAG,CAEV;IAEH;;;;;;;;OAQG;IACH,WAFU,MAAM,CAEP;IAWP,sDAAwB;IACxB,gDAA+B;IAC/B,mCAAkB;CA4IrB;gCApL4B,iBAAiB;yBACxB,cAAc"}
+{"version":3,"file":"invocation.d.ts","sourceRoot":"","sources":["../../src/invocation.js"],"names":[],"mappings":"AAmPA;;;;GAIG;AACH,sCAHW,OAAO,YAAY,EAAE,iBAAiB,UACtC,UAAU,EAAE,WA6DtB;AAjSD;;;GAGG;AAEH;;GAEG;AACH;IAuCE;;;OAGG;IACH,qBAFW,OAAO,YAAY,EAAE,qBAAqB,uBA6DpD;IAED;;OAEG;IACH,uBAFW,OAAO,YAAY,EAAE,iBAAiB,uBAmEhD;IAtJD;;;;;;;OAOG;IACH,sBANW,OAAO,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC,SAC3C,UAAU,OACV,GAAG,eACH,UAAU,EAAE,aACZ,MAAM,EAShB;IApCD;;OAEG;IACH,aAFU,UAAU,EAAE,CAEX;IAEX;;OAEG;IACH,KAFU,GAAG,CAEV;IAEH;;;;;;;;OAQG;IACH,WAFU,MAAM,CAEP;IAWP,sDAAwB;IACxB,gDAA+B;IAC/B,mCAAkB;CA4IrB;gCApL4B,iBAAiB;yBACxB,cAAc"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "iso-ucan",
   "type": "module",
-  "version": "0.5.2",
+  "version": "1.0.0",
   "description": "Isomorphic UCAN",
   "author": "Hugo Dias <hugomrdias@gmail.com> (hugodias.me)",
   "license": "MIT",
@@ -109,7 +109,7 @@
     "iso-base": "^4.4.0",
     "iso-did": "^3.0.0",
     "iso-kv": "^3.2.0",
-    "iso-signatures": "^0.5.2",
+    "iso-signatures": "^0.6.0",
     "iso-web": "^4.0.0",
     "it-merge": "^3.0.15",
     "multiformats": "^14.0.5",

package/src/invocation.js

@@ -79,14 +79,11 @@ export class Invocation {
         `Invalid envelope type. Expected "inv" but got "${envelope.spec}"`
       )
     }
-    // Audience or subject must match receiver
-    if (
-      audience &&
-      envelope.payload.aud !== audience.did &&
-      envelope.payload.sub !== audience.did
-    ) {
+    // The executor is `aud` when present, otherwise `sub`
+    const executor = envelope.payload.aud ?? envelope.payload.sub
+    if (audience && executor !== audience.did) {
       throw new TypeError(
-        `UCAN Invocation audience or subject does not match receiver. Expected: ${audience.did} but got: ${envelope.payload.aud ?? envelope.payload.sub ?? 'null'}`
+        `UCAN Invocation audience does not match receiver. Expected: ${audience.did} but got: ${executor ?? 'null'}`
       )
     }
 
@@ -140,7 +137,6 @@ export class Invocation {
     /** @type {import("./types.js").InvocationPayload} */
     const payload = {
       iss: options.iss.toString(),
-      aud: options.aud ? options.aud : options.sub,
       sub: options.sub,
       cmd: options.cmd,
       nonce,
@@ -148,6 +144,10 @@ export class Invocation {
       args: options.args,
       prf: options.prf.map((p) => p.cid),
     }
+    // `aud` MUST be omitted when the executor is the subject
+    if (options.aud && options.aud !== options.sub) {
+      payload.aud = options.aud
+    }
     if (options.cause) {
       payload.cause = options.cause
     }
@@ -226,6 +226,12 @@ function assertStructure(payload) {
 
   if (payload.aud) {
     didParse(payload.aud)
+    // Spec: `aud` MUST be omitted when the executor is the subject
+    if (payload.aud === payload.sub) {
+      throw new TypeError(
+        'UCAN Invocation audience must be omitted when it equals the subject'
+      )
+    }
   }
 
   assertIsValidCommand(payload.cmd)