create-authhero 0.33.0 → 0.34.0

package/dist/create-authhero.js

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 import { Command as I } from "commander";
-import m from "inquirer";
+import g from "inquirer";
 import a from "fs";
 import l from "path";
 import { spawn as E } from "child_process";
-const T = new I(), p = {
+const D = new I(), i = {
   local: {
     name: "Local (SQLite)",
     description: "Local development setup with SQLite database - great for getting started",
@@ -145,15 +145,15 @@ function P(o, e = !1, r = "authhero-local") {
     "https://local.authhero.net/auth-callback",
     "http://localhost:5173/auth-callback",
     "https://localhost:3000/auth-callback"
-  ], i = e ? [
+  ], d = e ? [
     `https://localhost.emobix.co.uk:8443/test/a/${r}/callback`,
     `https://localhost:8443/test/a/${r}/callback`
-  ] : [], g = [...s, ...i], f = [
+  ] : [], m = [...s, ...d], f = [
     "https://manage.authhero.net",
     "https://local.authhero.net",
     "http://localhost:5173",
     "https://localhost:3000"
-  ], v = e ? ["https://localhost:8443/", "https://localhost.emobix.co.uk:8443/"] : [], w = [...f, ...v], A = e ? `
+  ], v = e ? ["https://localhost:8443/", "https://localhost.emobix.co.uk:8443/"] : [], w = [...f, ...v], b = e ? `
   // Create OpenID Conformance Suite test clients and user
   console.log("Creating conformance test clients and user...");
   
@@ -278,11 +278,11 @@ async function main() {
     adminPassword,
     tenantId: "${n}",
     tenantName: "${t}",
-    isControlPlane: ${o},
-    callbacks: ${JSON.stringify(g)},
+    isControlPlane: ${!!o},
+    callbacks: ${JSON.stringify(m)},
     allowedLogoutUrls: ${JSON.stringify(w)},
   });
-${A}
+${b}
   await db.destroy();
 }
 
@@ -295,6 +295,15 @@ import { swaggerUI } from "@hono/swagger-ui";
 import { AuthHeroConfig, DataAdapters } from "authhero";
 import { serveStatic } from "@hono/node-server/serve-static";
 import { initMultiTenant } from "@authhero/multi-tenancy";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const widgetPath = path.resolve(
+  __dirname,
+  "../node_modules/@authhero/widget/dist/authhero-widget",
+);
 
 // Control plane configuration
 const CONTROL_PLANE_TENANT_ID = "control_plane";
@@ -304,6 +313,10 @@ export default function createApp(config: AuthHeroConfig & { dataAdapter: DataAd
   // Initialize multi-tenant AuthHero - syncs resource servers, roles, and connections by default
   const { app } = initMultiTenant({
     ...config,
+    widgetHandler: serveStatic({
+      root: widgetPath,
+      rewriteRequestPath: (p) => p.replace("/u/widget", ""),
+    }),
     controlPlane: {
       tenantId: CONTROL_PLANE_TENANT_ID,
       clientId: CONTROL_PLANE_CLIENT_ID,
@@ -328,23 +341,7 @@ export default function createApp(config: AuthHeroConfig & { dataAdapter: DataAd
         controlPlaneTenant: CONTROL_PLANE_TENANT_ID,
       });
     })
-    .get("/docs", swaggerUI({ url: "/api/v2/spec" }))
-    // Serve widget assets from @authhero/widget package
-    .get(
-      "/u/widget/*",
-      serveStatic({
-        root: "./node_modules/@authhero/widget/dist/authhero-widget",
-        rewriteRequestPath: (path) => path.replace("/u/widget", ""),
-      }),
-    )
-    // Serve static assets (CSS, JS) from authhero package
-    .get(
-      "/u/*",
-      serveStatic({
-        root: "./node_modules/authhero/dist/assets/u",
-        rewriteRequestPath: (path) => path.replace("/u", ""),
-      }),
-    );
+    .get("/docs", swaggerUI({ url: "/api/v2/spec" }));
 
   return app;
 }
@@ -352,9 +349,24 @@ export default function createApp(config: AuthHeroConfig & { dataAdapter: DataAd
 import { AuthHeroConfig, init } from "authhero";
 import { swaggerUI } from "@hono/swagger-ui";
 import { serveStatic } from "@hono/node-server/serve-static";
+import path from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+const widgetPath = path.resolve(
+  __dirname,
+  "../node_modules/@authhero/widget/dist/authhero-widget",
+);
 
 export default function createApp(config: AuthHeroConfig) {
-  const { app } = init(config);
+  const { app } = init({
+    ...config,
+    widgetHandler: serveStatic({
+      root: widgetPath,
+      rewriteRequestPath: (p) => p.replace("/u/widget", ""),
+    }),
+  });
 
   app
     .onError((err, ctx) => {
@@ -371,23 +383,7 @@ export default function createApp(config: AuthHeroConfig) {
         status: "running",
       });
     })
-    .get("/docs", swaggerUI({ url: "/api/v2/spec" }))
-    // Serve widget assets from @authhero/widget package
-    .get(
-      "/u/widget/*",
-      serveStatic({
-        root: "./node_modules/@authhero/widget/dist/authhero-widget",
-        rewriteRequestPath: (path) => path.replace("/u/widget", ""),
-      }),
-    )
-    // Serve static assets (CSS, JS) from authhero package
-    .get(
-      "/u/*",
-      serveStatic({
-        root: "./node_modules/authhero/dist/assets/u",
-        rewriteRequestPath: (path) => path.replace("/u", ""),
-      }),
-    );
+    .get("/docs", swaggerUI({ url: "/api/v2/spec" }));
 
   return app;
 }
@@ -422,7 +418,7 @@ export default {
         issuer,
         tenantId: "${o ? "control_plane" : "main"}",
         tenantName: "${o ? "Control Plane" : "Main"}",
-        isControlPlane: ${o},
+        isControlPlane: ${!!o},
       });
 
       return new Response(
@@ -533,7 +529,7 @@ export default function createApp(config: AuthHeroConfig) {
 }
 `;
 }
-function j(o) {
+function L(o) {
   return o ? `import { Context } from "hono";
 import { swaggerUI } from "@hono/swagger-ui";
 import { AuthHeroConfig, DataAdapters } from "authhero";
@@ -639,7 +635,7 @@ export default function createApp(config: AppConfig) {
 }
 `;
 }
-function L(o) {
+function j(o) {
   return `import { DynamoDBClient } from "@aws-sdk/client-dynamodb";
 import { DynamoDBDocumentClient } from "@aws-sdk/lib-dynamodb";
 import createAdapters from "@authhero/aws";
@@ -670,7 +666,7 @@ async function main() {
     adminPassword,
     tenantId: "${o ? "control_plane" : "main"}",
     tenantName: "${o ? "Control Plane" : "Main"}",
-    isControlPlane: ${o},
+    isControlPlane: ${!!o},
   });
 
   console.log("✅ Database seeded successfully!");
@@ -683,10 +679,10 @@ function $(o, e) {
   const r = l.join(o, "src");
   a.writeFileSync(
     l.join(r, "app.ts"),
-    j(e)
+    L(e)
   ), a.writeFileSync(
     l.join(r, "seed.ts"),
-    L(e)
+    j(e)
   );
 }
 function k() {
@@ -808,7 +804,7 @@ function M(o) {
     "type-check": "tsc --noEmit"
   }, a.writeFileSync(r, JSON.stringify(n, null, 2));
 }
-function S(o, e) {
+function A(o, e) {
   return new Promise((r, n) => {
     const t = E(o, [], {
       cwd: e,
@@ -837,14 +833,14 @@ function x() {
   ), console.log("🌐 Portal available at https://local.authhero.net"), console.log("─".repeat(50) + `
 `);
 }
-function D() {
+function _() {
   console.log(`
 ` + "─".repeat(50)), console.log("✅ Self-signed certificates generated with openssl"), console.log("⚠️  You may need to trust the certificate in your browser"), console.log("🔐 AuthHero server running at https://localhost:3000"), console.log("📚 API documentation available at https://localhost:3000/docs"), console.log(
     "🚀 Open https://localhost:3000/setup to complete initial setup"
   ), console.log("🌐 Portal available at https://local.authhero.net"), console.log("─".repeat(50) + `
 `);
 }
-T.version("1.0.0").description("Create a new AuthHero project").argument("[project-name]", "name of the project").option("-t, --template <type>", "template type: local or cloudflare").option(
+D.version("1.0.0").description("Create a new AuthHero project").argument("[project-name]", "name of the project").option("-t, --template <type>", "template type: local or cloudflare").option(
   "--package-manager <pm>",
   "package manager to use: npm, yarn, pnpm, or bun"
 ).option("--multi-tenant", "enable multi-tenant mode").option("--skip-install", "skip installing dependencies").option("--skip-migrate", "skip running database migrations").option("--skip-start", "skip starting the development server").option("--github-ci", "include GitHub CI workflows with semantic versioning").option("--conformance", "add OpenID conformance suite test clients").option(
@@ -859,84 +855,74 @@ T.version("1.0.0").description("Create a new AuthHero project").argument("[proje
 🔐 Welcome to AuthHero!
 `);
   let n = o;
-  n || (r ? (n = "auth-server", console.log(`Using default project name: ${n}`)) : n = (await m.prompt([
+  n || (r ? (n = "auth-server", console.log(`Using default project name: ${n}`)) : n = (await g.prompt([
     {
       type: "input",
       name: "projectName",
       message: "Project name:",
       default: "auth-server",
-      validate: (u) => u !== "" || "Project name cannot be empty"
+      validate: (p) => p !== "" || "Project name cannot be empty"
     }
   ])).projectName);
   const t = l.join(process.cwd(), n);
   a.existsSync(t) && (console.error(`❌ Project "${n}" already exists.`), process.exit(1));
   let s;
-  e.template ? (["local", "cloudflare", "aws-sst"].includes(e.template) || (console.error(`❌ Invalid template: ${e.template}`), console.error("Valid options: local, cloudflare, aws-sst"), process.exit(1)), s = e.template, console.log(`Using template: ${p[s].name}`)) : s = (await m.prompt([
+  e.template ? (["local", "cloudflare", "aws-sst"].includes(e.template) || (console.error(`❌ Invalid template: ${e.template}`), console.error("Valid options: local, cloudflare, aws-sst"), process.exit(1)), s = e.template, console.log(`Using template: ${i[s].name}`)) : s = (await g.prompt([
     {
       type: "list",
       name: "setupType",
       message: "Select your setup type:",
       choices: [
         {
-          name: `${p.local.name}
-     ${p.local.description}`,
+          name: `${i.local.name}
+     ${i.local.description}`,
           value: "local",
-          short: p.local.name
+          short: i.local.name
         },
         {
-          name: `${p.cloudflare.name}
-     ${p.cloudflare.description}`,
+          name: `${i.cloudflare.name}
+     ${i.cloudflare.description}`,
           value: "cloudflare",
-          short: p.cloudflare.name
+          short: i.cloudflare.name
         },
         {
-          name: `${p["aws-sst"].name}
-     ${p["aws-sst"].description}`,
+          name: `${i["aws-sst"].name}
+     ${i["aws-sst"].description}`,
           value: "aws-sst",
-          short: p["aws-sst"].name
+          short: i["aws-sst"].name
         }
       ]
     }
   ])).setupType;
-  let i;
-  e.multiTenant !== void 0 ? (i = e.multiTenant, console.log(`Multi-tenant mode: ${i ? "enabled" : "disabled"}`)) : r ? i = !1 : i = (await m.prompt([
-    {
-      type: "confirm",
-      name: "multiTenant",
-      message: `Would you like to enable multi-tenant mode?
-     (Allows managing multiple tenants from a control plane)`,
-      default: !1
-    }
-  ])).multiTenant;
-  const g = e.conformance || !1, f = e.conformanceAlias || "authhero-local";
-  g && console.log(
+  const d = e.multiTenant, m = e.conformance || !1, f = e.conformanceAlias || "authhero-local";
+  m && console.log(
     `OpenID Conformance Suite: enabled (alias: ${f})`
   );
   const v = e.workspace || !1;
   v && console.log("Workspace mode: enabled (using workspace:* dependencies)");
-  const w = p[s];
+  const w = i[s];
   a.mkdirSync(t, { recursive: !0 }), a.writeFileSync(
     l.join(t, "package.json"),
     JSON.stringify(
-      w.packageJson(n, i, g, v),
+      w.packageJson(n, d, m, v),
       null,
       2
     )
   );
-  const A = w.templateDir, b = l.join(
+  const b = w.templateDir, S = l.join(
     import.meta.url.replace("file://", "").replace("/create-authhero.js", ""),
-    A
+    b
   );
-  if (a.existsSync(b) ? N(b, t) : (console.error(`❌ Template directory not found: ${b}`), process.exit(1)), s === "cloudflare" && F(t, i), s === "cloudflare") {
-    const c = l.join(t, "wrangler.toml"), u = l.join(t, "wrangler.local.toml");
-    a.existsSync(c) && a.copyFileSync(c, u);
-    const d = l.join(t, ".dev.vars.example"), h = l.join(t, ".dev.vars");
-    a.existsSync(d) && a.copyFileSync(d, h), console.log(
+  if (a.existsSync(S) ? N(S, t) : (console.error(`❌ Template directory not found: ${S}`), process.exit(1)), s === "cloudflare" && F(t, d), s === "cloudflare") {
+    const c = l.join(t, "wrangler.toml"), p = l.join(t, "wrangler.local.toml");
+    a.existsSync(c) && a.copyFileSync(c, p);
+    const u = l.join(t, ".dev.vars.example"), h = l.join(t, ".dev.vars");
+    a.existsSync(u) && a.copyFileSync(u, h), console.log(
       "📁 Created wrangler.local.toml and .dev.vars for local development"
     );
   }
   let C = !1;
-  if (s === "cloudflare" && (e.githubCi !== void 0 ? (C = e.githubCi, C && console.log("Including GitHub CI workflows with semantic versioning")) : r || (C = (await m.prompt([
+  if (s === "cloudflare" && (e.githubCi !== void 0 ? (C = e.githubCi, C && console.log("Including GitHub CI workflows with semantic versioning")) : r || (C = (await g.prompt([
     {
       type: "confirm",
       name: "includeGithubCi",
@@ -945,15 +931,15 @@ T.version("1.0.0").description("Create a new AuthHero project").argument("[proje
     }
   ])).includeGithubCi), C && (H(t), M(t))), s === "local") {
     const c = P(
-      i,
-      g,
+      d,
+      m,
       f
     );
     a.writeFileSync(l.join(t, "src/seed.ts"), c);
-    const u = R(i);
-    a.writeFileSync(l.join(t, "src/app.ts"), u);
+    const p = R(d);
+    a.writeFileSync(l.join(t, "src/app.ts"), p);
   }
-  if (s === "aws-sst" && $(t, i), g) {
+  if (s === "aws-sst" && $(t, d), m) {
     const c = {
       alias: f,
       description: "AuthHero Conformance Test",
@@ -979,14 +965,14 @@ T.version("1.0.0").description("Create a new AuthHero project").argument("[proje
       "📝 Created conformance-config.json for OpenID Conformance Suite"
     );
   }
-  const _ = i ? "multi-tenant" : "single-tenant";
+  const T = d ? "multi-tenant" : "single-tenant";
   console.log(
     `
-✅ Project "${n}" has been created with ${w.name} (${_}) setup!
+✅ Project "${n}" has been created with ${w.name} (${T}) setup!
 `
   );
   let y;
-  if (e.skipInstall ? y = !1 : r ? y = !0 : y = (await m.prompt([
+  if (e.skipInstall ? y = !1 : r ? y = !0 : y = (await g.prompt([
     {
       type: "confirm",
       name: "shouldInstall",
@@ -997,7 +983,7 @@ T.version("1.0.0").description("Create a new AuthHero project").argument("[proje
     let c;
     e.packageManager ? (["npm", "yarn", "pnpm", "bun"].includes(e.packageManager) || (console.error(
       `❌ Invalid package manager: ${e.packageManager}`
-    ), console.error("Valid options: npm, yarn, pnpm, bun"), process.exit(1)), c = e.packageManager) : r ? c = "pnpm" : c = (await m.prompt([
+    ), console.error("Valid options: npm, yarn, pnpm, bun"), process.exit(1)), c = e.packageManager) : r ? c = "pnpm" : c = (await g.prompt([
       {
         type: "list",
         name: "packageManager",
@@ -1014,14 +1000,14 @@ T.version("1.0.0").description("Create a new AuthHero project").argument("[proje
 📦 Installing dependencies with ${c}...
 `);
     try {
-      const u = c === "pnpm" ? "pnpm install --ignore-workspace" : `${c} install`;
-      if (await S(u, t), s === "local" && (console.log(`
+      const p = c === "pnpm" ? "pnpm install --ignore-workspace" : `${c} install`;
+      if (await A(p, t), s === "local" && (console.log(`
 🔧 Building native modules...
-`), await S("npm rebuild better-sqlite3", t)), console.log(`
+`), await A("npm rebuild better-sqlite3", t)), console.log(`
 ✅ Dependencies installed successfully!
 `), (s === "local" || s === "cloudflare") && !e.skipMigrate) {
         let h;
-        r ? h = !0 : h = (await m.prompt([
+        r ? h = !0 : h = (await g.prompt([
           {
             type: "confirm",
             name: "shouldMigrate",
@@ -1030,23 +1016,23 @@ T.version("1.0.0").description("Create a new AuthHero project").argument("[proje
           }
         ])).shouldMigrate, h && (console.log(`
 🔄 Running migrations...
-`), await S(`${c} run migrate`, t));
+`), await A(`${c} run migrate`, t));
       }
-      let d;
-      e.skipStart || r ? d = !1 : d = (await m.prompt([
+      let u;
+      e.skipStart || r ? u = !1 : u = (await g.prompt([
         {
           type: "confirm",
           name: "shouldStart",
           message: "Would you like to start the development server?",
           default: !0
         }
-      ])).shouldStart, d && (s === "cloudflare" ? x() : s === "aws-sst" ? k() : D(), console.log(`🚀 Starting development server...
-`), await S(`${c} run dev`, t)), r && !d && (console.log(`
+      ])).shouldStart, u && (s === "cloudflare" ? x() : s === "aws-sst" ? k() : _(), console.log(`🚀 Starting development server...
+`), await A(`${c} run dev`, t)), r && !u && (console.log(`
 ✅ Setup complete!`), console.log(`
-To start the development server:`), console.log(`  cd ${n}`), console.log("  npm run dev"), s === "cloudflare" ? x() : s === "aws-sst" ? k() : D());
-    } catch (u) {
+To start the development server:`), console.log(`  cd ${n}`), console.log("  npm run dev"), s === "cloudflare" ? x() : s === "aws-sst" ? k() : _());
+    } catch (p) {
       console.error(`
-❌ An error occurred:`, u), process.exit(1);
+❌ An error occurred:`, p), process.exit(1);
     }
   }
   y || (console.log("Next steps:"), console.log(`  cd ${n}`), s === "local" ? (console.log("  npm install"), console.log("  npm run migrate"), console.log("  npm run dev"), console.log(
@@ -1061,7 +1047,7 @@ Open https://localhost:3000/setup to complete initial setup`
     `
 Open your server URL /setup to complete initial setup`
   )), console.log(`
-Server will be available at: https://localhost:3000`), console.log("Portal available at: https://local.authhero.net"), g && (console.log(`
+Server will be available at: https://localhost:3000`), console.log("Portal available at: https://local.authhero.net"), m && (console.log(`
 🧪 OpenID Conformance Suite Testing:`), console.log(
     "  1. Clone and start the conformance suite (if not already running):"
   ), console.log(
@@ -1072,4 +1058,4 @@ Server will be available at: https://localhost:3000`), console.log("Portal avail
 For more information, visit: https://authhero.net/docs
 `));
 });
-T.parse(process.argv);
+D.parse(process.argv);

package/dist/local/src/app.ts

@@ -3,6 +3,7 @@ import { AuthHeroConfig, init } from "authhero";
 import { swaggerUI } from "@hono/swagger-ui";
 import { serveStatic } from "@hono/node-server/serve-static";
 import path from "path";
+import fs from "fs";
 import { fileURLToPath } from "url";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
@@ -13,9 +14,15 @@ const widgetPath = path.resolve(
   "../node_modules/@authhero/widget/dist/authhero-widget",
 );
 
+const adminDistPath = path.resolve(
+  __dirname,
+  "../node_modules/@authhero/react-admin/dist",
+);
+const adminIndexPath = path.join(adminDistPath, "index.html");
+
 export default function createApp(config: AuthHeroConfig) {
-  // Configure widget handler before init() to serve widget files at /u/widget/*
-  const configWithWidget: AuthHeroConfig = {
+  // Configure widget and admin handlers before init()
+  const configWithHandlers: AuthHeroConfig = {
     ...config,
     widgetHandler: serveStatic({
       root: widgetPath,
@@ -23,7 +30,26 @@ export default function createApp(config: AuthHeroConfig) {
     }),
   };
 
-  const { app } = init(configWithWidget);
+  // Add admin UI handler if the package is installed
+  if (fs.existsSync(adminIndexPath)) {
+    const issuer =
+      process.env.ISSUER || `https://localhost:${process.env.PORT || 3000}/`;
+    const rawHtml = fs.readFileSync(adminIndexPath, "utf-8");
+    const configJson = JSON.stringify({
+      domain: issuer.replace(/\/$/, ""),
+      basePath: "/admin",
+    }).replace(/</g, "\\u003c");
+    configWithHandlers.adminIndexHtml = rawHtml.replace(
+      "</head>",
+      `<script>window.__AUTHHERO_ADMIN_CONFIG__=${configJson};</script>\n</head>`,
+    );
+    configWithHandlers.adminHandler = serveStatic({
+      root: adminDistPath,
+      rewriteRequestPath: (p: string) => p.replace("/admin", ""),
+    });
+  }
+
+  const { app } = init(configWithHandlers);
 
   app
     .get("/", async (ctx: Context) => {

package/dist/local/src/index.ts

@@ -90,6 +90,7 @@ const app = createApp({
     "https://manage.authhero.net",
     "https://local.authhero.net",
     "http://localhost:5173",
+    "https://localhost:5173",
   ],
 });
 

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "https://github.com/markusahlstrand/authhero"
   },
-  "version": "0.33.0",
+  "version": "0.34.0",
   "type": "module",
   "main": "dist/create-authhero.js",
   "bin": {
@@ -29,6 +29,7 @@
   },
   "scripts": {
     "build": "tsc && vite build",
+    "dev": "pnpm build && rm -rf auth-server && node dist/create-authhero.js auth-server --workspace --skip-install --skip-start && pnpm -w install --force --filter auth-server... && pnpm --filter auth-server migrate && pnpm --filter auth-server dev",
     "start": "pnpm build && node dist/create-authhero.js"
   }
 }