update dependencies and address type errors
This commit is contained in:
1153
package-lock.json
generated
1153
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
10
package.json
10
package.json
@@ -30,10 +30,10 @@
|
|||||||
},
|
},
|
||||||
"homepage": "https://github.com/tsndr/cloudflare-worker-jwt#readme",
|
"homepage": "https://github.com/tsndr/cloudflare-worker-jwt#readme",
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@cloudflare/workers-types": "^4.20240925.0",
|
"@cloudflare/workers-types": "^4.20250313.0",
|
||||||
"@edge-runtime/vm": "^4.0.3",
|
"@edge-runtime/vm": "^5.0.0",
|
||||||
"esbuild": "^0.24.0",
|
"esbuild": "^0.25.1",
|
||||||
"typescript": "^5.6.2",
|
"typescript": "^5.8.2",
|
||||||
"vitest": "^2.1.1"
|
"vitest": "^3.0.8"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
import {
|
import {
|
||||||
textToArrayBuffer,
|
textToUint8Array,
|
||||||
arrayBufferToBase64Url,
|
arrayBufferToBase64Url,
|
||||||
base64UrlToArrayBuffer,
|
base64UrlToUint8Array,
|
||||||
textToBase64Url,
|
textToBase64Url,
|
||||||
importKey,
|
importKey,
|
||||||
decodePayload
|
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 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 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)}`
|
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"])
|
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")
|
throw new Error("INVALID_SIGNATURE")
|
||||||
|
|
||||||
return decodedToken
|
return decodedToken
|
||||||
|
|||||||
16
src/utils.ts
16
src/utils.ts
@@ -20,11 +20,11 @@ export function arrayBufferToBase64String(arrayBuffer: ArrayBuffer): string {
|
|||||||
return btoa(bytesToByteString(new Uint8Array(arrayBuffer)))
|
return btoa(bytesToByteString(new Uint8Array(arrayBuffer)))
|
||||||
}
|
}
|
||||||
|
|
||||||
export function base64StringToArrayBuffer(b64str: string): ArrayBuffer {
|
export function base64StringToUint8Array(b64str: string): Uint8Array {
|
||||||
return byteStringToBytes(atob(b64str)).buffer
|
return byteStringToBytes(atob(b64str))
|
||||||
}
|
}
|
||||||
|
|
||||||
export function textToArrayBuffer(str: string): ArrayBuffer {
|
export function textToUint8Array(str: string): Uint8Array {
|
||||||
return byteStringToBytes(str)
|
return byteStringToBytes(str)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -36,8 +36,8 @@ export function arrayBufferToBase64Url(arrayBuffer: ArrayBuffer): string {
|
|||||||
return arrayBufferToBase64String(arrayBuffer).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
|
return arrayBufferToBase64String(arrayBuffer).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
|
||||||
}
|
}
|
||||||
|
|
||||||
export function base64UrlToArrayBuffer(b64url: string): ArrayBuffer {
|
export function base64UrlToUint8Array(b64url: string): Uint8Array {
|
||||||
return base64StringToArrayBuffer(b64url.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, ""))
|
return base64StringToUint8Array(b64url.replace(/-/g, "+").replace(/_/g, "/").replace(/\s/g, ""))
|
||||||
}
|
}
|
||||||
|
|
||||||
export function textToBase64Url(str: string): string {
|
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, "_")
|
return btoa(binaryStr).replace(/=/g, "").replace(/\+/g, "-").replace(/\//g, "_")
|
||||||
}
|
}
|
||||||
|
|
||||||
export function pemToBinary(pem: string): ArrayBuffer {
|
export function pemToBinary(pem: string): Uint8Array {
|
||||||
return base64StringToArrayBuffer(pem.replace(/-+(BEGIN|END).*/g, "").replace(/\s/g, ""))
|
return base64StringToUint8Array(pem.replace(/-+(BEGIN|END).*/g, "").replace(/\s/g, ""))
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function importTextSecret(key: string, algorithm: SubtleCryptoImportKeyAlgorithm, keyUsages: KeyUsages[]): Promise<CryptoKey> {
|
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> {
|
export async function importJwk(key: JsonWebKey, algorithm: SubtleCryptoImportKeyAlgorithm, keyUsages: KeyUsages[]): Promise<CryptoKey> {
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ import {
|
|||||||
bytesToByteString,
|
bytesToByteString,
|
||||||
byteStringToBytes,
|
byteStringToBytes,
|
||||||
arrayBufferToBase64String,
|
arrayBufferToBase64String,
|
||||||
base64StringToArrayBuffer,
|
base64StringToUint8Array,
|
||||||
textToArrayBuffer,
|
textToUint8Array,
|
||||||
arrayBufferToText,
|
arrayBufferToText,
|
||||||
arrayBufferToBase64Url,
|
arrayBufferToBase64Url,
|
||||||
base64UrlToArrayBuffer,
|
base64UrlToUint8Array,
|
||||||
textToBase64Url,
|
textToBase64Url,
|
||||||
pemToBinary,
|
pemToBinary,
|
||||||
importTextSecret
|
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 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 testUint8Array = new Uint8Array(testByteArray)
|
||||||
const testBase64String = "Y2xvdWRmbGFyZS13b3JrZXItand0"
|
const testBase64String = "Y2xvdWRmbGFyZS13b3JrZXItand0"
|
||||||
const testArrayBuffer = testUint8Array.buffer
|
const testArrayBuffer = testUint8Array
|
||||||
|
|
||||||
test("bytesToByteString", () => {
|
test("bytesToByteString", () => {
|
||||||
expect(bytesToByteString(testUint8Array)).toStrictEqual(testString)
|
expect(bytesToByteString(testUint8Array)).toStrictEqual(testString)
|
||||||
@@ -33,11 +33,11 @@ describe("Converters", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("base64StringToArrayBuffer", () => {
|
test("base64StringToArrayBuffer", () => {
|
||||||
expect(base64StringToArrayBuffer(testBase64String)).toStrictEqual(testArrayBuffer)
|
expect(base64StringToUint8Array(testBase64String)).toStrictEqual(testArrayBuffer)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("textToArrayBuffer", () => {
|
test("textToArrayBuffer", () => {
|
||||||
expect(textToArrayBuffer(testString)).toStrictEqual(testUint8Array)
|
expect(textToUint8Array(testString)).toStrictEqual(testUint8Array)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("arrayBufferToText", () => {
|
test("arrayBufferToText", () => {
|
||||||
@@ -49,7 +49,7 @@ describe("Converters", () => {
|
|||||||
})
|
})
|
||||||
|
|
||||||
test("base64UrlToArrayBuffer", () => {
|
test("base64UrlToArrayBuffer", () => {
|
||||||
expect(base64UrlToArrayBuffer(testBase64String)).toStrictEqual(testArrayBuffer)
|
expect(base64UrlToUint8Array(testBase64String)).toStrictEqual(testArrayBuffer)
|
||||||
})
|
})
|
||||||
|
|
||||||
test("textToBase64Url", () => {
|
test("textToBase64Url", () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user