diff --git a/packages/workers/groups/package.json b/packages/workers/groups/package.json index 15e47934c2da..e21b3d0710ab 100644 --- a/packages/workers/groups/package.json +++ b/packages/workers/groups/package.json @@ -16,7 +16,7 @@ "@hey/data": "workspace:*", "@hey/lib": "workspace:*", "@hey/supabase": "workspace:*", - "@tsndr/cloudflare-worker-jwt": "^2.2.5", + "@tsndr/cloudflare-worker-jwt": "^2.2.6", "itty-router": "^4.0.23", "zod": "^3.22.4" }, diff --git a/packages/workers/live/package.json b/packages/workers/live/package.json index 9ed4c6111c8d..fdfc1113cf7d 100644 --- a/packages/workers/live/package.json +++ b/packages/workers/live/package.json @@ -16,7 +16,7 @@ "dependencies": { "@hey/data": "workspace:*", "@hey/lib": "workspace:*", - "@tsndr/cloudflare-worker-jwt": "^2.2.5", + "@tsndr/cloudflare-worker-jwt": "^2.2.6", "itty-router": "^4.0.23", "zod": "^3.22.4" }, diff --git a/packages/workers/preferences/package.json b/packages/workers/preferences/package.json index ead742136ecd..d1ff32d6b404 100644 --- a/packages/workers/preferences/package.json +++ b/packages/workers/preferences/package.json @@ -16,7 +16,7 @@ "@hey/data": "workspace:*", "@hey/lib": "workspace:*", "@hey/supabase": "workspace:*", - "@tsndr/cloudflare-worker-jwt": "^2.2.5", + "@tsndr/cloudflare-worker-jwt": "^2.2.6", "itty-router": "^4.0.23", "zod": "^3.22.4" }, diff --git a/packages/workers/preferences/src/helpers/validateIsGardener.ts b/packages/workers/preferences/src/helpers/validateIsGardener.ts index 0cb6999ecd5e..20d09f5bdb91 100644 --- a/packages/workers/preferences/src/helpers/validateIsGardener.ts +++ b/packages/workers/preferences/src/helpers/validateIsGardener.ts @@ -1,6 +1,6 @@ -import parseJwt from '@hey/lib/parseJwt'; import response from '@hey/lib/response'; import createSupabaseClient from '@hey/supabase/createSupabaseClient'; +import jwt from '@tsndr/cloudflare-worker-jwt'; import { GARDENER_FEATURE_ID } from '../constants'; import type { WorkerRequest } from '../types'; @@ -17,8 +17,7 @@ const validateIsGardener = async (request: WorkerRequest) => { return response({ success: false, error: 'No proper headers provided!' }); } - const payload = parseJwt(accessToken); - + const { payload } = jwt.decode(accessToken); const client = createSupabaseClient(request.env.SUPABASE_KEY); const { data, error } = await client diff --git a/packages/workers/preferences/src/helpers/validateIsStaff.ts b/packages/workers/preferences/src/helpers/validateIsStaff.ts index 776370e461da..0d4e8109a0c5 100644 --- a/packages/workers/preferences/src/helpers/validateIsStaff.ts +++ b/packages/workers/preferences/src/helpers/validateIsStaff.ts @@ -1,6 +1,6 @@ -import parseJwt from '@hey/lib/parseJwt'; import response from '@hey/lib/response'; import createSupabaseClient from '@hey/supabase/createSupabaseClient'; +import jwt from '@tsndr/cloudflare-worker-jwt'; import { STAFF_FEATURE_ID } from '../constants'; import type { WorkerRequest } from '../types'; @@ -17,8 +17,7 @@ const validateIsStaff = async (request: WorkerRequest) => { return response({ success: false, error: 'No proper headers provided!' }); } - const payload = parseJwt(accessToken); - + const { payload } = jwt.decode(accessToken); const client = createSupabaseClient(request.env.SUPABASE_KEY); const { data, error } = await client diff --git a/packages/workers/staff-picks/package.json b/packages/workers/staff-picks/package.json index ca6010741db7..6bd2eb12a7c2 100644 --- a/packages/workers/staff-picks/package.json +++ b/packages/workers/staff-picks/package.json @@ -16,7 +16,7 @@ "@hey/data": "workspace:*", "@hey/lib": "workspace:*", "@hey/supabase": "workspace:*", - "@tsndr/cloudflare-worker-jwt": "^2.2.5", + "@tsndr/cloudflare-worker-jwt": "^2.2.6", "itty-router": "^4.0.23", "zod": "^3.22.4" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e86824025706..dc4201347188 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -658,8 +658,8 @@ importers: specifier: workspace:* version: link:../../supabase '@tsndr/cloudflare-worker-jwt': - specifier: ^2.2.5 - version: 2.2.5 + specifier: ^2.2.6 + version: 2.2.6 itty-router: specifier: ^4.0.23 version: 4.0.23 @@ -769,8 +769,8 @@ importers: specifier: workspace:* version: link:../../lib '@tsndr/cloudflare-worker-jwt': - specifier: ^2.2.5 - version: 2.2.5 + specifier: ^2.2.6 + version: 2.2.6 itty-router: specifier: ^4.0.23 version: 4.0.23 @@ -905,8 +905,8 @@ importers: specifier: workspace:* version: link:../../supabase '@tsndr/cloudflare-worker-jwt': - specifier: ^2.2.5 - version: 2.2.5 + specifier: ^2.2.6 + version: 2.2.6 itty-router: specifier: ^4.0.23 version: 4.0.23 @@ -1019,8 +1019,8 @@ importers: specifier: workspace:* version: link:../../supabase '@tsndr/cloudflare-worker-jwt': - specifier: ^2.2.5 - version: 2.2.5 + specifier: ^2.2.6 + version: 2.2.6 itty-router: specifier: ^4.0.23 version: 4.0.23 @@ -4555,6 +4555,7 @@ packages: dependencies: is-glob: 4.0.3 micromatch: 4.0.5 + napi-wasm: 1.1.0 dev: false bundledDependencies: - napi-wasm @@ -6149,8 +6150,8 @@ packages: tippy.js: 6.3.7 dev: false - /@tsndr/cloudflare-worker-jwt@2.2.5: - resolution: {integrity: sha512-zK177o49c09sa8yEp2/OPfyh+I/SHY/SZ9kxYQC33F8PotrrZgJjY4X3yqu4BFX4lC7RYI1tSXBDQP9Yo9p6/w==} + /@tsndr/cloudflare-worker-jwt@2.2.6: + resolution: {integrity: sha512-HzhhQ5WCC1lPc2USiqt7noBIuIMX0xgwbSwrduqEhuZCUoEY/+9IAY1IMk3f3LFP8d9XCnz6w7DIxW111C4FqQ==} dev: false /@types/chai-subset@1.3.5: @@ -11116,6 +11117,10 @@ packages: engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1} hasBin: true + /napi-wasm@1.1.0: + resolution: {integrity: sha512-lHwIAJbmLSjF9VDRm9GoVOy9AGp3aIvkjv+Kvz9h16QR3uSVYH78PNQUnT2U4X53mhlnV2M7wrhibQ3GHicDmg==} + dev: false + /natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} dev: true