feat: CORS setting, read origin from environment variables (#38)

- Add corsMiddlewareHandler to get origins info from the environment variables. - Remove the [vars] section in .toml - Add .node-version to specific node-version for CI/CD and engine inside package.json.
ZL-Asica · Nov 4, 2024 · 41ba4c8 · 41ba4c8
1 parent 939feac
commit 41ba4c8
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 12 deletions.
diff --git a/.node-version b/.node-version
@@ -0,0 +1 @@
+22.11.0
diff --git a/README.md b/README.md
@@ -6,8 +6,9 @@
 
 [![Test by Github Action][github-test-badge]][github-test-link]
 [![GitHub License][license-badge]][license-link]
-[![Yarn Version][yarn-badge]][yarn-link] |
 [![Hono][hono-badge]][hono-link]
+[![Node js][node-badge]][node-link]
+[![Yarn Version][yarn-badge]][yarn-link] |
 [![Cloudflare][cloudflare-badge]][cloudflare-link]
 [![Eslint][eslint-badge]][eslint-link]
 [![Prettier][prettier-badge]][prettier-link]
@@ -117,8 +118,9 @@
 
 [github-test-badge]: https://img.shields.io/github/actions/workflow/status/ZL-Asica/KumoAuth/auto-test.yml?logo=github&label=Test
 [license-badge]: https://img.shields.io/github/license/ZL-Asica/KumoAuth
+[hono-badge]: https://img.shields.io/github/package-json/dependency-version/ZL-Asica/KumoAuth/hono?label=Hono&color=E36002&logo=hono&logoColor=white&labelColor=E36002
+[node-badge]: https://img.shields.io/github/package-json/engines/node/ZL-Asica/KumoAuth?label=&logo=node.js&color=339933&logoColor=white&labelColor=339933
 [yarn-badge]: https://img.shields.io/github/package-json/packageManager/ZL-Asica/KumoAuth?label=&logo=yarn&logoColor=fff
-[hono-badge]: https://img.shields.io/badge/Hono-E36002?logo=hono&logoColor=fff
 [cloudflare-badge]: https://img.shields.io/badge/Cloudflare-F38020?logo=Cloudflare&logoColor=white
 [eslint-badge]: https://img.shields.io/badge/eslint-4B32C3?logo=eslint&logoColor=white
 [prettier-badge]: https://img.shields.io/badge/Prettier-F7B93E?logo=Prettier&logoColor=white
@@ -127,8 +129,9 @@
 
 [github-test-link]: https://github.com/ZL-Asica/KumoAuth/actions/workflows/auto-test.yml
 [license-link]: https://github.com/ZL-Asica/KumoAuth?tab=GPL-3.0-1-ov-file#readme
-[yarn-link]: https://yarnpkg.com/
 [hono-link]: https://hono.dev/
+[node-link]: https://nodejs.org/
+[yarn-link]: https://yarnpkg.com/
 [cloudflare-link]: https://www.cloudflare.com/
 [eslint-link]: https://eslint.org/
 [prettier-link]: https://prettier.io/
diff --git a/README_EN.md b/README_EN.md
@@ -6,8 +6,9 @@
 
 [![Test by Github Action][github-test-badge]][github-test-link]
 [![GitHub License][license-badge]][license-link]
-[![Yarn Version][yarn-badge]][yarn-link] |
 [![Hono][hono-badge]][hono-link]
+[![Node js][node-badge]][node-link]
+[![Yarn Version][yarn-badge]][yarn-link] |
 [![Cloudflare][cloudflare-badge]][cloudflare-link]
 [![Eslint][eslint-badge]][eslint-link]
 [![Prettier][prettier-badge]][prettier-link]
@@ -113,12 +114,13 @@ Designed for small applications and personal projects, this system provides a se
 
 Thank you for your interest and support! Feel free to suggest features or contribute to help us improve this project 🙌
 
-<!-- Badge Links -->
+!-- Badge Links -->
 
 [github-test-badge]: https://img.shields.io/github/actions/workflow/status/ZL-Asica/KumoAuth/auto-test.yml?logo=github&label=Test
 [license-badge]: https://img.shields.io/github/license/ZL-Asica/KumoAuth
+[hono-badge]: https://img.shields.io/github/package-json/dependency-version/ZL-Asica/KumoAuth/hono?label=Hono&color=E36002&logo=hono&logoColor=white&labelColor=E36002
+[node-badge]: https://img.shields.io/github/package-json/engines/node/ZL-Asica/KumoAuth?label=&logo=node.js&color=339933&logoColor=white&labelColor=339933
 [yarn-badge]: https://img.shields.io/github/package-json/packageManager/ZL-Asica/KumoAuth?label=&logo=yarn&logoColor=fff
-[hono-badge]: https://img.shields.io/badge/Hono-E36002?logo=hono&logoColor=fff
 [cloudflare-badge]: https://img.shields.io/badge/Cloudflare-F38020?logo=Cloudflare&logoColor=white
 [eslint-badge]: https://img.shields.io/badge/eslint-4B32C3?logo=eslint&logoColor=white
 [prettier-badge]: https://img.shields.io/badge/Prettier-F7B93E?logo=Prettier&logoColor=white
@@ -127,8 +129,9 @@ Thank you for your interest and support! Feel free to suggest features or contri
 
 [github-test-link]: https://github.com/ZL-Asica/KumoAuth/actions/workflows/auto-test.yml
 [license-link]: https://github.com/ZL-Asica/KumoAuth?tab=GPL-3.0-1-ov-file#readme
-[yarn-link]: https://yarnpkg.com/
 [hono-link]: https://hono.dev/
+[node-link]: https://nodejs.org/
+[yarn-link]: https://yarnpkg.com/
 [cloudflare-link]: https://www.cloudflare.com/
 [eslint-link]: https://eslint.org/
 [prettier-link]: https://prettier.io/
diff --git a/example.dev.vars b/example.dev.vars
@@ -5,3 +5,6 @@ JWT_EXPIRE_IN=30
 
 # Cloudflare D1 Database Configuration
 D1_DATABASE_ID=your-database-id
+
+# CORS settings (comma separate if more than one)
+CORS_ORIGIN=localhost,https://zla.app
diff --git a/package.json b/package.json
@@ -54,5 +54,8 @@
     "vitest": "^2.1.4",
     "wrangler": "^3.84.1"
   },
