From 5f57edcee454c51a4dd2e34bcd845a54554ee2b3 Mon Sep 17 00:00:00 2001
From: Mirko Mollik <mirko.mollik@fit.fraunhofer.de>
Date: Tue, 21 May 2024 13:16:31 +0200
Subject: [PATCH] Cre8/issue230 (#238)

Signed-off-by: Mirko Mollik <mirko.mollik@fit.fraunhofer.de>
---
 lerna.json                                   |  4 +---
 packages/browser-crypto/package.json         | 15 +++------------
 packages/core/package.json                   | 15 +++------------
 packages/decode/package.json                 | 15 +++------------
 packages/hash/package.json                   | 15 +++------------
 packages/jwt-status-list/package.json        | 15 +++------------
 packages/node-crypto/package.json            | 15 +++------------
 packages/present/package.json                | 15 +++------------
 packages/sd-jwt-vc/package.json              | 15 +++------------
 packages/sd-jwt-vc/src/sd-jwt-vc-instance.ts | 12 +++++++++++-
 packages/types/package.json                  | 15 +++------------
 packages/utils/package.json                  | 15 +++------------
 12 files changed, 42 insertions(+), 124 deletions(-)

diff --git a/lerna.json b/lerna.json
index 45d20da6..06e5495e 100644
--- a/lerna.json
+++ b/lerna.json
@@ -4,9 +4,7 @@
   "npmClient": "pnpm",
   "exact": true,
   "message": "chore(release): %s",
-  "packages": [
-    "packages/*"
-  ],
+  "packages": ["packages/*"],
   "command": {
     "publish": {
       "conventionalCommits": true
diff --git a/packages/browser-crypto/package.json b/packages/browser-crypto/package.json
index 7938b4f7..4de98a13 100644
--- a/packages/browser-crypto/package.json
+++ b/packages/browser-crypto/package.json
@@ -18,11 +18,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "repository": {
     "type": "git",
     "url": "https://github.com/openwallet-foundation-labs/sd-jwt-js"
@@ -37,17 +33,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/core/package.json b/packages/core/package.json
index 9bdc0402..61ad3cc1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -19,11 +19,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -50,17 +46,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/decode/package.json b/packages/decode/package.json
index 07b5860e..9024184f 100644
--- a/packages/decode/package.json
+++ b/packages/decode/package.json
@@ -18,11 +18,7 @@
     "test:node": "vitest run ./src/test/*.spec.ts --coverage",
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -47,17 +43,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/hash/package.json b/packages/hash/package.json
index 64c3514d..310d973d 100644
--- a/packages/hash/package.json
+++ b/packages/hash/package.json
@@ -19,11 +19,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -48,17 +44,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/jwt-status-list/package.json b/packages/jwt-status-list/package.json
index 05018aec..1391401b 100644
--- a/packages/jwt-status-list/package.json
+++ b/packages/jwt-status-list/package.json
@@ -19,11 +19,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt-vc",
-    "status-list",
-    "sd-jwt"
-  ],
+  "keywords": ["sd-jwt-vc", "status-list", "sd-jwt"],
   "engines": {
     "node": ">=18"
   },
@@ -50,17 +46,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/node-crypto/package.json b/packages/node-crypto/package.json
index b99c2ee5..ee73ee66 100644
--- a/packages/node-crypto/package.json
+++ b/packages/node-crypto/package.json
@@ -18,11 +18,7 @@
     "test:node": "vitest run ./src/test/*.spec.ts",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -40,17 +36,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/present/package.json b/packages/present/package.json
index 57452a7e..5ec42239 100644
--- a/packages/present/package.json
+++ b/packages/present/package.json
@@ -19,11 +19,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -49,17 +45,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/sd-jwt-vc/package.json b/packages/sd-jwt-vc/package.json
index 423e6ace..18c63679 100644
--- a/packages/sd-jwt-vc/package.json
+++ b/packages/sd-jwt-vc/package.json
@@ -20,11 +20,7 @@
     "test:e2e": "vitest run ./test/*e2e.spec.ts --environment node",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -52,17 +48,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/sd-jwt-vc/src/sd-jwt-vc-instance.ts b/packages/sd-jwt-vc/src/sd-jwt-vc-instance.ts
index cfe07275..2f9703f1 100644
--- a/packages/sd-jwt-vc/src/sd-jwt-vc-instance.ts
+++ b/packages/sd-jwt-vc/src/sd-jwt-vc-instance.ts
@@ -57,7 +57,10 @@ export class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
     const timeoutId = setTimeout(() => controller.abort(), 10000);
 
     try {
-      const response = await fetch(uri, { signal: controller.signal });
+      const response = await fetch(uri, {
+        signal: controller.signal,
+        headers: { Accept: 'application/statuslist+jwt' },
+      });
       if (!response.ok) {
         throw new Error(
           `Error fetching status list: ${
@@ -66,6 +69,13 @@ export class SDJwtVcInstance extends SDJwtInstance<SdJwtVcPayload> {
         );
       }
 
+      // according to the spec the content type should be application/statuslist+jwt
+      if (
+        response.headers.get('content-type') !== 'application/statuslist+jwt'
+      ) {
+        throw new Error('Invalid content type');
+      }
+
       return response.text();
     } finally {
       clearTimeout(timeoutId);
diff --git a/packages/types/package.json b/packages/types/package.json
index 8b2bf65a..e2189da0 100644
--- a/packages/types/package.json
+++ b/packages/types/package.json
@@ -19,11 +19,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -41,17 +37,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }
diff --git a/packages/utils/package.json b/packages/utils/package.json
index a91c0377..141798c0 100644
--- a/packages/utils/package.json
+++ b/packages/utils/package.json
@@ -19,11 +19,7 @@
     "test:browser": "vitest run ./src/test/*.spec.ts --environment jsdom",
     "test:cov": "vitest run --coverage"
   },
-  "keywords": [
-    "sd-jwt",
-    "sdjwt",
-    "sd-jwt-vc"
-  ],
+  "keywords": ["sd-jwt", "sdjwt", "sd-jwt-vc"],
   "engines": {
     "node": ">=18"
   },
@@ -48,17 +44,12 @@
     "access": "public"
   },
   "tsup": {
-    "entry": [
-      "./src/index.ts"
-    ],
+    "entry": ["./src/index.ts"],
     "sourceMap": true,
     "splitting": false,
     "clean": true,
     "dts": true,
-    "format": [
-      "cjs",
-      "esm"
-    ]
+    "format": ["cjs", "esm"]
   },
   "gitHead": "ded40e4551bde7ae93083181bf26bd1b38bbfcfb"
 }