@sd-jwt/core 0.3.2-next.76 → 0.3.2-next.95

package/README.md

@@ -32,44 +32,8 @@ Ensure you have Node.js installed as a prerequisite.
 
 ### Usage
 
-Here's a basic example of how to use this library:
-
-```jsx
-import { DisclosureFrame } from '@sd-jwt/core';
-
-// Issuer defines the claims object with the user's information
-const claims = {
-  firstname: 'John',
-  lastname: 'Doe',
-  ssn: '123-45-6789',
-  id: '1234',
-};
-
-// Issuer defines the disclosure frame to specify which claims can be disclosed/undisclosed
-const disclosureFrame: DisclosureFrame<typeof claims> = {
-  _sd: ['firstname', 'lastname', 'ssn'],
-};
-
-// Issuer issues a signed JWT credential with the specified claims and disclosure frame
-// returns an encoded JWT
-const credential = await sdjwt.issue(claims, disclosureFrame);
-
-// Holder may validate the credential from the issuer
-const valid = await sdjwt.validate(credential);
-
-// Holder defines the presentation frame to specify which claims should be presented
-// The list of presented claims must be a subset of the disclosed claims
-const presentationFrame = ['firstname', 'ssn'];
-
-// Holder creates a presentation using the issued credential and the presentation frame
-// returns an encoded SD JWT.
-const presentation = await sdjwt.present(credential, presentationFrame);
-
-// Verifier can verify the presentation using the Issuer's public key
-const verified = await sdjwt.verify(presentation);
-```
-
-Check out more details in our [documentation](https://github.com/openwallet-foundation-labs/sd-jwt-js/tree/next/docs) or [examples](https://github.com/openwallet-foundation-labs/sd-jwt-js/tree/next/examples)
+The library can be used to create sd-jwt based credentials. To be compliant with the  `sd-jwt-vc` standard, you can use the `@sd-jwt/sd-jwt-vc` that is implementing this spec.
+If you want to use the pure sd-jwt class or implement your own sd-jwt credential approach, you can use this library.
 
 ### Dependencies
 

package/dist/index.d.mts

@@ -66,16 +66,24 @@ declare const pack: <T extends Record<string, unknown>>(claims: T, disclosureFra
 
 declare const createDecoy: (hash: HasherAndAlg, saltGenerator: SaltGenerator) => Promise<string>;
 
-declare class SDJwtInstance {
+type SdJwtPayload = Record<string, unknown>;
+declare class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
+    protected type?: string;
     static DEFAULT_hashAlg: string;
     private userConfig;
     constructor(userConfig?: SDJWTConfig);
     private createKBJwt;
     private SignJwt;
     private VerifyJwt;
-    issue<Payload extends Record<string, unknown>>(payload: Payload, disclosureFrame?: DisclosureFrame<Payload>, options?: {
+    issue<Payload extends ExtendedPayload>(payload: Payload, disclosureFrame?: DisclosureFrame<Payload>, options?: {
         header?: object;
     }): Promise<SDJWTCompact>;
+    /**
+     * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
+     * @param disclosureFrame
+     * @returns
+     */
+    protected validateReservedFields<T extends ExtendedPayload>(disclosureFrame: DisclosureFrame<T>): void;
     present(encodedSDJwt: string, presentationKeys?: string[], options?: {
         kb?: KBOptions;
     }): Promise<SDJWTCompact>;
@@ -104,4 +112,4 @@ declare class SDJwtInstance {
     getClaims(endcodedSDJwt: SDJWTCompact): Promise<unknown>;
 }
 
-export { Jwt, type JwtData, KBJwt, SDJwt, type SDJwtData, SDJwtInstance, createDecoy, listKeys, pack };
+export { Jwt, type JwtData, KBJwt, SDJwt, type SDJwtData, SDJwtInstance, type SdJwtPayload, createDecoy, listKeys, pack };

package/dist/index.d.ts

@@ -66,16 +66,24 @@ declare const pack: <T extends Record<string, unknown>>(claims: T, disclosureFra
 
 declare const createDecoy: (hash: HasherAndAlg, saltGenerator: SaltGenerator) => Promise<string>;
 
-declare class SDJwtInstance {
+type SdJwtPayload = Record<string, unknown>;
+declare class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
+    protected type?: string;
     static DEFAULT_hashAlg: string;
     private userConfig;
     constructor(userConfig?: SDJWTConfig);
     private createKBJwt;
     private SignJwt;
     private VerifyJwt;
-    issue<Payload extends Record<string, unknown>>(payload: Payload, disclosureFrame?: DisclosureFrame<Payload>, options?: {
+    issue<Payload extends ExtendedPayload>(payload: Payload, disclosureFrame?: DisclosureFrame<Payload>, options?: {
         header?: object;
     }): Promise<SDJWTCompact>;
+    /**
+     * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
+     * @param disclosureFrame
+     * @returns
+     */
+    protected validateReservedFields<T extends ExtendedPayload>(disclosureFrame: DisclosureFrame<T>): void;
     present(encodedSDJwt: string, presentationKeys?: string[], options?: {
         kb?: KBOptions;
     }): Promise<SDJWTCompact>;
@@ -104,4 +112,4 @@ declare class SDJwtInstance {
     getClaims(endcodedSDJwt: SDJWTCompact): Promise<unknown>;
 }
 
-export { Jwt, type JwtData, KBJwt, SDJwt, type SDJwtData, SDJwtInstance, createDecoy, listKeys, pack };
+export { Jwt, type JwtData, KBJwt, SDJwt, type SDJwtData, SDJwtInstance, type SdJwtPayload, createDecoy, listKeys, pack };

package/dist/index.js

@@ -460,6 +460,9 @@ var _SDJwtInstance = class _SDJwtInstance {
       if (!this.userConfig.signAlg) {
         throw new import_utils5.SDJWTException("sign alogrithm not specified");
       }
+      if (disclosureFrame) {
+        this.validateReservedFields(disclosureFrame);
+      }
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : _SDJwtInstance.DEFAULT_hashAlg;
       const { packedClaims, disclosures } = yield pack(
@@ -470,7 +473,7 @@ var _SDJwtInstance = class _SDJwtInstance {
       );
       const alg = this.userConfig.signAlg;
       const OptionHeader = (_b = options == null ? void 0 : options.header) != null ? _b : {};
-      const CustomHeader = this.userConfig.omitTyp ? OptionHeader : __spreadValues({ typ: import_types2.SD_JWT_TYP }, OptionHeader);
+      const CustomHeader = this.userConfig.omitTyp ? OptionHeader : __spreadValues({ typ: this.type }, OptionHeader);
       const header = __spreadProps(__spreadValues({}, CustomHeader), { alg });
       const jwt = new Jwt({
         header,
@@ -486,6 +489,14 @@ var _SDJwtInstance = class _SDJwtInstance {
       return sdJwt.encodeSDJwt();
     });
   }
+  /**
+   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
+   * @param disclosureFrame
+   * @returns
+   */
+  validateReservedFields(disclosureFrame) {
+    return;
+  }
   present(encodedSDJwt, presentationKeys, options) {
     return __async(this, null, function* () {
       var _a;

package/dist/index.mjs

@@ -381,8 +381,7 @@ var pack = (claims, disclosureFrame, hash, saltGenerator) => __async(void 0, nul
 
 // src/index.ts
 import {
-  KB_JWT_TYP as KB_JWT_TYP2,
-  SD_JWT_TYP
+  KB_JWT_TYP as KB_JWT_TYP2
 } from "@sd-jwt/types";
 import { getSDAlgAndPayload as getSDAlgAndPayload2 } from "@sd-jwt/decode";
 var _SDJwtInstance = class _SDJwtInstance {
@@ -441,6 +440,9 @@ var _SDJwtInstance = class _SDJwtInstance {
       if (!this.userConfig.signAlg) {
         throw new SDJWTException4("sign alogrithm not specified");
       }
+      if (disclosureFrame) {
+        this.validateReservedFields(disclosureFrame);
+      }
       const hasher = this.userConfig.hasher;
       const hashAlg = (_a = this.userConfig.hashAlg) != null ? _a : _SDJwtInstance.DEFAULT_hashAlg;
       const { packedClaims, disclosures } = yield pack(
@@ -451,7 +453,7 @@ var _SDJwtInstance = class _SDJwtInstance {
       );
       const alg = this.userConfig.signAlg;
       const OptionHeader = (_b = options == null ? void 0 : options.header) != null ? _b : {};
-      const CustomHeader = this.userConfig.omitTyp ? OptionHeader : __spreadValues({ typ: SD_JWT_TYP }, OptionHeader);
+      const CustomHeader = this.userConfig.omitTyp ? OptionHeader : __spreadValues({ typ: this.type }, OptionHeader);
       const header = __spreadProps(__spreadValues({}, CustomHeader), { alg });
       const jwt = new Jwt({
         header,
@@ -467,6 +469,14 @@ var _SDJwtInstance = class _SDJwtInstance {
       return sdJwt.encodeSDJwt();
     });
   }
+  /**
+   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
+   * @param disclosureFrame
+   * @returns
+   */
+  validateReservedFields(disclosureFrame) {
+    return;
+  }
   present(encodedSDJwt, presentationKeys, options) {
     return __async(this, null, function* () {
       var _a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/core",
-  "version": "0.3.2-next.76+270ba1b",
+  "version": "0.3.2-next.95+a2daee4",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -14,10 +14,9 @@
   "scripts": {
     "build": "rm -rf **/dist && tsup",
     "lint": "biome lint ./src",
-    "test": "pnpm run test:node && pnpm run test:browser && pnpm run test:e2e && pnpm run test:cov",
-    "test:node": "vitest run ./src/test/*.spec.ts && vitest run ./src/test/*.spec.ts --environment jsdom",
+    "test": "pnpm run test:node && pnpm run test:browser && pnpm run test:cov",
+    "test:node": "vitest run ./src/test/*.spec.ts",
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
-    "test:e2e": "vitest run ./test/*e2e.spec.ts --environment node",
     "test:cov": "vitest run --coverage"
   },
   "keywords": [
@@ -39,12 +38,12 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@sd-jwt/crypto-nodejs": "0.3.2-next.76+270ba1b"
+    "@sd-jwt/crypto-nodejs": "0.3.2-next.95+a2daee4"
   },
   "dependencies": {
-    "@sd-jwt/decode": "0.3.2-next.76+270ba1b",
-    "@sd-jwt/types": "0.3.2-next.76+270ba1b",
-    "@sd-jwt/utils": "0.3.2-next.76+270ba1b"
+    "@sd-jwt/decode": "0.3.2-next.95+a2daee4",
+    "@sd-jwt/types": "0.3.2-next.95+a2daee4",
+    "@sd-jwt/utils": "0.3.2-next.95+a2daee4"
   },
   "publishConfig": {
     "access": "public"
@@ -62,5 +61,5 @@
       "esm"
     ]
   },
-  "gitHead": "270ba1b51bde3fd8c4f2dc7d9eaf09e1225c7873"
+  "gitHead": "a2daee4acc8def8b4d5871b36f740f0f5d50479d"
 }

package/src/index.ts

@@ -9,7 +9,6 @@ import {
   KB_JWT_TYP,
   SDJWTCompact,
   SDJWTConfig,
-  SD_JWT_TYP,
 } from '@sd-jwt/types';
 import { getSDAlgAndPayload } from '@sd-jwt/decode';
 
@@ -18,7 +17,12 @@ export * from './kbjwt';
 export * from './jwt';
 export * from './decoy';
 
-export class SDJwtInstance {
+export type SdJwtPayload = Record<string, unknown>;
+
+export class SDJwtInstance<ExtendedPayload extends SdJwtPayload> {
+  //header type
+  protected type?: string;
+
   public static DEFAULT_hashAlg = 'sha-256';
 
   private userConfig: SDJWTConfig = {};
@@ -68,7 +72,7 @@ export class SDJwtInstance {
     return jwt.verify(this.userConfig.verifier);
   }
 
-  public async issue<Payload extends Record<string, unknown>>(
+  public async issue<Payload extends ExtendedPayload>(
     payload: Payload,
     disclosureFrame?: DisclosureFrame<Payload>,
     options?: {
@@ -87,6 +91,10 @@ export class SDJwtInstance {
       throw new SDJWTException('sign alogrithm not specified');
     }
 
+    if (disclosureFrame) {
+      this.validateReservedFields<Payload>(disclosureFrame);
+    }
+
     const hasher = this.userConfig.hasher;
     const hashAlg = this.userConfig.hashAlg ?? SDJwtInstance.DEFAULT_hashAlg;
 
@@ -100,7 +108,7 @@ export class SDJwtInstance {
     const OptionHeader = options?.header ?? {};
     const CustomHeader = this.userConfig.omitTyp
       ? OptionHeader
-      : { typ: SD_JWT_TYP, ...OptionHeader };
+      : { typ: this.type, ...OptionHeader };
     const header = { ...CustomHeader, alg };
     const jwt = new Jwt({
       header,
@@ -119,6 +127,17 @@ export class SDJwtInstance {
     return sdJwt.encodeSDJwt();
   }
 
+  /**
+   * Validates if the disclosureFrame contains any reserved fields. If so it will throw an error.
+   * @param disclosureFrame
+   * @returns
+   */
+  protected validateReservedFields<T extends ExtendedPayload>(
+    disclosureFrame: DisclosureFrame<T>,
+  ) {
+    return;
+  }
+
   public async present(
     encodedSDJwt: string,
     presentationKeys?: string[],

package/src/test/index.spec.ts

@@ -1,4 +1,4 @@
-import { SDJwtInstance } from '../index';
+import { SDJwtInstance, SdJwtPayload } from '../index';
 import { Signer, Verifier } from '@sd-jwt/types';
 import Crypto from 'node:crypto';
 import { describe, expect, test } from 'vitest';
@@ -23,13 +23,13 @@ export const createSignerVerifier = () => {
 
 describe('index', () => {
   test('create', async () => {
-    const sdjwt = new SDJwtInstance();
+    const sdjwt = new SDJwtInstance<SdJwtPayload>();
     expect(sdjwt).toBeDefined();
   });
 
   test('kbJwt', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       signAlg: 'EdDSA',
       verifier,
@@ -41,6 +41,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -64,7 +67,7 @@ describe('index', () => {
 
   test('issue', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       signAlg: 'EdDSA',
       verifier,
@@ -74,6 +77,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -95,7 +101,7 @@ describe('index', () => {
       );
     };
 
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       signAlg: 'EdDSA',
       verifier: failedverifier,
@@ -106,6 +112,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -130,7 +139,7 @@ describe('index', () => {
         Buffer.from(sig, 'base64url'),
       );
     };
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       signAlg: 'EdDSA',
       verifier,
@@ -144,6 +153,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -169,7 +181,7 @@ describe('index', () => {
 
   test('verify with kbJwt', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       signAlg: 'EdDSA',
       verifier,
@@ -183,6 +195,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -204,11 +219,14 @@ describe('index', () => {
   });
 
   test('Hasher not found', async () => {
-    const sdjwt = new SDJwtInstance({});
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({});
     try {
       const credential = await sdjwt.issue(
         {
           foo: 'bar',
+          iss: 'Issuer',
+          iat: new Date().getTime(),
+          vct: '',
         },
         {
           _sd: ['foo'],
@@ -222,13 +240,16 @@ describe('index', () => {
   });
 
   test('SaltGenerator not found', async () => {
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       hasher: digest,
     });
     try {
       const credential = await sdjwt.issue(
         {
           foo: 'bar',
+          iss: 'Issuer',
+          iat: new Date().getTime(),
+          vct: '',
         },
         {
           _sd: ['foo'],
@@ -242,7 +263,7 @@ describe('index', () => {
   });
 
   test('Signer not found', async () => {
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       hasher: digest,
       saltGenerator: generateSalt,
     });
@@ -250,6 +271,9 @@ describe('index', () => {
       const credential = await sdjwt.issue(
         {
           foo: 'bar',
+          iss: 'Issuer',
+          iat: new Date().getTime(),
+          vct: '',
         },
         {
           _sd: ['foo'],
@@ -264,7 +288,7 @@ describe('index', () => {
 
   test('Verifier not found', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       hasher: digest,
       saltGenerator: generateSalt,
@@ -277,6 +301,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -301,7 +328,7 @@ describe('index', () => {
 
   test('kbSigner not found', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       verifier,
       hasher: digest,
@@ -314,6 +341,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -336,7 +366,7 @@ describe('index', () => {
 
   test('kbVerifier not found', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       verifier,
       hasher: digest,
@@ -349,6 +379,9 @@ describe('index', () => {
     const credential = await sdjwt.issue(
       {
         foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
       },
       {
         _sd: ['foo'],
@@ -370,4 +403,94 @@ describe('index', () => {
       expect(e).toBeDefined();
     }
   });
+
+  test('kbSignAlg not found', async () => {
+    const { signer, verifier } = createSignerVerifier();
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
+      signer,
+      verifier,
+      hasher: digest,
+      saltGenerator: generateSalt,
+      kbSigner: signer,
+      signAlg: 'EdDSA',
+    });
+
+    const credential = await sdjwt.issue(
+      {
+        foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
+      },
+      {
+        _sd: ['foo'],
+      },
+    );
+
+    const presentation = sdjwt.present(credential, ['foo'], {
+      kb: {
+        payload: {
+          aud: '1',
+          iat: 1,
+          nonce: '342',
+        },
+      },
+    });
+    expect(presentation).rejects.toThrow(
+      'Key Binding sign algorithm not specified',
+    );
+  });
+
+  test('hasher is not found', async () => {
+    const { signer } = createSignerVerifier();
+    const sdjwt_create = new SDJwtInstance<SdJwtPayload>({
+      signer,
+      hasher: digest,
+      saltGenerator: generateSalt,
+      signAlg: 'EdDSA',
+    });
+    const credential = await sdjwt_create.issue(
+      {
+        foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
+      },
+      {
+        _sd: ['foo'],
+      },
+    );
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({});
+    expect(sdjwt.keys('')).rejects.toThrow('Hasher not found');
+    expect(sdjwt.presentableKeys('')).rejects.toThrow('Hasher not found');
+    expect(sdjwt.getClaims('')).rejects.toThrow('Hasher not found');
+    expect(() => sdjwt.decode('')).toThrowError('Hasher not found');
+    expect(sdjwt.present(credential, ['foo'])).rejects.toThrow(
+      'Hasher not found',
+    );
+  });
+
+  test('presentableKeys', async () => {
+    const { signer } = createSignerVerifier();
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
+      signer,
+      hasher: digest,
+      saltGenerator: generateSalt,
+      signAlg: 'EdDSA',
+    });
+    const credential = await sdjwt.issue(
+      {
+        foo: 'bar',
+        iss: 'Issuer',
+        iat: new Date().getTime(),
+        vct: '',
+      },
+      {
+        _sd: ['foo'],
+      },
+    );
+    const keys = await sdjwt.presentableKeys(credential);
+    expect(keys).toBeDefined();
+    expect(keys).toEqual(['foo']);
+  });
 });

package/test/app-e2e.spec.ts

@@ -1,5 +1,5 @@
 import Crypto from 'node:crypto';
-import { SDJwtInstance } from '../src';
+import { SDJwtInstance, SdJwtPayload } from '../src';
 import { DisclosureFrame, Signer, Verifier } from '@sd-jwt/types';
 import fs from 'fs';
 import path from 'path';
@@ -26,7 +26,7 @@ export const createSignerVerifier = () => {
 describe('App', () => {
   test('Example', async () => {
     const { signer, verifier } = createSignerVerifier();
-    const sdjwt = new SDJwtInstance({
+    const sdjwt = new SDJwtInstance<SdJwtPayload>({
       signer,
       signAlg: 'EdDSA',
       verifier,
@@ -192,7 +192,7 @@ describe('App', () => {
 async function JSONtest(filename: string) {
   const test = loadTestJsonFile(filename);
   const { signer, verifier } = createSignerVerifier();
-  const sdjwt = new SDJwtInstance({
+  const sdjwt = new SDJwtInstance<SdJwtPayload>({
     signer,
     signAlg: 'EdDSA',
     verifier,
@@ -209,7 +209,7 @@ async function JSONtest(filename: string) {
 
   expect(validated).toBeDefined();
   expect(validated).toStrictEqual({
-    header: { alg: 'EdDSA', typ: 'sd-jwt' },
+    header: { alg: 'EdDSA' },
     payload: test.claims,
   });
 
@@ -228,14 +228,14 @@ async function JSONtest(filename: string) {
 
   expect(verified).toBeDefined();
   expect(verified).toStrictEqual({
-    header: { alg: 'EdDSA', typ: 'sd-jwt' },
+    header: { alg: 'EdDSA' },
     payload: test.claims,
   });
 }
 
 type TestJson = {
-  claims: object;
-  disclosureFrame: DisclosureFrame<object>;
+  claims: SdJwtPayload;
+  disclosureFrame: DisclosureFrame<SdJwtPayload>;
   presentationKeys: string[];
   presenatedClaims: object;
   requiredClaimKeys: string[];