@sd-jwt/core 0.3.2-next.101 → 0.3.2-next.103

package/dist/index.js

@@ -129,7 +129,7 @@ var Jwt = class _Jwt {
       const header = (0, import_utils.Base64urlEncode)(JSON.stringify(this.header));
       const payload = (0, import_utils.Base64urlEncode)(JSON.stringify(this.payload));
       const data = `${header}.${payload}`;
-      const verified = verifier(data, this.signature);
+      const verified = yield verifier(data, this.signature);
       if (!verified) {
         throw new import_utils.SDJWTException("Verify Error: Invalid JWT Signature");
       }
@@ -511,18 +511,17 @@ var _SDJwtInstance = class _SDJwtInstance {
   }
   present(encodedSDJwt, presentationKeys, options) {
     return __async(this, null, function* () {
-      var _a;
-      if (!presentationKeys)
-        return encodedSDJwt;
+      var _a, _b;
       if (!this.userConfig.hasher) {
         throw new import_utils5.SDJWTException("Hasher not found");
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
+      const sortedpresentationKeys = (_a = presentationKeys == null ? void 0 : presentationKeys.sort()) != null ? _a : yield sdjwt.presentableKeys(hasher);
+      if (!((_b = sdjwt.jwt) == null ? void 0 : _b.payload))
         throw new import_utils5.SDJWTException("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
-        presentationKeys.sort(),
+        sortedpresentationKeys,
         hasher
       );
       if (!(options == null ? void 0 : options.kb)) {
@@ -534,7 +533,7 @@ var _SDJwtInstance = class _SDJwtInstance {
         hasher
       );
       sdjwt.kbJwt = yield this.createKBJwt(options.kb, sdHashStr);
-      return sdjwt.present(presentationKeys.sort(), hasher);
+      return sdjwt.present(sortedpresentationKeys, hasher);
     });
   }
   // This function is for verifying the SD JWT

package/dist/index.mjs

@@ -102,7 +102,7 @@ var Jwt = class _Jwt {
       const header = Base64urlEncode(JSON.stringify(this.header));
       const payload = Base64urlEncode(JSON.stringify(this.payload));
       const data = `${header}.${payload}`;
-      const verified = verifier(data, this.signature);
+      const verified = yield verifier(data, this.signature);
       if (!verified) {
         throw new SDJWTException("Verify Error: Invalid JWT Signature");
       }
@@ -491,18 +491,17 @@ var _SDJwtInstance = class _SDJwtInstance {
   }
   present(encodedSDJwt, presentationKeys, options) {
     return __async(this, null, function* () {
-      var _a;
-      if (!presentationKeys)
-        return encodedSDJwt;
+      var _a, _b;
       if (!this.userConfig.hasher) {
         throw new SDJWTException4("Hasher not found");
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
+      const sortedpresentationKeys = (_a = presentationKeys == null ? void 0 : presentationKeys.sort()) != null ? _a : yield sdjwt.presentableKeys(hasher);
+      if (!((_b = sdjwt.jwt) == null ? void 0 : _b.payload))
         throw new SDJWTException4("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
-        presentationKeys.sort(),
+        sortedpresentationKeys,
         hasher
       );
       if (!(options == null ? void 0 : options.kb)) {
@@ -514,7 +513,7 @@ var _SDJwtInstance = class _SDJwtInstance {
         hasher
       );
       sdjwt.kbJwt = yield this.createKBJwt(options.kb, sdHashStr);
-      return sdjwt.present(presentationKeys.sort(), hasher);
+      return sdjwt.present(sortedpresentationKeys, hasher);
     });
   }
   // This function is for verifying the SD JWT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/core",
-  "version": "0.3.2-next.101+5906908",
+  "version": "0.3.2-next.103+a28ae21",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -38,12 +38,12 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@sd-jwt/crypto-nodejs": "0.3.2-next.101+5906908"
+    "@sd-jwt/crypto-nodejs": "0.3.2-next.103+a28ae21"
   },
   "dependencies": {
-    "@sd-jwt/decode": "0.3.2-next.101+5906908",
-    "@sd-jwt/types": "0.3.2-next.101+5906908",
-    "@sd-jwt/utils": "0.3.2-next.101+5906908"
+    "@sd-jwt/decode": "0.3.2-next.103+a28ae21",
+    "@sd-jwt/types": "0.3.2-next.103+a28ae21",
+    "@sd-jwt/utils": "0.3.2-next.103+a28ae21"
   },
   "publishConfig": {
     "access": "public"
@@ -61,5 +61,5 @@
       "esm"
     ]
   },
-  "gitHead": "5906908ea5584e2dc5b83212fdac36754ff3240a"
+  "gitHead": "a28ae21d24c2e20f41857f2205c24a2609c10736"
 }

package/src/index.ts

@@ -146,7 +146,6 @@ export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
       kb?: KBOptions;
     },
   ): Promise<SDJWTCompact> {
-    if (!presentationKeys) return encodedSDJwt;
     if (!this.userConfig.hasher) {
       throw new SDJWTException('Hasher not found');
     }
@@ -154,9 +153,12 @@ export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
 
     const sdjwt = await SDJwt.fromEncode(encodedSDJwt, hasher);
 
+    const sortedpresentationKeys =
+      presentationKeys?.sort() ?? (await sdjwt.presentableKeys(hasher));
+
     if (!sdjwt.jwt?.payload) throw new SDJWTException('Payload not found');
     const presentSdJwtWithoutKb = await sdjwt.present(
-      presentationKeys.sort(),
+      sortedpresentationKeys,
       hasher,
     );
 
@@ -171,7 +173,7 @@ export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
     );
 
     sdjwt.kbJwt = await this.createKBJwt(options.kb, sdHashStr);
-    return sdjwt.present(presentationKeys.sort(), hasher);
+    return sdjwt.present(sortedpresentationKeys, hasher);
   }
 
   // This function is for verifying the SD JWT

package/src/jwt.ts

@@ -98,7 +98,7 @@ export class Jwt<
     const payload = Base64urlEncode(JSON.stringify(this.payload));
     const data = `${header}.${payload}`;
 
-    const verified = verifier(data, this.signature);
+    const verified = await verifier(data, this.signature);
     if (!verified) {
       throw new SDJWTException('Verify Error: Invalid JWT Signature');
     }

package/src/test/index.spec.ts

@@ -525,4 +525,42 @@ describe('index', () => {
     expect(keys).toBeDefined();
     expect(keys).toEqual(['foo']);
   });
+
+  test('present all disclosures with kb jwt', async () => {
+    const { signer } = createSignerVerifier();
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
+      signer,
+      kbSigner: signer,
+      hasher: digest,
+      saltGenerator: generateSalt,
+      signAlg: 'EdDSA',
+      kbSignAlg: 'EdDSA',
+    });
+    const credential = await sdjwt.issue(
+      {
+        foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
+      },
+      {
+        _sd: ['foo'],
+      },
+    );
+
+    const presentation = await sdjwt.present(credential, undefined, {
+      kb: {
+        payload: {
+          aud: '1',
+          iat: 1,
+          nonce: '342',
+        },
+      },
+    });
+
+    const decoded = await sdjwt.decode(presentation);
+    expect(decoded.jwt).toBeDefined();
+    expect(decoded.disclosures).toBeDefined();
+    expect(decoded.kbJwt).toBeDefined();
+  });
 });