2.2.9

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@tsndr/cloudflare-worker-jwt",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@tsndr/cloudflare-worker-jwt",
-      "version": "2.2.8",
+      "version": "2.2.9",
       "license": "MIT",
       "devDependencies": {
         "@cloudflare/workers-types": "^4.20231025.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsndr/cloudflare-worker-jwt",
-  "version": "2.2.8",
+  "version": "2.2.9",
   "description": "A lightweight JWT implementation with ZERO dependencies for Cloudflare Worker",
   "main": "index.js",
   "types": "index.d.ts",

src/index.ts

@@ -139,28 +139,20 @@ function byteStringToBytes(byteStr: string): Uint8Array {
 }
 
 function arrayBufferToBase64String(arrayBuffer: ArrayBuffer): string {
-    const byteArray = new Uint8Array(arrayBuffer)
+    return btoa(bytesToByteString(new Uint8Array(arrayBuffer)))
-    const byteStr = bytesToByteString(byteArray)
-    return btoa(byteStr)
 }
 
 function base64StringToArrayBuffer(b64str: string): ArrayBuffer {
-    const byteStr = atob(b64str)
+    return byteStringToBytes(atob(b64str)).buffer
-    const bytes = byteStringToBytes(byteStr)
-    return bytes.buffer
 }
 
 function textToArrayBuffer(str: string): ArrayBuffer {
-    const buf = decodeURI(encodeURIComponent(str)) // 2 bytes for each char
+    return byteStringToBytes(decodeURI(encodeURIComponent(str)))
-    const bytes = byteStringToBytes(buf)
-    return bytes
 }
 
 // @ts-ignore
 function arrayBufferToText(arrayBuffer: ArrayBuffer): string {
-    const byteArray = new Uint8Array(arrayBuffer)
+    return bytesToByteString(new Uint8Array(arrayBuffer))
-    const byteStr = bytesToByteString(byteArray)
-    return byteStr
 }
 
 function arrayBufferToBase64Url(arrayBuffer: ArrayBuffer): string {
@@ -212,23 +204,8 @@ async function importKey(key: string | JsonWebKey, algorithm: SubtleCryptoImport
 }
 
 function decodePayload(raw: string): JwtHeader | JwtPayload | null {
-    switch (raw.length % 4) {
-        case 0:
-            break
-        case 1:
-            raw += '==='
-            break
-        case 2:
-            raw += '=='
-            break
-        case 3:
-            raw += '='
-            break
-        default:
-            throw new Error('Invalid base64url string!')
-    }
-
     try {
+        raw += '='.repeat(4-(raw.length % 4))
         return JSON.parse(atob(raw))
     } catch {
         return null