@sd-jwt/sd-jwt-vc 0.17.0 → 0.17.1-next.1

package/dist/index.d.mts

@@ -131,18 +131,6 @@ type TypeMetadataFormat = {
     display?: Display[];
     /** OPTIONAL. Array of claim metadata. */
     claims?: Claim[];
-    /**
-     * OPTIONAL. Embedded JSON Schema describing the VC structure.
-     * Must not be present if schema_uri is provided.
-     */
-    schema?: object;
-    /**
-     * OPTIONAL. URI pointing to a JSON Schema for the VC structure.
-     * Must not be present if schema is provided.
-     */
-    schema_uri?: string;
-    /** OPTIONAL. Integrity metadata for the schema_uri field. */
-    'schema_uri#Integrity'?: string;
 };
 
 type VcTFetcher = (uri: string, integrity?: string) => Promise<TypeMetadataFormat>;
@@ -238,13 +226,7 @@ declare class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
      */
     private fetch;
     /**
-     * Loads the schema either from the object or as fallback from the uri.
-     * @param typeMetadataFormat
-     * @returns
-     */
-    private loadSchema;
-    /**
-     * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format. If the schema does not match, an error is thrown. If it matches, it will return the type metadata format.
+     * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format.
      * @param result
      * @returns
      */

package/dist/index.d.ts

@@ -131,18 +131,6 @@ type TypeMetadataFormat = {
     display?: Display[];
     /** OPTIONAL. Array of claim metadata. */
     claims?: Claim[];
-    /**
-     * OPTIONAL. Embedded JSON Schema describing the VC structure.
-     * Must not be present if schema_uri is provided.
-     */
-    schema?: object;
-    /**
-     * OPTIONAL. URI pointing to a JSON Schema for the VC structure.
-     * Must not be present if schema is provided.
-     */
-    schema_uri?: string;
-    /** OPTIONAL. Integrity metadata for the schema_uri field. */
-    'schema_uri#Integrity'?: string;
 };
 
 type VcTFetcher = (uri: string, integrity?: string) => Promise<TypeMetadataFormat>;
@@ -238,13 +226,7 @@ declare class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
      */
     private fetch;
     /**
-     * Loads the schema either from the object or as fallback from the uri.
-     * @param typeMetadataFormat
-     * @returns
-     */
-    private loadSchema;
-    /**
-     * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format. If the schema does not match, an error is thrown. If it matches, it will return the type metadata format.
+     * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format.
      * @param result
      * @returns
      */

package/dist/index.js

@@ -1,5 +1,4 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -18,14 +17,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
 var __async = (__this, __arguments, generator) => {
@@ -60,8 +51,6 @@ module.exports = __toCommonJS(index_exports);
 var import_core = require("@sd-jwt/core");
 var import_jwt_status_list = require("@sd-jwt/jwt-status-list");
 var import_utils = require("@sd-jwt/utils");
-var import_ajv = __toESM(require("ajv"));
-var import_ajv_formats = __toESM(require("ajv-formats"));
 var SDJwtVcInstance = class _SDJwtVcInstance extends import_core.SDJwtInstance {
   constructor(userConfig) {
     super(userConfig);
@@ -219,25 +208,7 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends import_core.SDJwtInstance {
     });
   }
   /**
-   * Loads the schema either from the object or as fallback from the uri.
-   * @param typeMetadataFormat
-   * @returns
-   */
-  loadSchema(typeMetadataFormat) {
-    return __async(this, null, function* () {
-      if (typeMetadataFormat.schema) return typeMetadataFormat.schema;
-      if (typeMetadataFormat.schema_uri) {
-        const schema = yield this.fetch(
-          typeMetadataFormat.schema_uri,
-          typeMetadataFormat["schema_uri#Integrity"]
-        );
-        return schema;
-      }
-      throw new Error("No schema or schema_uri found");
-    });
-  }
-  /**
-   * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format. If the schema does not match, an error is thrown. If it matches, it will return the type metadata format.
+   * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format.
    * @param result
    * @returns
    */
@@ -246,31 +217,6 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends import_core.SDJwtInstance {
       const typeMetadataFormat = yield this.fetchVct(result);
       if (typeMetadataFormat.extends) {
       }
-      const schema = yield this.loadSchema(typeMetadataFormat);
-      const loadedSchemas = /* @__PURE__ */ new Set();
-      const ajv = new import_ajv.default({
-        loadSchema: (uri) => __async(this, null, function* () {
-          if (loadedSchemas.has(uri)) {
-            return {};
-          }
-          const response = yield fetch(uri);
-          if (!response.ok) {
-            throw new Error(
-              `Error fetching schema: ${response.status} ${yield response.text()}`
-            );
-          }
-          loadedSchemas.add(uri);
-          return response.json();
-        })
-      });
-      (0, import_ajv_formats.default)(ajv);
-      const validate = yield ajv.compileAsync(schema);
-      const valid = validate(result.payload);
-      if (!valid) {
-        throw new import_utils.SDJWTException(
-          `Payload does not match the schema: ${JSON.stringify(validate.errors)}`
-        );
-      }
       return typeMetadataFormat;
     });
   }