+  "engines": {
+    "node": ">=20.11"
+  },
   "packageManager": "yarn@4.5.1"
 }
diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1,5 @@
 import auth from '@/auth'
+import { corsMiddlewareHandler } from '@/middleware/cors'
 import { notFound } from '@/middleware/not-found'
 import { onError } from '@/middleware/on-error'
 import { workerLogger } from '@/middleware/worker-logger'
@@ -9,9 +10,10 @@ import type { Context } from 'hono'
 type Bindings = {
   JWT_SECRET: string
   JWT_EXPIRE_IN: string
+  CORS_ORIGIN: string
 }
 
-const app = new OpenAPIHono<{ Bindings: Bindings }>().route('/auth', auth)
+const app = new OpenAPIHono<{ Bindings: Bindings }>()
 
 // Add worker logger middleware to all routes
 app.use(workerLogger)
@@ -27,6 +29,12 @@ app.notFound(notFound)
 // On error
 app.onError(onError)
 
+// CORS middleware
+app.use(corsMiddlewareHandler)
+
+// Auth routes
+app.route('/auth', auth)
+
 // Set OpenAPI documentation
 app.doc31('/doc', {
   openapi: '3.1.0',

diff --git a/src/middleware/cors.ts b/src/middleware/cors.ts
@@ -0,0 +1,12 @@
+import type { Context, MiddlewareHandler } from 'hono'
+import { cors } from 'hono/cors'
+
+export const corsMiddlewareHandler: MiddlewareHandler = async (
+  c: Context,
+  next
+) => {
+  const corsMiddlewareHandler = cors({
+    origin: c.env.CORS_ORIGIN?.split(',').map((s: string) => s.trim()) || '*',
+  })
+  return corsMiddlewareHandler(c, next)
+}
diff --git a/wrangler.toml b/wrangler.toml
@@ -4,10 +4,6 @@ compatibility_date = "2024-10-22"
 
 compatibility_flags = [ "nodejs_compat" ]
 
-[vars]
-JWT_SECRET = "${JWT_SECRET}"
-JWT_EXPIRE_IN = "${JWT_EXPIRE_IN}"
-
 # [[kv_namespaces]]
 # binding = "MY_KV_NAMESPACE"
 # id = "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"