add algorithm to header and check during verification

This reverts commit 4ceac0270f.

.gitignore

@@ -145,4 +145,6 @@ dist
 
 # Custom
 /index.js
-/index.d.ts
+/index.d.ts
+/utils.js
+/utils.d.ts

.npmignore

@@ -3,7 +3,9 @@
 .gitignore
 .nvmrc
 coverage/
-jest.config.ts
+vite.config.ts
 src/
 tests/
-tsconfig.json
+tsconfig.json
+utils.*
+*.tgz

jest.config.ts

@@ -1,9 +0,0 @@
-import type { Config } from 'jest'
-
-const config: Config = {
-	preset: 'ts-jest',
-	testEnvironment: 'node',
-	verbose: true
-}
-
-export default config

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsndr/cloudflare-worker-jwt",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "description": "A lightweight JWT implementation with ZERO dependencies for Cloudflare Worker",
   "type": "module",
   "exports": "./index.js",
@@ -9,8 +9,8 @@
     "node": ">=18"
   },
   "scripts": {
-    "build": "esbuild src/index.ts --bundle --outfile=index.js && tsc --emitDeclarationOnly",
-    "test": "jest"
+    "build": "tsc & esbuild --bundle --target=esnext --platform=neutral --outfile=index.js src/index.ts & wait",
+    "test": "vitest"
   },
   "repository": {
     "type": "git",
@@ -30,14 +30,11 @@
   },
   "homepage": "https://github.com/tsndr/cloudflare-worker-jwt#readme",
   "devDependencies": {
-    "@cloudflare/workers-types": "^4.20240129.0",
-    "@jest/globals": "^29.7.0",
-    "@types/jest": "^29.5.11",
-    "@types/node": "^20.11.14",
-    "esbuild": "^0.20.0",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.1.2",
+    "@cloudflare/workers-types": "^4.20240208.0",
+    "@edge-runtime/vm": "^3.2.0",
+    "@types/node": "^20.11.19",
     "ts-node": "^10.9.2",
-    "typescript": "^5.3.3"
+    "typescript": "^5.3.3",
+    "vitest": "^1.3.1"
   }
 }

src/index.ts

@@ -1,10 +1,10 @@
 import {
-	textToArrayBuffer,
-	arrayBufferToBase64Url,
-	base64UrlToArrayBuffer,
-	textToBase64Url,
-	importKey,
-	decodePayload
+    textToArrayBuffer,
+    arrayBufferToBase64Url,
+    base64UrlToArrayBuffer,
+    textToBase64Url,
+    importKey,
+    decodePayload
 } from "./utils"
 
 if (typeof crypto === 'undefined' || !crypto.subtle)
@@ -34,6 +34,13 @@ export type JwtHeader<T = {}> = {
      * @default "JWT"
      */
     typ?: string
+
+    /**
+     * Algorithm (default: `"HS256"`)
+     *
+     * @default "HS256"
+     */
+    alg?: JwtAlgorithm
 } & T
 
 /**
@@ -196,7 +203,13 @@ export async function verify(token: string, secret: string | JsonWebKey | Crypto
     if (!algorithm)
         throw new Error('algorithm not found')
 
-    const { payload } = decode(token)
+    const { header, payload } = decode(token)
+
+    if (header?.alg !== options.algorithm) {
+        if (options.throwError)
+            throw new Error('ALG_MISMATCH')
+        return false
+    }
 
     try {
         if (!payload)
@@ -214,7 +227,6 @@ export async function verify(token: string, secret: string | JsonWebKey | Crypto
     } catch(err) {
         if (options.throwError)
             throw err
-
         return false
     }
 }

src/test.ts

@@ -0,0 +1,3 @@
+import { sign } from './index'
+
+console.log(await sign())

tests/index.spec.ts

@@ -1,7 +1,4 @@
-import crypto from 'node:crypto'
-Object.defineProperty(global, 'crypto', { value: { subtle: crypto.webcrypto.subtle }})
-
-import { describe, expect, test } from '@jest/globals'
+import { describe, expect, test } from 'vitest'
 import jwt, { JwtAlgorithm } from '../src/index'
 
 type Dataset = {

tests/utils.spec.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from '@jest/globals'
+import { describe, expect, test } from 'vitest'
 import {
 	bytesToByteString,
 	byteStringToBytes,

tsconfig.json

@@ -5,6 +5,7 @@
         "target": "esnext",
         "lib": ["esnext"],
         "declaration": true,
+        "emitDeclarationOnly": true,
         "strict": true,
         "noImplicitAny": true,
         "strictNullChecks": true,

vite.config.ts

@@ -0,0 +1,9 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+	test: {
+		environment: 'edge-runtime',
+		watch: false,
+		reporters: ['verbose']
+	}
+})