@@ -325,7 +271,7 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends import_core.SDJwtInstance {
    */
   verifyStatus(result, options) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       if (result.payload.status) {
         if (result.payload.status.status_list) {
           const fetcher = (_a = this.userConfig.statusListFetcher) != null ? _a : this.statusListFetcher.bind(this);
@@ -336,16 +282,17 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends import_core.SDJwtInstance {
           yield slJWT.verify(
             (_b = this.userConfig.statusVerifier) != null ? _b : this.userConfig.verifier,
             options
-          );
-          const currentDate = (_c = options == null ? void 0 : options.currentDate) != null ? _c : Math.floor(Date.now() / 1e3);
-          if (((_d = slJWT.payload) == null ? void 0 : _d.exp) && slJWT.payload.exp < currentDate) {
-            throw new import_utils.SDJWTException("Status list is expired");
-          }
+          ).catch((err) => {
+            throw new import_jwt_status_list.SLException(
+              `Status List JWT verification failed: ${err.message}`,
+              err.details
+            );
+          });
           const statusList = (0, import_jwt_status_list.getListFromStatusListJWT)(statusListJWT);
           const status = statusList.getStatus(
             result.payload.status.status_list.idx
           );
-          const statusValidator = (_e = this.userConfig.statusValidator) != null ? _e : this.statusValidator.bind(this);
+          const statusValidator = (_c = this.userConfig.statusValidator) != null ? _c : this.statusValidator.bind(this);
           yield statusValidator(status);
         }
       }

package/dist/index.mjs

@@ -25,11 +25,10 @@ var __async = (__this, __arguments, generator) => {
 // src/sd-jwt-vc-instance.ts
 import { Jwt, SDJwt, SDJwtInstance } from "@sd-jwt/core";
 import {
-  getListFromStatusListJWT
+  getListFromStatusListJWT,
+  SLException
 } from "@sd-jwt/jwt-status-list";
 import { base64urlDecode, SDJWTException } from "@sd-jwt/utils";
-import Ajv from "ajv";
-import addFormats from "ajv-formats";
 var SDJwtVcInstance = class _SDJwtVcInstance extends SDJwtInstance {
   constructor(userConfig) {
     super(userConfig);
@@ -187,25 +186,7 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends SDJwtInstance {
     });
   }
   /**
-   * Loads the schema either from the object or as fallback from the uri.
-   * @param typeMetadataFormat
-   * @returns
-   */
-  loadSchema(typeMetadataFormat) {
-    return __async(this, null, function* () {
-      if (typeMetadataFormat.schema) return typeMetadataFormat.schema;
-      if (typeMetadataFormat.schema_uri) {
-        const schema = yield this.fetch(
-          typeMetadataFormat.schema_uri,
-          typeMetadataFormat["schema_uri#Integrity"]
-        );
-        return schema;
-      }
-      throw new Error("No schema or schema_uri found");
-    });
-  }
-  /**
-   * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format. If the schema does not match, an error is thrown. If it matches, it will return the type metadata format.
+   * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format.
    * @param result
    * @returns
    */
@@ -214,31 +195,6 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends SDJwtInstance {
       const typeMetadataFormat = yield this.fetchVct(result);
       if (typeMetadataFormat.extends) {
       }
-      const schema = yield this.loadSchema(typeMetadataFormat);
-      const loadedSchemas = /* @__PURE__ */ new Set();
-      const ajv = new Ajv({
-        loadSchema: (uri) => __async(this, null, function* () {
-          if (loadedSchemas.has(uri)) {
-            return {};
-          }
-          const response = yield fetch(uri);
-          if (!response.ok) {
-            throw new Error(
-              `Error fetching schema: ${response.status} ${yield response.text()}`
-            );
-          }
-          loadedSchemas.add(uri);
-          return response.json();
-        })
-      });
-      addFormats(ajv);
-      const validate = yield ajv.compileAsync(schema);
-      const valid = validate(result.payload);
-      if (!valid) {
-        throw new SDJWTException(
-          `Payload does not match the schema: ${JSON.stringify(validate.errors)}`
-        );
-      }
       return typeMetadataFormat;
     });
   }
