Merge pull request #3 from markusahlstrand/ma/demo-project

demo project
markusahlstrand · Nov 20, 2024 · b5c5ce8 · b5c5ce8
2 parents 0540c12 + a000563
commit b5c5ce8
Show file tree

Hide file tree

Showing 25 changed files with 543 additions and 179 deletions.
diff --git a/apps/demo/CHANGELOG.md b/apps/demo/CHANGELOG.md
@@ -1,5 +1,26 @@
 # @authhero/demo
 
+## 0.1.1
+
+### Patch Changes
+
+- remove the iife build files
+- Updated dependencies
+  - [email protected]
+  - @authhero/kysely-adapter@0.18.1
+
+## 0.1.0
+
+### Minor Changes
+
+- Get the demo project rendering
+
+### Patch Changes
+
+- Updated dependencies
+  - [email protected]
+  - @authhero/kysely-adapter@0.18.0
+
 ## 0.0.36
 
 ### Patch Changes

diff --git a/apps/demo/db.sqlite b/apps/demo/db.sqlite
diff --git a/apps/demo/package.json b/apps/demo/package.json
@@ -1,9 +1,17 @@
 {
   "name": "@authhero/demo",
   "private": true,
-  "version": "0.0.36",
+  "version": "0.1.1",
   "scripts": {
     "dev": "bun --watch src/bun.ts"
   },
-  "dependencies": {}
+  "dependencies": {
+    "@authhero/kysely-adapter": "^0.18.1",
+    "@hono/swagger-ui": "^0.4.1",
+    "@hono/zod-openapi": "^0.18.0",
+    "authhero": "^0.10.1",
+    "hono": "^4.6.11",
+    "hono-openapi-middlewares": "^1.0.11",
+    "kysely-bun-sqlite": "^0.3.2"
+  }
 }
diff --git a/apps/demo/src/app.ts b/apps/demo/src/app.ts
@@ -1,18 +1,19 @@
 import { Context } from "hono";
 import { OpenAPIHono } from "@hono/zod-openapi";
 import { HTTPException } from "hono/http-exception";
+import { DataAdapters, init } from "authhero";
+import { swaggerUI } from "@hono/swagger-ui";
+import {
+  createAuthMiddleware,
+  registerComponent,
+} from "hono-openapi-middlewares";
 import packageJson from "../package.json";
-import authhero, { DataAdapters } from "authhero";
+import { Bindings } from "./types/Bindings";
 
-// Define the return type interface
-interface CreateReturn {
-  app: ReturnType<typeof authhero.init>;
-}
-
-export default function create(dataAdapter: DataAdapters): CreateReturn {
-  const rootApp = new OpenAPIHono();
+export default function create(dataAdapter: DataAdapters) {
+  const app = new OpenAPIHono<{ Bindings: Bindings }>();
 
-  rootApp
+  app
     .onError((err, ctx) => {
       if (err instanceof HTTPException) {
         // Get the custom response
@@ -28,13 +29,31 @@ export default function create(dataAdapter: DataAdapters): CreateReturn {
         name: tenantId,
         version: packageJson.version,
       });
-    });
+    })
+    .get("/docs", swaggerUI({ url: "/spec" }));
+  app.use(createAuthMiddleware(app));
+  app.use(registerComponent(app));
 
