1
0

4 Commits

Author SHA1 Message Date
7faffa3dd9 3.3.0 2025-07-24 21:57:37 +02:00
a08adf3c03 add basic helper function 2025-07-24 21:56:26 +02:00
2e594d09f5 update bearer regex 2025-07-24 21:56:11 +02:00
d1c84cf6f6 3.2.10 2024-10-26 23:08:28 +02:00
4 changed files with 21 additions and 4 deletions

4
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "3.2.9", "version": "3.3.0",
"lockfileVersion": 3, "lockfileVersion": 3,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "3.2.9", "version": "3.3.0",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@cloudflare/workers-types": "^4.20241022.0", "@cloudflare/workers-types": "^4.20241022.0",

View File

@@ -1,6 +1,6 @@
{ {
"name": "@tsndr/cloudflare-worker-router", "name": "@tsndr/cloudflare-worker-router",
"version": "3.2.9", "version": "3.3.0",
"description": "", "description": "",
"type": "module", "type": "module",
"exports": "./index.js", "exports": "./index.js",

View File

@@ -52,6 +52,7 @@ export type RouterRequest<ReqExt> = ReqExt & {
formData(): Promise<FormData> formData(): Promise<FormData>
blob(): Promise<Blob> blob(): Promise<Blob>
bearer(): string | undefined bearer(): string | undefined
basic(): [string, string]
cf?: IncomingRequestCfProperties cf?: IncomingRequestCfProperties
} }
@@ -395,7 +396,8 @@ export class Router<Env = any, CtxExt = {}, ReqExt = {}> {
json: async <T>(): Promise<T> => buffer.json ? buffer.json : buffer.json = await request.clone().json<T>(), json: async <T>(): Promise<T> => buffer.json ? buffer.json : buffer.json = await request.clone().json<T>(),
formData: async (): Promise<FormData> => buffer.formData ? buffer.formData : buffer.formData = await request.clone().formData(), formData: async (): Promise<FormData> => buffer.formData ? buffer.formData : buffer.formData = await request.clone().formData(),
blob: async (): Promise<Blob> => buffer.blob ? buffer.blob : buffer.blob = await request.clone().blob(), blob: async (): Promise<Blob> => buffer.blob ? buffer.blob : buffer.blob = await request.clone().blob(),
bearer: () => request.headers.get('Authorization')?.replace(/^(B|b)earer /, '').trim() bearer: () => request.headers.get('Authorization')?.replace(/^[Bb]earer\s/, '').trim(),
basic: () => (atob(request.headers.get('Authorization')?.replace(/^[Bb]asic\s/, '').trim() ?? '') || undefined)?.split(':')
} as RouterRequest<ReqExt> } as RouterRequest<ReqExt>
if (this.corsEnabled && req.method === 'OPTIONS') { if (this.corsEnabled && req.method === 'OPTIONS') {

View File

@@ -261,6 +261,21 @@ describe('Router', () => {
expect(await response.text()).toBe(testToken) expect(await response.text()).toBe(testToken)
}) })
test('basic', async () => {
const router = new Router()
const testCredentials = ['user', 'password']
const testBasicAuth = btoa(testCredentials.join(':'))
const testRequest = new Request('https://example.com/', { headers: { 'Authorization': `Basic ${testBasicAuth}` }})
router.get('/', ({ req }) => Response.json(req.basic()))
const response = await router.handle(testRequest, {})
expect(response.status).toEqual(200)
expect(await response.json()).toMatchObject(testCredentials)
})
}) })
describe('Middleware', () => { describe('Middleware', () => {