@@ -293,7 +249,7 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends SDJwtInstance {
    */
   verifyStatus(result, options) {
     return __async(this, null, function* () {
-      var _a, _b, _c, _d, _e;
+      var _a, _b, _c;
       if (result.payload.status) {
         if (result.payload.status.status_list) {
           const fetcher = (_a = this.userConfig.statusListFetcher) != null ? _a : this.statusListFetcher.bind(this);
@@ -304,16 +260,17 @@ var SDJwtVcInstance = class _SDJwtVcInstance extends SDJwtInstance {
           yield slJWT.verify(
             (_b = this.userConfig.statusVerifier) != null ? _b : this.userConfig.verifier,
             options
-          );
-          const currentDate = (_c = options == null ? void 0 : options.currentDate) != null ? _c : Math.floor(Date.now() / 1e3);
-          if (((_d = slJWT.payload) == null ? void 0 : _d.exp) && slJWT.payload.exp < currentDate) {
-            throw new SDJWTException("Status list is expired");
-          }
+          ).catch((err) => {
+            throw new SLException(
+              `Status List JWT verification failed: ${err.message}`,
+              err.details
+            );
+          });
           const statusList = getListFromStatusListJWT(statusListJWT);
           const status = statusList.getStatus(
             result.payload.status.status_list.idx
           );
-          const statusValidator = (_e = this.userConfig.statusValidator) != null ? _e : this.statusValidator.bind(this);
+          const statusValidator = (_c = this.userConfig.statusValidator) != null ? _c : this.statusValidator.bind(this);
           yield statusValidator(status);
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sd-jwt/sd-jwt-vc",
-  "version": "0.17.0",
+  "version": "0.17.1-next.1+06d7cc4",
   "description": "sd-jwt draft 7 implementation in typescript",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -38,15 +38,13 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@sd-jwt/core": "0.17.0",
-    "@sd-jwt/jwt-status-list": "0.17.0",
-    "@sd-jwt/utils": "0.17.0",
-    "ajv": "^8.17.1",
-    "ajv-formats": "^3.0.1"
+    "@sd-jwt/core": "0.17.1-next.1+06d7cc4",
+    "@sd-jwt/jwt-status-list": "0.17.1-next.1+06d7cc4",
+    "@sd-jwt/utils": "0.17.1-next.1+06d7cc4"
   },
   "devDependencies": {
-    "@sd-jwt/crypto-nodejs": "0.17.0",
-    "@sd-jwt/types": "0.17.0",
+    "@sd-jwt/crypto-nodejs": "0.17.1-next.1+06d7cc4",
+    "@sd-jwt/types": "0.17.1-next.1+06d7cc4",
     "jose": "^6.1.0",
     "msw": "^2.11.3"
   },
@@ -66,5 +64,5 @@
       "esm"
     ]
   },
-  "gitHead": "9f37cdfbae982a647e61589fd88dfd79305105c1"
+  "gitHead": "06d7cc469143d42106389d3e8c5fd4519abb12a9"
 }

package/src/sd-jwt-vc-instance.ts

@@ -1,13 +1,12 @@
 import { Jwt, SDJwt, SDJwtInstance, type VerifierOptions } from '@sd-jwt/core';
 import {
   getListFromStatusListJWT,
+  SLException,
   type StatusListJWTHeaderParameters,
   type StatusListJWTPayload,
 } from '@sd-jwt/jwt-status-list';
 import type { DisclosureFrame, Hasher, Verifier } from '@sd-jwt/types';
 import { base64urlDecode, SDJWTException } from '@sd-jwt/utils';
-import Ajv, { type SchemaObject } from 'ajv';
-import addFormats from 'ajv-formats';
 import type {
   SDJWTVCConfig,
   StatusListFetcher,
@@ -210,25 +209,7 @@ export class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
   }
 
   /**
-   * Loads the schema either from the object or as fallback from the uri.
-   * @param typeMetadataFormat
-   * @returns
-   */
-  private async loadSchema(typeMetadataFormat: TypeMetadataFormat) {
-    //if schema is present, return it
-    if (typeMetadataFormat.schema) return typeMetadataFormat.schema;
-    if (typeMetadataFormat.schema_uri) {
-      const schema = await this.fetch<SchemaObject>(
-        typeMetadataFormat.schema_uri,
-        typeMetadataFormat['schema_uri#Integrity'],
-      );
-      return schema;
-    }
-    throw new Error('No schema or schema_uri found');
-  }
-
-  /**
-   * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format. If the schema does not match, an error is thrown. If it matches, it will return the type metadata format.
+   * Verifies the VCT of the SD-JWT-VC. Returns the type metadata format.
    * @param result
    * @returns
    */
@@ -241,38 +222,6 @@ export class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
       // implement based on https://www.ietf.org/archive/id/draft-ietf-oauth-sd-jwt-vc-08.html#name-extending-type-metadata
       //TODO: needs to be implemented. Unclear at this point which values will overwrite the values from the extended type metadata format
     }
-
-    //init the json schema validator, load referenced schemas on demand
-    const schema = await this.loadSchema(typeMetadataFormat);
-    const loadedSchemas = new Set<string>();
-    // init the json schema validator
-    const ajv = new Ajv({
-      loadSchema: async (uri: string) => {
-        if (loadedSchemas.has(uri)) {
-          return {};
-        }
-        const response = await fetch(uri);
-        if (!response.ok) {
-          throw new Error(
-            `Error fetching schema: ${
-              response.status
-            } ${await response.text()}`,
-          );
-        }
-        loadedSchemas.add(uri);
-        return response.json();
-      },
-    });
-    addFormats(ajv);
-    const validate = await ajv.compileAsync(schema);
-    const valid = validate(result.payload);
-
-    if (!valid) {
-      throw new SDJWTException(
-        `Payload does not match the schema: ${JSON.stringify(validate.errors)}`,
-      );
-    }
-
     return typeMetadataFormat;
   }
 
