feat(typing)

Signed-off-by: Pierre PÉRONNET <pierre.peronnet@datadoghq.com>

Author: holyhope

plugins/cloudflare-auto-session/functions/_middleware.ts

@@ -5,7 +5,7 @@ import { withDefaults } from '../src/args'
 const authenticatedQuery = 'authenticated'
 const allowedQuery = 'allowed'
 
-export const onRequestGet = async (context: EventPluginContext<Record<string, string | undefined>, any, any, PluginArgs>): Promise<Response> => {
+export const onRequestGet = (context: EventPluginContext<Record<string, string | undefined>, any, any, PluginArgs>): Response | Promise<Response> => {
   const { request, env, pluginArgs, next } = context
 
   // Get the arguments given to the Plugin by the developer
@@ -20,21 +20,19 @@ export const onRequestGet = async (context: EventPluginContext<Record<string, st
 
     console.debug('Proxy to login form', url.toString())
 
-    return await env.ASSETS.fetch(new Request(url, request))
+    return env.ASSETS.fetch(new Request(url, request))
   }
 
-  return await next()
+  return next()
 }
 
-export const onRequestPost = async ({ request, pluginArgs }: EventPluginContext<Record<string, string | undefined>, any, any, PluginArgs>): Promise<Response> => {
+export const onRequestPost = ({ request, pluginArgs }: EventPluginContext<Record<string, string | undefined>, any, any, PluginArgs>): Response | Promise<Response> => {
   // Get the arguments given to the Plugin by the developer
   const { cookieName, cookieSecret, login, isValid } = withDefaults(pluginArgs)
 
   const session = new Session(cookieName, cookieSecret, isValid)
 
   if (session.valid(request)) {
-    await request.body?.cancel()
-
     return new Response('Already logged in', {
       status: 302,
       headers: {
@@ -45,7 +43,7 @@ export const onRequestPost = async ({ request, pluginArgs }: EventPluginContext<
 
   const url = new URL(request.url)
 
-  return await request.formData()
+  return request.formData()
     .then(login)
     .then(({ authenticated, allowed, cookie }: SessionSpec): Response => {
       url.searchParams.set(authenticatedQuery, authenticated.toString())

plugins/cloudflare-auto-session/package.json

@@ -2,7 +2,7 @@
   "name": "@natbienetre/cloudflare-auto-session",
   "main": "dist/index.js",
   "types": "index.d.ts",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "license": "MPL-2.0",
   "funding": "https://github.com/sponsors/holyhope",
   "files": [

plugins/cloudflare-env-var-password/.yarn/cache/@natbienetre-cloudflare-auto-session-npm-0.3.1-b3110026b8-bd361c7097.zip

@@ -4,7 +4,7 @@ import type { PluginArgs } from '../src/types'
 import { Auth } from '../src/authenticator'
 import { withDefaults } from '../src/args'
 
-export const onRequest = (context: EventPluginContext<Record<string, string | undefined>, any, any, PluginArgs>): Response => {
+export const onRequest = (context: EventPluginContext<Record<string, string | undefined>, any, any, PluginArgs>): Response | Promise<Response> => {
   const { passwordEncodingMethod, passwordFieldName, getEnvVarName } = withDefaults(context.pluginArgs)
 
   console.log('onRequest', new URL(context.request.url).toString())

plugins/cloudflare-env-var-password/.yarn/cache/@natbienetre-cloudflare-auto-session-npm-0.3.2-20b677c5bc-4220a07c86.zip

@@ -2,7 +2,7 @@
   "name": "@natbienetre/cloudflare-env-var-password",
   "main": "dist/index.js",
   "types": "index.d.ts",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "license": "MPL-2.0",
   "funding": "https://github.com/sponsors/holyhope",
   "files": [
@@ -18,7 +18,7 @@
     "dev": "npm run build"
   },
   "dependencies": {
-    "@natbienetre/cloudflare-auto-session": "^0.3.1"
+    "@natbienetre/cloudflare-auto-session": "0.3.2"
   },
   "devDependencies": {
     "@cloudflare/workers-types": "^4.20230814.0",

plugins/cloudflare-env-var-password/.yarn/install-state.gz

@@ -43,11 +43,13 @@ export class Auth {
 
   async sessionData (formData: FormData): Promise<SessionSpec> {
     const expected = this.getExpectedPassword()
-
     const password = formData.get(this.passwordFieldName)
 
     if (password === null || password === undefined) {
-      throw new Error(`Password field '${this.passwordFieldName}' not found`)
+      return {
+        authenticated: false,
+        allowed: false
+      }
     }
 
     formData.delete(this.passwordFieldName)
@@ -63,13 +65,16 @@ export class Auth {
           return btoa(String.fromCharCode(...new Uint8Array(hash)))
         })
     }
-    return await hash.then((hash: string) => {
-      console.debug(`Password: ${hash} === ${password}`, hash === password)
 
-      if (hash !== expected) {
+    return await hash.then((hash: string): SessionSpec => {
+      const passwordMatch = hash === expected
+
+      console.debug(`Password: ${hash} === ${expected}`, passwordMatch)
+
+      if (!passwordMatch) {
         return {
-          authenticated: false,
-          allowed: false
+          authenticated: true,
+          allowed: passwordMatch
         }
       }
 
@@ -78,8 +83,8 @@ export class Auth {
         allowed: true,
         cookie: {
           data: {
-            username: formData.get('username'),
-            path: this.url.pathname
+            path: this.url.pathname,
+            ...formData.entries()
           },
           path: this.url.pathname
         }

plugins/cloudflare-env-var-password/functions/_middleware.ts

@@ -86,13 +86,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@natbienetre/cloudflare-auto-session@npm:^0.3.1":
-  version: 0.3.1
-  resolution: "@natbienetre/cloudflare-auto-session@npm:0.3.1"
+"@natbienetre/cloudflare-auto-session@npm:0.3.2":
+  version: 0.3.2
+  resolution: "@natbienetre/cloudflare-auto-session@npm:0.3.2"
   dependencies:
     cookie: ^0.5.0
     crypto-js: ^4.1.1
-  checksum: bd361c70974ef0e618ec6a2ea315a04b0bca0ca1996b9611ed626f17315de89650f10443848f88eca6e5eba9bf463054392215e63ce4104c2bbc79e9990da6c6
+  checksum: 4220a07c866a98d035f2f6f72eaf8d41da428689b3e1feaa80cc4f326f39d0209c1fd958832d8eeaf0038bf791a5977d984a49d022b704fbf70a6ee9b513573f
   languageName: node
   linkType: hard
 
@@ -101,7 +101,7 @@ __metadata:
   resolution: "@natbienetre/cloudflare-env-var-password@workspace:."
   dependencies:
     "@cloudflare/workers-types": ^4.20230814.0
-    "@natbienetre/cloudflare-auto-session": ^0.3.1
+    "@natbienetre/cloudflare-auto-session": 0.3.2
     "@typescript-eslint/eslint-plugin": ^5.62.0
     eslint: ^8.47.0
     eslint-config-standard-with-typescript: ^37.0.0