-  const app = authhero.init({
+  const { managementApp } = init({
     dataAdapter,
+    issuer: "https://authhero.com",
   });
 
-  return {
-    app,
-  };
+  managementApp.doc("/spec", (c) => ({
+    openapi: "3.0.0",
+    info: {
+      version: "1.0.0",
+      title: "Management API",
+    },
+    servers: [
+      {
+        url: new URL(c.req.url).origin,
+        description: "Current environment",
+      },
+    ],
+  }));
+
+  app.route("/", managementApp);
+
+  return app;
 }
diff --git a/apps/demo/src/bun.ts b/apps/demo/src/bun.ts
@@ -15,8 +15,7 @@ const db = new Kysely<any>({
 
 const dataAdapter = createAdapters(db);
 
-// @ts-ignore
-const { app } = createApp(dataAdapter);
+const app = createApp(dataAdapter);
 
 const server = {
   async fetch(request: Request): Promise<Response> {

diff --git a/apps/demo/src/server.ts b/apps/demo/src/server.ts
@@ -0,0 +1,35 @@
+import { OpenAPIHono } from "@hono/zod-openapi";
+import { PlanetScaleDialect } from "kysely-planetscale";
+import { Kysely } from "kysely";
+import createApp from "./app";
+import createAdapters from "@authhero/kysely-adapter";
+
+interface Env {
+  DATABASE_HOST: string;
+  DATABASE_USERNAME: string;
+  DATABASE_PASSWORD: string;
+}
+
+let app: OpenAPIHono | undefined;
+
+const server = {
+  async fetch(request: Request, env: Env): Promise<Response> {
+    if (!app) {
+      const dialect = new PlanetScaleDialect({
+        host: env.DATABASE_HOST,
+        username: env.DATABASE_USERNAME,
+        password: env.DATABASE_PASSWORD,
+        fetch: (opts, init) =>
+          fetch(new Request(opts, { ...init, cache: undefined })),
+      });
+      const db = new Kysely<any>({ dialect });
+      const dataAdapter = createAdapters(db);
+
+      app = createApp(dataAdapter);
+    }
+
+    return app.fetch(request);
+  },
+};
+
+export default server;
diff --git a/apps/demo/src/types/Bindings.ts b/apps/demo/src/types/Bindings.ts
@@ -0,0 +1,7 @@
+export type Bindings = {
+  JWKS_URL: string;
+  JWKS_SERVICE: {
+    fetch: typeof fetch;
+  };
+  AUTH_URL: string;
+};
diff --git a/apps/demo/wrangler.toml b/apps/demo/wrangler.toml
@@ -0,0 +1,3 @@
+name = "authhero-demo"
+main = "src/server.ts"
+compatibility_date = "2024-11-20"
diff --git a/packages/adapter-interfaces/CHANGELOG.md b/packages/adapter-interfaces/CHANGELOG.md
@@ -1,5 +1,17 @@
 # @authhero/adapter-interfaces
 
+## 0.22.1
+
+### Patch Changes
+
+- remove the iife build files
+
+## 0.22.0
+
+### Minor Changes
+
+- Get the demo project rendering
+
 ## 0.21.0
 
 ### Minor Changes

diff --git a/packages/adapter-interfaces/package.json b/packages/adapter-interfaces/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.21.0",
+  "version": "0.22.1",
   "files": [
     "dist"
   ],
@@ -29,14 +29,15 @@
     "build": "tsc && vite build && dts-bundle-generator --config ./dts-bundle-generator.config.ts"
   },
   "devDependencies": {
+    "@hono/zod-openapi": "^0.18.0",
     "@rollup/plugin-commonjs": "^28.0.1",
     "@rollup/plugin-node-resolve": "^15.3.0",
-    "@types/node": "^22.8.6",
+    "@types/node": "^22.9.1",
     "dts-bundle-generator": "^9.5.1",
     "typescript": "^5.6.3",
-    "vite": "^5.4.10"
+    "vite": "^5.4.11"
   },
-  "dependencies": {
+  "peerDependencies": {
     "@hono/zod-openapi": "^0.16.4"
   }
 }
diff --git a/packages/adapter-interfaces/vite.config.ts b/packages/adapter-interfaces/vite.config.ts
@@ -18,7 +18,6 @@ const getPackageNameCamelCase = () => {
 const fileName = {
   es: `${getPackageName()}.mjs`,
   cjs: `${getPackageName()}.cjs`,
-  iife: `${getPackageName()}.iife.js`,
 };
 
 const formats = Object.keys(fileName) as Array<keyof typeof fileName>;

diff --git a/packages/authhero/CHANGELOG.md b/packages/authhero/CHANGELOG.md
@@ -1,5 +1,24 @@
 # authhero
 
+## 0.10.1
+
+### Patch Changes
+
+- remove the iife build files
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.22.1
+
+## 0.10.0
+
+### Minor Changes
+
+- Get the demo project rendering
+
+### Patch Changes
+
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.22.0
+
 ## 0.9.0
 
 ### Minor Changes

diff --git a/packages/authhero/package.json b/packages/authhero/package.json
@@ -1,6 +1,6 @@
 {
   "name": "authhero",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "files": [
     "dist"
   ],
@@ -22,21 +22,25 @@
   },
   "devDependencies": {
     "@authhero/kysely-adapter": "workspace:^",
-    "@types/node": "^22.9.0",
+    "@hono/zod-openapi": "^0.18.0",
+    "@types/node": "^22.9.1",
     "better-sqlite3": "^11.5.0",
     "dts-bundle-generator": "^9.5.1",
+    "hono": "^4.6.11",
     "typescript": "^5.6.3",
     "vite": "^5.4.11",
     "vite-plugin-dts": "^4.3.0",
-    "vitest": "^2.1.4"
+    "vitest": "^2.1.5"
   },
   "dependencies": {
     "@authhero/adapter-interfaces": "workspace:^",
-    "@hono/zod-openapi": "^0.17.0",
     "@peculiar/x509": "^1.12.3",
     "bcrypt": "^5.1.1",
     "bcryptjs": "^2.4.3",
-    "hono": "^4.6.9",
     "oslo": "^1.2.1"
+  },
+  "peerDependencies": {
+    "@hono/zod-openapi": "^0.18.0",
+    "hono": "^4.6.11"
   }
 }
diff --git a/packages/authhero/vite.config.ts b/packages/authhero/vite.config.ts
@@ -16,7 +16,6 @@ const getPackageNameCamelCase = () => {
 const fileName = {
   es: `${getPackageName()}.mjs`,
   cjs: `${getPackageName()}.cjs`,
-  iife: `${getPackageName()}.iife.js`,
 };
 
 const formats = Object.keys(fileName) as Array<keyof typeof fileName>;

diff --git a/packages/drizzle/CHANGELOG.md b/packages/drizzle/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @authhero/drizzle
 
+## 0.1.57
+
+### Patch Changes
+
+- remove the iife build files
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.22.1
+
+## 0.1.56
+
+### Patch Changes
+
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.22.0
+
 ## 0.1.55
 
 ### Patch Changes

diff --git a/packages/drizzle/package.json b/packages/drizzle/package.json
@@ -11,7 +11,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.1.55",
+  "version": "0.1.57",
   "files": [
     "dist"
   ],

diff --git a/packages/drizzle/vite.config.ts b/packages/drizzle/vite.config.ts
@@ -18,7 +18,6 @@ const getPackageNameCamelCase = () => {
 const fileName = {
   es: `${getPackageName()}.mjs`,
   cjs: `${getPackageName()}.cjs`,
-  iife: `${getPackageName()}.iife.js`,
 };
 
 const formats = Object.keys(fileName) as Array<keyof typeof fileName>;

diff --git a/packages/kysely/CHANGELOG.md b/packages/kysely/CHANGELOG.md
@@ -1,5 +1,24 @@
 # @authhero/kysely-adapter
 
+## 0.18.1
+
+### Patch Changes
+
+- remove the iife build files
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.22.1
+
+## 0.18.0
+
+### Minor Changes
+
+- Get the demo project rendering
+
+### Patch Changes
+
+- Updated dependencies
+  - @authhero/adapter-interfaces@0.22.0
+
 ## 0.17.1
 
 ### Patch Changes