@@ -358,18 +307,18 @@ export class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
           StatusListJWTPayload
         >(statusListJWT);
         // check if the status list has a valid signature. The presence of the verifier is checked in the parent class.
-        await slJWT.verify(
-          this.userConfig.statusVerifier ??
-            (this.userConfig.verifier as Verifier),
-          options,
-        );
-
-        const currentDate =
-          options?.currentDate ?? Math.floor(Date.now() / 1000);
-        //check if the status list is expired
-        if (slJWT.payload?.exp && (slJWT.payload.exp as number) < currentDate) {
-          throw new SDJWTException('Status list is expired');
-        }
+        await slJWT
+          .verify(
+            this.userConfig.statusVerifier ??
+              (this.userConfig.verifier as Verifier),
+            options,
+          )
+          .catch((err: SLException) => {
+            throw new SLException(
+              `Status List JWT verification failed: ${err.message}`,
+              err.details,
+            );
+          });
 
         // get the status list from the status list JWT
         const statusList = getListFromStatusListJWT(statusListJWT);

package/src/sd-jwt-vc-type-metadata-format.ts

@@ -141,16 +141,4 @@ export type TypeMetadataFormat = {
   display?: Display[];
   /** OPTIONAL. Array of claim metadata. */
   claims?: Claim[];
-  /**
-   * OPTIONAL. Embedded JSON Schema describing the VC structure.
-   * Must not be present if schema_uri is provided.
-   */
-  schema?: object;
-  /**
-   * OPTIONAL. URI pointing to a JSON Schema for the VC structure.
-   * Must not be present if schema is provided.
-   */
-  schema_uri?: string;
-  /** OPTIONAL. Integrity metadata for the schema_uri field. */
-  'schema_uri#Integrity'?: string;
 };

package/src/test/vct.spec.ts

@@ -13,44 +13,9 @@ const exampleVctm = {
   vct: 'http://example.com/example',
   name: 'ExampleCredentialType',
   description: 'An example credential type',
-  schema_uri: 'http://example.com/schema/example',
-  //this value could be generated on demand to make it easier when changing the values
-  'schema_uri#Integrity':
-    'sha256-48a61b283ded3b55e8d9a9b063327641dc4c53f76bd5daa96c23f232822167ae',
 };
 
 const restHandlers = [
-  http.get('http://example.com/schema/example', () => {
-    const res = {
-      $schema: 'https://json-schema.org/draft/2020-12/schema',
-      type: 'object',
-      properties: {
-        vct: {
-          type: 'string',
-        },
-        iss: {
-          type: 'string',
-        },
-        nbf: {
-          type: 'number',
-        },
-        exp: {
-          type: 'number',
-        },
-        cnf: {
-          type: 'object',
-        },
-        status: {
-          type: 'object',
-        },
-        firstName: {
-          type: 'string',
-        },
-      },
-      required: ['iss', 'vct'],
-    };
-    return HttpResponse.json(res);
-  }),
   http.get('http://example.com/example', () => {
     const res: TypeMetadataFormat = exampleVctm;
     return HttpResponse.json(res);
@@ -66,7 +31,7 @@ const restHandlers = [
 
 //this value could be generated on demand to make it easier when changing the values
 const vctIntegrity =
-  'sha256-96bed58130a44af05ae8970aa9caa0bf0135cd15afe721ea29f553394692acef';
+  'sha256-e8bf419e6b860595f385611fc6172f1e95c18de3c80eef57c865f49e03747637';
 
 const server = setupServer(...restHandlers);
 
@@ -190,9 +155,6 @@ describe('App', () => {
     expect(typeMetadataFormat).to.deep.eq({
       description: 'An example credential type',
       name: 'ExampleCredentialType',
-      schema_uri: 'http://example.com/schema/example',
-      'schema_uri#Integrity':
-        'sha256-48a61b283ded3b55e8d9a9b063327641dc4c53f76bd5daa96c23f232822167ae',
       vct: 'http://example.com/example',
     });
   });