@sd-jwt/core 0.9.3-next.2 → 0.9.3-next.4

package/dist/index.js

@@ -55,8 +55,8 @@ var __async = (__this, __arguments, generator) => {
 };
 
 // src/index.ts
-var src_exports = {};
-__export(src_exports, {
+var index_exports = {};
+__export(index_exports, {
   FlattenJSON: () => FlattenJSON,
   GeneralJSON: () => GeneralJSON,
   Jwt: () => Jwt,
@@ -68,7 +68,7 @@ __export(src_exports, {
   listKeys: () => listKeys,
   pack: () => pack
 });
-module.exports = __toCommonJS(src_exports);
+module.exports = __toCommonJS(index_exports);
 var import_utils7 = require("@sd-jwt/utils");
 
 // src/jwt.ts
@@ -340,8 +340,7 @@ var SDJwt = class _SDJwt {
 var listKeys = (obj, prefix = "") => {
   const keys = [];
   for (const key in obj) {
-    if (obj[key] === void 0)
-      continue;
+    if (obj[key] === void 0) continue;
     const newKey = prefix ? `${prefix}.${key}` : key;
     keys.push(newKey);
     if (obj[key] && typeof obj[key] === "object" && obj[key] !== null) {
@@ -490,10 +489,16 @@ var FlattenJSON = class _FlattenJSON {
   }
   toEncoded() {
     var _a;
+    const data = [];
     const jwt = `${this.protected}.${this.payload}.${this.signature}`;
-    const disclosures = this.disclosures.join(import_types3.SD_SEPARATOR);
+    data.push(jwt);
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(import_types3.SD_SEPARATOR);
+      data.push(disclosures);
+    }
     const kb_jwt = (_a = this.kb_jwt) != null ? _a : "";
-    return [jwt, disclosures, kb_jwt].join(import_types3.SD_SEPARATOR);
+    data.push(kb_jwt);
+    return data.join(import_types3.SD_SEPARATOR);
   }
 };
 
@@ -577,11 +582,17 @@ var GeneralJSON = class _GeneralJSON {
     if (index < 0 || index >= this.signatures.length) {
       throw new import_utils6.SDJWTException("Index out of bounds");
     }
+    const data = [];
     const { protected: protectedHeader, signature } = this.signatures[index];
-    const disclosures = this.disclosures.join(import_types4.SD_SEPARATOR);
-    const kb_jwt = (_a = this.kb_jwt) != null ? _a : "";
     const jwt = `${protectedHeader}.${this.payload}.${signature}`;
-    return [jwt, disclosures, kb_jwt].join(import_types4.SD_SEPARATOR);
+    data.push(jwt);
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(import_types4.SD_SEPARATOR);
+      data.push(disclosures);
+    }
+    const kb = (_a = this.kb_jwt) != null ? _a : "";
+    data.push(kb);
+    return data.join(import_types4.SD_SEPARATOR);
   }
   addSignature(protectedHeader, signer, kid) {
     return __async(this, null, function* () {
@@ -703,8 +714,7 @@ var _SDJwtInstance = class _SDJwtInstance {
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
-        throw new import_utils7.SDJWTException("Payload not found");
+      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) throw new import_utils7.SDJWTException("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
         presentationFrame,
         hasher
@@ -952,8 +962,7 @@ var SDJwtGeneralJSONInstance = class {
       const hasher = this.userConfig.hasher;
       const encodedSDJwt = generalJSON.toEncoded(0);
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
-        throw new import_utils7.SDJWTException("Payload not found");
+      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) throw new import_utils7.SDJWTException("Payload not found");
       const disclosures = yield sdjwt.getPresentDisclosures(
         presentationFrame,
         hasher

package/dist/index.mjs

@@ -322,8 +322,7 @@ var SDJwt = class _SDJwt {
 var listKeys = (obj, prefix = "") => {
   const keys = [];
   for (const key in obj) {
-    if (obj[key] === void 0)
-      continue;
+    if (obj[key] === void 0) continue;
     const newKey = prefix ? `${prefix}.${key}` : key;
     keys.push(newKey);
     if (obj[key] && typeof obj[key] === "object" && obj[key] !== null) {
@@ -475,10 +474,16 @@ var FlattenJSON = class _FlattenJSON {
   }
   toEncoded() {
     var _a;
+    const data = [];
     const jwt = `${this.protected}.${this.payload}.${this.signature}`;
-    const disclosures = this.disclosures.join(SD_SEPARATOR2);
+    data.push(jwt);
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(SD_SEPARATOR2);
+      data.push(disclosures);
+    }
     const kb_jwt = (_a = this.kb_jwt) != null ? _a : "";
-    return [jwt, disclosures, kb_jwt].join(SD_SEPARATOR2);
+    data.push(kb_jwt);
+    return data.join(SD_SEPARATOR2);
   }
 };
 
@@ -562,11 +567,17 @@ var GeneralJSON = class _GeneralJSON {
     if (index < 0 || index >= this.signatures.length) {
       throw new SDJWTException5("Index out of bounds");
     }
+    const data = [];
     const { protected: protectedHeader, signature } = this.signatures[index];
-    const disclosures = this.disclosures.join(SD_SEPARATOR3);
-    const kb_jwt = (_a = this.kb_jwt) != null ? _a : "";
     const jwt = `${protectedHeader}.${this.payload}.${signature}`;
-    return [jwt, disclosures, kb_jwt].join(SD_SEPARATOR3);
+    data.push(jwt);
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(SD_SEPARATOR3);
+      data.push(disclosures);
+    }
+    const kb = (_a = this.kb_jwt) != null ? _a : "";
+    data.push(kb);
+    return data.join(SD_SEPARATOR3);
   }
   addSignature(protectedHeader, signer, kid) {
     return __async(this, null, function* () {
@@ -688,8 +699,7 @@ var _SDJwtInstance = class _SDJwtInstance {
       }
       const hasher = this.userConfig.hasher;
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
-        throw new SDJWTException6("Payload not found");
+      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) throw new SDJWTException6("Payload not found");
       const presentSdJwtWithoutKb = yield sdjwt.present(
         presentationFrame,
         hasher
@@ -937,8 +947,7 @@ var SDJwtGeneralJSONInstance = class {
       const hasher = this.userConfig.hasher;
       const encodedSDJwt = generalJSON.toEncoded(0);
       const sdjwt = yield SDJwt.fromEncode(encodedSDJwt, hasher);
-      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload))
-        throw new SDJWTException6("Payload not found");
+      if (!((_a = sdjwt.jwt) == null ? void 0 : _a.payload)) throw new SDJWTException6("Payload not found");
       const disclosures = yield sdjwt.getPresentDisclosures(
         presentationFrame,
         hasher

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/core",
-  "version": "0.9.3-next.2+68b4ec4",
+  "version": "0.9.3-next.4+cc455a6",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -38,13 +38,13 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@sd-jwt/crypto-nodejs": "0.9.3-next.2+68b4ec4"
+    "@sd-jwt/crypto-nodejs": "0.9.3-next.4+cc455a6"
   },
   "dependencies": {
-    "@sd-jwt/decode": "0.9.3-next.2+68b4ec4",
-    "@sd-jwt/present": "0.9.3-next.2+68b4ec4",
-    "@sd-jwt/types": "0.9.3-next.2+68b4ec4",
-    "@sd-jwt/utils": "0.9.3-next.2+68b4ec4"
+    "@sd-jwt/decode": "0.9.3-next.4+cc455a6",
+    "@sd-jwt/present": "0.9.3-next.4+cc455a6",
+    "@sd-jwt/types": "0.9.3-next.4+cc455a6",
+    "@sd-jwt/utils": "0.9.3-next.4+cc455a6"
   },
   "publishConfig": {
     "access": "public"
@@ -62,5 +62,5 @@
       "esm"
     ]
   },
-  "gitHead": "68b4ec49db47d8fdee533646a05495bb2be729d0"
+  "gitHead": "cc455a6f3d431fa59cca1d21dad49daac135d3bc"
 }

package/src/flattenJSON.ts

@@ -82,9 +82,18 @@ export class FlattenJSON {
   }
 
   public toEncoded() {
+    const data: string[] = [];
+
     const jwt = `${this.protected}.${this.payload}.${this.signature}`;
-    const disclosures = this.disclosures.join(SD_SEPARATOR);
+    data.push(jwt);
+
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(SD_SEPARATOR);
+      data.push(disclosures);
+    }
+
     const kb_jwt = this.kb_jwt ?? '';
-    return [jwt, disclosures, kb_jwt].join(SD_SEPARATOR);
+    data.push(kb_jwt);
+    return data.join(SD_SEPARATOR);
   }
 }

package/src/generalJSON.ts

@@ -116,12 +116,20 @@ export class GeneralJSON {
     if (index < 0 || index >= this.signatures.length) {
       throw new SDJWTException('Index out of bounds');
     }
+    const data: string[] = [];
 
     const { protected: protectedHeader, signature } = this.signatures[index];
-    const disclosures = this.disclosures.join(SD_SEPARATOR);
-    const kb_jwt = this.kb_jwt ?? '';
     const jwt = `${protectedHeader}.${this.payload}.${signature}`;
-    return [jwt, disclosures, kb_jwt].join(SD_SEPARATOR);
+    data.push(jwt);
+
+    if (this.disclosures && this.disclosures.length > 0) {
+      const disclosures = this.disclosures.join(SD_SEPARATOR);
+      data.push(disclosures);
+    }
+
+    const kb = this.kb_jwt ?? '';
+    data.push(kb);
+    return data.join(SD_SEPARATOR);
   }
 
   public async addSignature(

package/src/index.ts

@@ -18,7 +18,6 @@ import {
   type JwtPayload,
   type Signer,
   IANA_HASH_ALGORITHMS,
-  type HashAlgorithm,
 } from '@sd-jwt/types';
 import { getSDAlgAndPayload } from '@sd-jwt/decode';
 import { FlattenJSON } from './flattenJSON';

package/src/test/flattenJSON.spec.ts

@@ -53,4 +53,70 @@ describe('FlattenJSON', () => {
 
     expect(result.toEncoded()).toEqual(compact);
   });
+
+  test('fromSerialized without disclosures and KB JWT', () => {
+    const flattenJSON = {
+      payload:
+        'eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0',
+      signature:
+        'n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg',
+      protected: 'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9',
+      header: {
+        disclosures: [],
+      },
+    };
+
+    const result = FlattenJSON.fromSerialized(flattenJSON);
+    expect(result).toBeDefined();
+    const compact =
+      'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~';
+
+    expect(result.toEncoded()).toEqual(compact);
+  });
+
+  test('fromSerialized without KB JWT', () => {
+    const flattenJSON = {
+      payload:
+        'eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0',
+      signature:
+        'n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg',
+      protected: 'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9',
+      header: {
+        disclosures: [
+          'WyI1ZWI4Yzg2MjM0MDJjZjJlIiwiZmlyc3RuYW1lIiwiSm9obiJd',
+          'WyJjNWMzMWY2ZWYzNTg4MWJjIiwibGFzdG5hbWUiLCJEb2UiXQ',
+          'WyJmYTlkYTUzZWJjOTk3OThlIiwic3NuIiwiMTIzLTQ1LTY3ODkiXQ',
+        ],
+      },
+    };
+
+    const result = FlattenJSON.fromSerialized(flattenJSON);
+    expect(result).toBeDefined();
+    const compact =
+      'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~WyI1ZWI4Yzg2MjM0MDJjZjJlIiwiZmlyc3RuYW1lIiwiSm9obiJd~WyJjNWMzMWY2ZWYzNTg4MWJjIiwibGFzdG5hbWUiLCJEb2UiXQ~WyJmYTlkYTUzZWJjOTk3OThlIiwic3NuIiwiMTIzLTQ1LTY3ODkiXQ~';
+
+    expect(result.toEncoded()).toEqual(compact);
+  });
+
+  test('fromSerialized without disclosures', () => {
+    const flattenJSON = {
+      payload:
+        'eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0',
+      signature:
+        'n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg',
+      protected: 'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9',
+      header: {
+        disclosures: [],
+        kb_jwt:
+          'eyJ0eXAiOiJrYitqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpYXQiOjE3MTAwNjk3MjIsImF1ZCI6ImRpZDpleGFtcGxlOjEyMyIsIm5vbmNlIjoiazh2ZGYwbmQ2Iiwic2RfaGFzaCI6Il8tTmJWSzNmczl3VzNHaDNOUktSNEt1NmZDMUwzN0R2MFFfalBXd0ppRkUifQ.pqw2OB5IA5ya9Mxf60hE3nr2gsJEIoIlnuCa4qIisijHbwg3WzTDFmW2SuNvK_ORN0WU6RoGbJx5uYZh8k4EbA',
+      },
+    };
+
+    const result = FlattenJSON.fromSerialized(flattenJSON);
+    expect(result).toBeDefined();
+    const compact =
+      'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~eyJ0eXAiOiJrYitqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpYXQiOjE3MTAwNjk3MjIsImF1ZCI6ImRpZDpleGFtcGxlOjEyMyIsIm5vbmNlIjoiazh2ZGYwbmQ2Iiwic2RfaGFzaCI6Il8tTmJWSzNmczl3VzNHaDNOUktSNEt1NmZDMUwzN0R2MFFfalBXd0ppRkUifQ.pqw2OB5IA5ya9Mxf60hE3nr2gsJEIoIlnuCa4qIisijHbwg3WzTDFmW2SuNvK_ORN0WU6RoGbJx5uYZh8k4EbA';
+
+    expect(result.toEncoded()).toEqual(compact);
+  });
 });

package/src/test/generalJSON.spec.ts

@@ -20,7 +20,7 @@ const createSignerVerifier = () => {
   return { signer, verifier };
 };
 
-describe('FlattenJSON', () => {
+describe('GeneralJSON', () => {
   test('fromEncode', () => {
     const compact =
       'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~WyI1ZWI4Yzg2MjM0MDJjZjJlIiwiZmlyc3RuYW1lIiwiSm9obiJd~WyJjNWMzMWY2ZWYzNTg4MWJjIiwibGFzdG5hbWUiLCJEb2UiXQ~WyJmYTlkYTUzZWJjOTk3OThlIiwic3NuIiwiMTIzLTQ1LTY3ODkiXQ~eyJ0eXAiOiJrYitqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpYXQiOjE3MTAwNjk3MjIsImF1ZCI6ImRpZDpleGFtcGxlOjEyMyIsIm5vbmNlIjoiazh2ZGYwbmQ2Iiwic2RfaGFzaCI6Il8tTmJWSzNmczl3VzNHaDNOUktSNEt1NmZDMUwzN0R2MFFfalBXd0ppRkUifQ.pqw2OB5IA5ya9Mxf60hE3nr2gsJEIoIlnuCa4qIisijHbwg3WzTDFmW2SuNvK_ORN0WU6RoGbJx5uYZh8k4EbA';
@@ -79,6 +79,81 @@ describe('FlattenJSON', () => {
     expect(result.toEncoded(0)).toEqual(compact);
   });
 
+  test('fromSerialized without disclosures, KB JWT', () => {
+    const generalJSON = {
+      payload:
+        'eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0',
+      signatures: [
+        {
+          protected: 'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9',
+          signature:
+            'n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg',
+          header: {
+            disclosures: [],
+          },
+        },
+      ],
+    };
+
+    const compact =
+      'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~';
+    const result = GeneralJSON.fromSerialized(generalJSON);
+    expect(result).toBeDefined();
+    expect(result.toEncoded(0)).toEqual(compact);
+  });
+
+  test('fromSerialized without KB JWT', () => {
+    const generalJSON = {
+      payload:
+        'eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0',
+      signatures: [
+        {
+          protected: 'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9',
+          signature:
+            'n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg',
+          header: {
+            disclosures: [
+              'WyI1ZWI4Yzg2MjM0MDJjZjJlIiwiZmlyc3RuYW1lIiwiSm9obiJd',
+              'WyJjNWMzMWY2ZWYzNTg4MWJjIiwibGFzdG5hbWUiLCJEb2UiXQ',
+              'WyJmYTlkYTUzZWJjOTk3OThlIiwic3NuIiwiMTIzLTQ1LTY3ODkiXQ',
+            ],
+          },
+        },
+      ],
+    };
+
+    const compact =
+      'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~WyI1ZWI4Yzg2MjM0MDJjZjJlIiwiZmlyc3RuYW1lIiwiSm9obiJd~WyJjNWMzMWY2ZWYzNTg4MWJjIiwibGFzdG5hbWUiLCJEb2UiXQ~WyJmYTlkYTUzZWJjOTk3OThlIiwic3NuIiwiMTIzLTQ1LTY3ODkiXQ~';
+    const result = GeneralJSON.fromSerialized(generalJSON);
+    expect(result).toBeDefined();
+    expect(result.toEncoded(0)).toEqual(compact);
+  });
+
+  test('fromSerialized without disclosures', () => {
+    const generalJSON = {
+      payload:
+        'eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0',
+      signatures: [
+        {
+          protected: 'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9',
+          signature:
+            'n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg',
+          header: {
+            disclosures: [],
+            kb_jwt:
+              'eyJ0eXAiOiJrYitqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpYXQiOjE3MTAwNjk3MjIsImF1ZCI6ImRpZDpleGFtcGxlOjEyMyIsIm5vbmNlIjoiazh2ZGYwbmQ2Iiwic2RfaGFzaCI6Il8tTmJWSzNmczl3VzNHaDNOUktSNEt1NmZDMUwzN0R2MFFfalBXd0ppRkUifQ.pqw2OB5IA5ya9Mxf60hE3nr2gsJEIoIlnuCa4qIisijHbwg3WzTDFmW2SuNvK_ORN0WU6RoGbJx5uYZh8k4EbA',
+          },
+        },
+      ],
+    };
+
+    const compact =
+      'eyJ0eXAiOiJzZCtqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpZCI6IjEyMzQiLCJfc2QiOlsiYkRUUnZtNS1Zbi1IRzdjcXBWUjVPVlJJWHNTYUJrNTdKZ2lPcV9qMVZJNCIsImV0M1VmUnlsd1ZyZlhkUEt6Zzc5aGNqRDFJdHpvUTlvQm9YUkd0TW9zRmsiLCJ6V2ZaTlMxOUF0YlJTVGJvN3NKUm4wQlpRdldSZGNob0M3VVphYkZyalk4Il0sIl9zZF9hbGciOiJzaGEtMjU2In0.n27NCtnuwytlBYtUNjgkesDP_7gN7bhaLhWNL4SWT6MaHsOjZ2ZMp987GgQRL6ZkLbJ7Cd3hlePHS84GBXPuvg~eyJ0eXAiOiJrYitqd3QiLCJhbGciOiJFUzI1NiJ9.eyJpYXQiOjE3MTAwNjk3MjIsImF1ZCI6ImRpZDpleGFtcGxlOjEyMyIsIm5vbmNlIjoiazh2ZGYwbmQ2Iiwic2RfaGFzaCI6Il8tTmJWSzNmczl3VzNHaDNOUktSNEt1NmZDMUwzN0R2MFFfalBXd0ppRkUifQ.pqw2OB5IA5ya9Mxf60hE3nr2gsJEIoIlnuCa4qIisijHbwg3WzTDFmW2SuNvK_ORN0WU6RoGbJx5uYZh8k4EbA';
+    const result = GeneralJSON.fromSerialized(generalJSON);
+    expect(result).toBeDefined();
+    expect(result.toEncoded(0)).toEqual(compact);
+  });
+
   test('add signature', async () => {
     const { signer } = createSignerVerifier();
 
@@ -112,7 +187,6 @@ describe('FlattenJSON', () => {
       'key-1',
     );
     const resultJson = result.toJson();
-    console.log(resultJson);
 
     expect(resultJson.signatures.length).toEqual(2);
     expect(resultJson.signatures[1].header.kid).toEqual('key-1');