tsndr/cloudflare-worker-jwt
1
0
Fork 0
Code Activity

update dependencies and address type errors

Browse Source
This commit is contained in:
Toby
2025-03-14 14:31:50 +01:00
parent d3d7e10b60
commit 5e6af9cf25
5 changed files with 428 additions and 773 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1153
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

10
package.json
View File

@@ -30,10 +30,10 @@
},
"homepage": "https://github.com/tsndr/cloudflare-worker-jwt#readme",
"devDependencies": {
"@cloudflare/workers-types": "^4.20240925.0",
"@edge-runtime/vm": "^4.0.3",
"esbuild": "^0.24.0",
"typescript": "^5.6.2",
"vitest": "^2.1.1"
"@cloudflare/workers-types": "^4.20250313.0",
"@edge-runtime/vm": "^5.0.0",
"esbuild": "^0.25.1",
"typescript": "^5.8.2",
"vitest": "^3.0.8"
}
}

8
src/index.ts
View File

@@ -1,7 +1,7 @@
import {
textToArrayBuffer,
textToUint8Array,
arrayBufferToBase64Url,
base64UrlToArrayBuffer,
base64UrlToUint8Array,
textToBase64Url,
importKey,
decodePayload
@@ -169,7 +169,7 @@ export async function sign<Payload = {}, Header = {}>(payload: JwtPayload<Payloa
const partialToken = `${textToBase64Url(JSON.stringify({ ...options.header, alg: options.algorithm }))}.${textToBase64Url(JSON.stringify(payload))}`
const key = secret instanceof CryptoKey ? secret : await importKey(secret, algorithm, ["sign"])
const signature = await crypto.subtle.sign(algorithm, key, textToArrayBuffer(partialToken))
const signature = await crypto.subtle.sign(algorithm, key, textToUint8Array(partialToken))
return `${partialToken}.${arrayBufferToBase64Url(signature)}`
}
@@ -225,7 +225,7 @@ export async function verify<Payload = {}, Header = {}>(token: string, secret: s
const key = secret instanceof CryptoKey ? secret : await importKey(secret, algorithm, ["verify"])
if (!await crypto.subtle.verify(algorithm, key, base64UrlToArrayBuffer(tokenParts[2]), textToArrayBuffer(`${tokenParts[0]}.${tokenParts[1]}`)))
if (!await crypto.subtle.verify(algorithm, key, base64UrlToUint8Array(tokenParts[2]), textToUint8Array(`${tokenParts[0]}.${tokenParts[1]}`)))
throw new Error("INVALID_SIGNATURE")
return decodedToken

16
src/utils.ts
View File

@@ -20,11 +20,11 @@ export function arrayBufferToBase64String(arrayBuffer: ArrayBuffer): string {
return btoa(bytesToByteString(new Uint8Array(arrayBuffer)))
}
export function base64StringToArrayBuffer(b64str: string): ArrayBuffer {
return byteStringToBytes(atob(b64str)).buffer
export function base64StringToUint8Array(b64str: string): Uint8Array {
return byteStringToBytes(atob(b64str))
}
export function textToArrayBuffer(str: string): ArrayBuffer {
export function textToUint8Array(str: string): Uint8Array {
return byteStringToBytes(str)
}
@@ -36,8 +36,8 @@ export function arrayBufferToBase64Url(arrayBuffer: ArrayBuffer): string {
return arrayBufferToBase64String(arrayBuffer).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
}
export function base64UrlToArrayBuffer(b64url: string): ArrayBuffer {
return base64StringToArrayBuffer(b64url.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, ""))
export function base64UrlToUint8Array(b64url: string): Uint8Array {
return base64StringToUint8Array(b64url.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, ""))
}
export function textToBase64Url(str: string): string {
@@ -48,12 +48,12 @@ export function textToBase64Url(str: string): string {
return btoa(binaryStr).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
}
export function pemToBinary(pem: string): ArrayBuffer {
return base64StringToArrayBuffer(pem.replace(/-+(BEGIN|END).*/g, "").replace(/\s/g, ""))
export function pemToBinary(pem: string): Uint8Array {
return base64StringToUint8Array(pem.replace(/-+(BEGIN|END).*/g, "").replace(/\s/g, ""))
}
export async function importTextSecret(key: string, algorithm: SubtleCryptoImportKeyAlgorithm, keyUsages: KeyUsages[]): Promise<CryptoKey> {
return await crypto.subtle.importKey("raw", textToArrayBuffer(key), algorithm, true, keyUsages)
return await crypto.subtle.importKey("raw", textToUint8Array(key), algorithm, true, keyUsages)
}
export async function importJwk(key: JsonWebKey, algorithm: SubtleCryptoImportKeyAlgorithm, keyUsages: KeyUsages[]): Promise<CryptoKey> {

14
tests/utils.spec.ts
View File

@@ -3,11 +3,11 @@ import {
bytesToByteString,
byteStringToBytes,
arrayBufferToBase64String,
base64StringToArrayBuffer,
textToArrayBuffer,
base64StringToUint8Array,
textToUint8Array,
arrayBufferToText,
arrayBufferToBase64Url,
base64UrlToArrayBuffer,
base64UrlToUint8Array,
textToBase64Url,
pemToBinary,
importTextSecret
@@ -18,7 +18,7 @@ describe("Converters", () => {
const testByteArray = [ 99, 108, 111, 117, 100, 102, 108, 97, 114, 101, 45, 119, 111, 114, 107, 101, 114, 45, 106, 119, 116 ]
const testUint8Array = new Uint8Array(testByteArray)
const testBase64String = "Y2xvdWRmbGFyZS13b3JrZXItand0"
const testArrayBuffer = testUint8Array.buffer
const testArrayBuffer = testUint8Array
test("bytesToByteString", () => {
expect(bytesToByteString(testUint8Array)).toStrictEqual(testString)
@@ -33,11 +33,11 @@ describe("Converters", () => {
})
test("base64StringToArrayBuffer", () => {
expect(base64StringToArrayBuffer(testBase64String)).toStrictEqual(testArrayBuffer)
expect(base64StringToUint8Array(testBase64String)).toStrictEqual(testArrayBuffer)
})
test("textToArrayBuffer", () => {
expect(textToArrayBuffer(testString)).toStrictEqual(testUint8Array)
expect(textToUint8Array(testString)).toStrictEqual(testUint8Array)
})
test("arrayBufferToText", () => {
@@ -49,7 +49,7 @@ describe("Converters", () => {
})
test("base64UrlToArrayBuffer", () => {
expect(base64UrlToArrayBuffer(testBase64String)).toStrictEqual(testArrayBuffer)
expect(base64UrlToUint8Array(testBase64String)).toStrictEqual(testArrayBuffer)
})
test("textToBase64Url", () => {