Merge pull request #6 from natbienetre/pierre.peronnet/typing

Pierre.peronnet/typing

Author: holyhope

plugins/Makefile

@@ -6,7 +6,7 @@ lint: run-lint
 
 publish:
 	@git diff-index --quiet HEAD -- || (echo "Working directory is not clean" && exit 1)
-	$(MAKE) run-publish
+	YARN_RUN="npm publish --access public" $(MAKE) _run
 
 ci-test:
 	YARN_RUN="install --immutable" $(MAKE) _run
@@ -19,4 +19,4 @@ YARN_RUN ?= --version
 CACHE_FOLDER ?= $(CURDIR)/.yarn/cache
 
 _run:
-	$(foreach plugin,$(PLUGINS),cd $(plugin) && yarn --cache-folder=$(CACHE_FOLDER) $(YARN_RUN) && cd ..;)
+	$(foreach plugin,$(PLUGINS),cd $(plugin) && yarn $(YARN_RUN) && cd ..;)

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.0",
+  "version": "0.3.2",
   "license": "MPL-2.0",
   "funding": "https://github.com/sponsors/holyhope",
   "files": [

plugins/cloudflare-auto-session/src/args.ts

@@ -17,7 +17,7 @@ const Defaults = {
       allowed: false
     }
   },
-  formAsset: 'nbe-login',
+  formAsset: '/nbe-login/',
   isValid: (_: any): boolean => true
 }