Strengthen CI with Next build + Docker build and expand tests

Add docker-build and next build jobs so Dockerfile/image failures fail CI. Expand unit coverage for exporters/Zod and integration coverage for search, MCT import, backup, and token revoke.
2026-09-10 00:11:56 -07:00 · 2026-08-23 23:34:04 +00:00
9 changed files with 119 additions and 348 deletions
@@ -1,10 +1,4 @@
 AUTH_SECRET=change-me-to-a-long-random-string
-
-# Public URL of this app (important behind reverse proxies / Docker)
-# Example: http://localhost:3000 or https://rfid.example.com
-# AUTH_URL=http://localhost:3000
-# AUTH_TRUST_HOST=true
-
 # Optional: path to SQLite file (default ./data/rfid.db)
 # RFID_DB_PATH=./data/rfid.db

@@ -16,20 +10,10 @@ AUTH_SECRET=change-me-to-a-long-random-string
 # CREATE_USER_PASSWORD=changeme
 # CREATE_USER_NAME=Admin

-# Optional OIDC (Authentik, Keycloak, Authelia, Google, etc.)
-# Setting these three enables the "Sign in with SSO" button automatically
-# (no NEXT_PUBLIC_* flag needed).
-#
-# In your IdP, create a confidential OIDC client with redirect URI:
-#   {AUTH_URL}/api/auth/callback/oidc
-# e.g. http://localhost:3000/api/auth/callback/oidc
-#
-# AUTH_OIDC_ISSUER must be the issuer that serves
-#   {issuer}/.well-known/openid-configuration
-# Authentik example: https://sso.example.com/application/o/rfid/
-# Keycloak example:  https://sso.example.com/realms/myrealm
-#
+# Optional OIDC (Authentik, Keycloak, Authelia, etc.)
 # AUTH_OIDC_ISSUER=https://sso.example.com/application/o/rfid/
 # AUTH_OIDC_CLIENT_ID=
 # AUTH_OIDC_CLIENT_SECRET=
-# AUTH_OIDC_NAME=Authentik
+# AUTH_OIDC_NAME=SSO
+# NEXT_PUBLIC_AUTH_OIDC_ENABLED=1
+# NEXT_PUBLIC_AUTH_OIDC_NAME=SSO
@@ -30,47 +30,13 @@ Open http://localhost:3000 and sign in.
 | Variable | Required | Description |
 |----------|----------|-------------|
 | `AUTH_SECRET` | yes | NextAuth secret |
-| `AUTH_URL` | recommended | Public app URL (e.g. `https://rfid.example.com`) |
 | `RFID_DB_PATH` | no | SQLite path (default `./data/rfid.db`) |
-| `AUTH_OIDC_ISSUER` | for OIDC | Issuer URL (must expose `/.well-known/openid-configuration`) |
-| `AUTH_OIDC_CLIENT_ID` | for OIDC | OIDC client id |
-| `AUTH_OIDC_CLIENT_SECRET` | for OIDC | OIDC client secret |
-| `AUTH_OIDC_NAME` | no | SSO button label (default `SSO`) |
-
-### Enabling OIDC
-
-1. **Pull latest and rebuild** (OIDC button detection changed recently):
-   ```bash
-   git pull
-   docker compose up -d --build
-   ```
-2. In your IdP, create a **confidential** OIDC application.
-3. Set the redirect / callback URI to **exactly**:
-   ```
-   {AUTH_URL}/api/auth/callback/oidc
-   ```
-   Example: `https://rfid.atlashorizon.net/api/auth/callback/oidc`
-4. Put these in `.env`:
-   ```bash
-   AUTH_URL=https://rfid.atlashorizon.net
-   AUTH_SECRET=...long random...
-   AUTH_OIDC_ISSUER=https://auth.atlashorizon.net
-   AUTH_OIDC_CLIENT_ID=rfiddb
-   AUTH_OIDC_CLIENT_SECRET=...
-   AUTH_OIDC_NAME=AtlasHorizon
-   ```
-5. Restart, then verify the running app sees config (no secrets returned):
-   ```bash
-   curl -s https://rfid.atlashorizon.net/api/v1/auth/config | jq
-   ```
-   You want `"oidcEnabled": true` and `"callbackUrl"` matching your IdP.
-6. Open `/login` — you should see **Sign in with AtlasHorizon**.
-
-Notes:
- `AUTH_OIDC_ISSUER` must match discovery (`{issuer}/.well-known/openid-configuration`). Your AtlasHorizon issuer at `https://auth.atlashorizon.net` is valid.
- The IdP must return an **email** claim (we request `openid email profile`).
- Local password login stays available alongside SSO.
- If the button is missing, you are almost certainly on an old image — rebuild.
+| `AUTH_OIDC_ISSUER` | no | OIDC issuer URL |
+| `AUTH_OIDC_CLIENT_ID` | no | OIDC client id |
+| `AUTH_OIDC_CLIENT_SECRET` | no | OIDC client secret |
+| `AUTH_OIDC_NAME` | no | Button label (default `SSO`) |
+| `NEXT_PUBLIC_AUTH_OIDC_ENABLED` | no | Set `1` to show SSO button |
+| `NEXT_PUBLIC_AUTH_OIDC_NAME` | no | Public SSO button label |

 ## REST API (`/api/v1`)

@@ -16,12 +16,15 @@ services:
      PORT: "3000"
      HOSTNAME: 0.0.0.0
      AUTH_TRUST_HOST: "true"
-      # OIDC: set AUTH_OIDC_ISSUER / CLIENT_ID / CLIENT_SECRET (and AUTH_URL)
-      # in .env — the login page picks them up at runtime.
      # Optional bootstrap (only creates if missing):
      # CREATE_USER_EMAIL: [email protected]
      # CREATE_USER_PASSWORD: change-me
      # CREATE_USER_NAME: Admin
+      # Optional OIDC — also set NEXT_PUBLIC_* in .env if using SSO button
+      # AUTH_OIDC_ISSUER: ${AUTH_OIDC_ISSUER:-}
+      # AUTH_OIDC_CLIENT_ID: ${AUTH_OIDC_CLIENT_ID:-}
+      # AUTH_OIDC_CLIENT_SECRET: ${AUTH_OIDC_CLIENT_SECRET:-}
+      # AUTH_OIDC_NAME: ${AUTH_OIDC_NAME:-SSO}
    volumes:
      - rfid-data:/data
    healthcheck:
@@ -1,30 +0,0 @@
-import { jsonOk } from "@/lib/api/errors";
-import { isOidcConfigured } from "@/lib/auth/oidc";
-
-/**
- * Public auth diagnostics (no secrets).
- * Useful to verify the running container sees OIDC env vars.
- */
-export async function GET() {
-  const authUrl = (process.env.AUTH_URL || "").replace(/\/$/, "");
-  const oidcEnabled = isOidcConfigured();
-
-  return jsonOk({
-    oidcEnabled,
-    oidcName: process.env.AUTH_OIDC_NAME || "SSO",
-    issuer: process.env.AUTH_OIDC_ISSUER || null,
-    clientIdSet: Boolean(process.env.AUTH_OIDC_CLIENT_ID?.trim()),
-    clientSecretSet: Boolean(process.env.AUTH_OIDC_CLIENT_SECRET?.trim()),
-    authUrl: authUrl || null,
-    authSecretSet: Boolean(
-      process.env.AUTH_SECRET?.trim() &&
-        process.env.AUTH_SECRET !== "change-me-to-a-long-random-string"
-    ),
-    callbackUrl: authUrl
-      ? `${authUrl}/api/auth/callback/oidc`
-      : "/api/auth/callback/oidc",
-    hint: oidcEnabled
-      ? "OIDC looks configured. Register callbackUrl exactly in your IdP."
-      : "Set AUTH_OIDC_ISSUER, AUTH_OIDC_CLIENT_ID, and AUTH_OIDC_CLIENT_SECRET, then restart.",
-  });
-}
@@ -1,21 +1,95 @@
-import { isOidcConfigured } from "@/lib/auth/oidc";
-import { LoginPageClient } from "@/components/LoginPageClient";
+"use client";

-// OIDC env is only available at runtime (Docker). Never prerender this page
-// at build time or the SSO button stays permanently hidden.
-export const dynamic = "force-dynamic";
+import { FormEvent, useState } from "react";
+import { signIn } from "next-auth/react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { Suspense } from "react";

-export default function LoginPage() {
-  const authUrl = (process.env.AUTH_URL || "").replace(/\/$/, "");
-  const callbackUrlHint = authUrl
-    ? `${authUrl}/api/auth/callback/oidc`
-    : "https://<your-host>/api/auth/callback/oidc";
+function LoginForm() {
+  const router = useRouter();
+  const params = useSearchParams();
+  const callbackUrl = params.get("callbackUrl") || "/";
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+  const [error, setError] = useState<string | null>(null);
+  const [loading, setLoading] = useState(false);
+  const oidcName = process.env.NEXT_PUBLIC_AUTH_OIDC_NAME || "SSO";
+  const oidcEnabled = process.env.NEXT_PUBLIC_AUTH_OIDC_ENABLED === "1";
+
+  async function onSubmit(e: FormEvent) {
+    e.preventDefault();
+    setLoading(true);
+    setError(null);
+    const res = await signIn("credentials", {
+      email,
+      password,
+      redirect: false,
+      callbackUrl,
+    });
+    setLoading(false);
+    if (res?.error) {
+      setError("Invalid email or password");
+      return;
+    }
+    router.push(callbackUrl);
+    router.refresh();
+  }

  return (
-    <LoginPageClient
-      oidcEnabled={isOidcConfigured()}
-      oidcName={process.env.AUTH_OIDC_NAME || "SSO"}
-      callbackUrlHint={callbackUrlHint}
+    <div style={{ maxWidth: 400, margin: "3rem auto" }}>
+      <h1 className="page-title">RFID Database</h1>
+      <p className="page-sub">Sign in to manage site tag dumps</p>
+      {error && <div className="error-banner">{error}</div>}
+      <form className="panel stack" onSubmit={onSubmit}>
+        <div className="field">
+          <label className="label" htmlFor="email">
+            Email
+          </label>
+          <input
+            id="email"
+            className="input"
+            type="email"
+            autoComplete="username"
+            value={email}
+            onChange={(e) => setEmail(e.target.value)}
+            required
          />
+        </div>
+        <div className="field">
+          <label className="label" htmlFor="password">
+            Password
+          </label>
+          <input
+            id="password"
+            className="input"
+            type="password"
+            autoComplete="current-password"
+            value={password}
+            onChange={(e) => setPassword(e.target.value)}
+            required
+          />
+        </div>
+        <button className="btn" type="submit" disabled={loading}>
+          {loading ? "Signing in…" : "Sign in"}
+        </button>
+        {oidcEnabled && (
+          <button
+            type="button"
+            className="btn btn-secondary"
+            onClick={() => signIn("oidc", { callbackUrl })}
+          >
+            Sign in with {oidcName}
+          </button>
+        )}
+      </form>
+    </div>
+  );
+}
+
+export default function LoginPage() {
+  return (
+    <Suspense>
+      <LoginForm />
+    </Suspense>
  );
 }
@@ -1,150 +0,0 @@
-"use client";
-
-import { FormEvent, useEffect, useState } from "react";
-import { signIn } from "next-auth/react";
-import { useRouter, useSearchParams } from "next/navigation";
-import { Suspense } from "react";
-
-type Props = {
-  oidcEnabled: boolean;
-  oidcName: string;
-  callbackUrlHint: string;
-};
-
-type AuthConfig = {
-  oidcEnabled: boolean;
-  oidcName: string;
-  callbackUrl: string;
-};
-
-function authErrorMessage(code: string | null): string | null {
-  if (!code) return null;
-  switch (code) {
-    case "EmailRequired":
-      return "Your IdP did not return an email claim. Enable the email scope/claim for this OIDC client.";
-    case "OAuthCallbackError":
-    case "Callback":
-      return "OIDC callback failed. Check redirect URI, client secret, and container logs.";
-    case "OAuthSignin":
-      return "Could not start OIDC login. Check AUTH_OIDC_ISSUER discovery and client id.";
-    case "Configuration":
-      return "Auth configuration error. Verify AUTH_SECRET, AUTH_URL, and OIDC env vars.";
-    case "AccessDenied":
-      return "Access denied by the identity provider.";
-    default:
-      return `Sign-in error: ${code}`;
-  }
-}
-
-function LoginForm({ oidcEnabled, oidcName, callbackUrlHint }: Props) {
-  const router = useRouter();
-  const params = useSearchParams();
-  const callbackUrl = params.get("callbackUrl") || "/";
-  const [email, setEmail] = useState("");
-  const [password, setPassword] = useState("");
-  const [error, setError] = useState<string | null>(
-    authErrorMessage(params.get("error"))
-  );
-  const [loading, setLoading] = useState(false);
-  const [runtimeOidc, setRuntimeOidc] = useState<AuthConfig | null>(null);
-
-  // Belt-and-suspenders: ask the live API so a stale static shell can't hide SSO
-  useEffect(() => {
-    fetch("/api/v1/auth/config")
-      .then((r) => (r.ok ? r.json() : null))
-      .then((data: AuthConfig | null) => {
-        if (data) setRuntimeOidc(data);
-      })
-      .catch(() => {
-        /* ignore */
-      });
-  }, []);
-
-  const showOidc = runtimeOidc?.oidcEnabled ?? oidcEnabled;
-  const displayName = runtimeOidc?.oidcName || oidcName;
-  const redirectHint = runtimeOidc?.callbackUrl || callbackUrlHint;
-
-  async function onSubmit(e: FormEvent) {
-    e.preventDefault();
-    setLoading(true);
-    setError(null);
-    const res = await signIn("credentials", {
-      email,
-      password,
-      redirect: false,
-      callbackUrl,
-    });
-    setLoading(false);
-    if (res?.error) {
-      setError("Invalid email or password");
-      return;
-    }
-    router.push(callbackUrl);
-    router.refresh();
-  }
-
-  return (
-    <div style={{ maxWidth: 400, margin: "3rem auto" }}>
-      <h1 className="page-title">RFID Database</h1>
-      <p className="page-sub">Sign in to manage site tag dumps</p>
-      {error && <div className="error-banner">{error}</div>}
-      <form className="panel stack" onSubmit={onSubmit}>
-        <div className="field">
-          <label className="label" htmlFor="email">
-            Email
-          </label>
-          <input
-            id="email"
-            className="input"
-            type="email"
-            autoComplete="username"
-            value={email}
-            onChange={(e) => setEmail(e.target.value)}
-            required
-          />
-        </div>
-        <div className="field">
-          <label className="label" htmlFor="password">
-            Password
-          </label>
-          <input
-            id="password"
-            className="input"
-            type="password"
-            autoComplete="current-password"
-            value={password}
-            onChange={(e) => setPassword(e.target.value)}
-            required
-          />
-        </div>
-        <button className="btn" type="submit" disabled={loading}>
-          {loading ? "Signing in…" : "Sign in"}
-        </button>
-        {showOidc && (
-          <>
-            <button
-              type="button"
-              className="btn btn-secondary"
-              onClick={() => signIn("oidc", { callbackUrl })}
-            >
-              Sign in with {displayName}
-            </button>
-            <p className="muted" style={{ margin: 0, fontSize: "0.75rem" }}>
-              IdP redirect URI must be exactly:
-              <br />
-              <code className="mono">{redirectHint}</code>
-            </p>
-          </>
-        )}
-      </form>
-    </div>
-  );
-}
-
-export function LoginPageClient(props: Props) {
-  return (
-    <Suspense>
-      <LoginForm {...props} />
-    </Suspense>
-  );
-}
@@ -6,9 +6,6 @@ import { eq } from "drizzle-orm";
 import { getDb } from "@/db/client";
 import { users } from "@/db/schema";
 import { authConfig } from "@/lib/auth/auth.config";
-import { isOidcConfigured } from "@/lib/auth/oidc";
-
-export { isOidcConfigured } from "@/lib/auth/oidc";

 function buildProviders(): Provider[] {
  const providers: Provider[] = [
@@ -35,45 +32,18 @@ function buildProviders(): Provider[] {
    }),
  ];

-  if (isOidcConfigured()) {
-    const issuer = process.env.AUTH_OIDC_ISSUER!.replace(/\/$/, "");
+  const issuer = process.env.AUTH_OIDC_ISSUER;
+  const clientId = process.env.AUTH_OIDC_CLIENT_ID;
+  const clientSecret = process.env.AUTH_OIDC_CLIENT_SECRET;
+  if (issuer && clientId && clientSecret) {
    providers.push({
      id: "oidc",
      name: process.env.AUTH_OIDC_NAME || "SSO",
      type: "oidc",
      issuer,
-      wellKnown: `${issuer}/.well-known/openid-configuration`,
-      clientId: process.env.AUTH_OIDC_CLIENT_ID!,
-      clientSecret: process.env.AUTH_OIDC_CLIENT_SECRET!,
-      authorization: {
-        params: {
-          scope: "openid email profile",
-        },
-      },
-      client: {
-        token_endpoint_auth_method: "client_secret_post",
-      },
-      // Link OIDC logins to existing local users by email
+      clientId,
+      clientSecret,
      allowDangerousEmailAccountLinking: true,
-      profile(profile: Record<string, unknown>) {
-        const email =
-          (typeof profile.email === "string" && profile.email) ||
-          (typeof profile.preferred_username === "string" &&
-          String(profile.preferred_username).includes("@")
-            ? String(profile.preferred_username)
-            : null);
-        return {
-          id: String(profile.sub ?? ""),
-          name:
-            (typeof profile.name === "string" && profile.name) ||
-            (typeof profile.preferred_username === "string" &&
-              profile.preferred_username) ||
-            email ||
-            "OIDC user",
-          email,
-          image: typeof profile.picture === "string" ? profile.picture : null,
-        };
-      },
    } as Provider);
  }

@@ -87,12 +57,7 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
    ...authConfig.callbacks,
    async signIn({ user, account }) {
      if (account?.provider === "credentials") return true;
-      if (!user.email) {
-        console.error(
-          "[auth] OIDC sign-in rejected: IdP did not return an email claim. Enable the email scope/claim on the client."
-        );
-        return "/login?error=EmailRequired";
-      }
+      if (!user.email) return false;

      const db = getDb();
      const email = user.email.toLowerCase();
@@ -117,3 +82,11 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
    },
  },
 });
+
+export function isOidcConfigured(): boolean {
+  return Boolean(
+    process.env.AUTH_OIDC_ISSUER &&
+      process.env.AUTH_OIDC_CLIENT_ID &&
+      process.env.AUTH_OIDC_CLIENT_SECRET
+  );
+}
@@ -1,7 +0,0 @@
-export function isOidcConfigured(): boolean {
-  return Boolean(
-    process.env.AUTH_OIDC_ISSUER?.trim() &&
-      process.env.AUTH_OIDC_CLIENT_ID?.trim() &&
-      process.env.AUTH_OIDC_CLIENT_SECRET?.trim()
-  );
-}
@@ -1,42 +0,0 @@
-import { afterEach, describe, expect, it } from "vitest";
-import { isOidcConfigured } from "@/lib/auth/oidc";
-
-describe("isOidcConfigured", () => {
-  const keys = [
-    "AUTH_OIDC_ISSUER",
-    "AUTH_OIDC_CLIENT_ID",
-    "AUTH_OIDC_CLIENT_SECRET",
-  ] as const;
-  const previous: Record<string, string | undefined> = {};
-
-  afterEach(() => {
-    for (const key of keys) {
-      if (previous[key] === undefined) delete process.env[key];
-      else process.env[key] = previous[key];
-    }
-  });
-
-  function save() {
-    for (const key of keys) previous[key] = process.env[key];
-  }
-
-  it("is false when any var is missing", () => {
-    save();
-    delete process.env.AUTH_OIDC_ISSUER;
-    delete process.env.AUTH_OIDC_CLIENT_ID;
-    delete process.env.AUTH_OIDC_CLIENT_SECRET;
-    expect(isOidcConfigured()).toBe(false);
-
-    process.env.AUTH_OIDC_ISSUER = "https://sso.example.com/";
-    process.env.AUTH_OIDC_CLIENT_ID = "id";
-    expect(isOidcConfigured()).toBe(false);
-  });
-
-  it("is true when all three are set", () => {
-    save();
-    process.env.AUTH_OIDC_ISSUER = "https://sso.example.com/";
-    process.env.AUTH_OIDC_CLIENT_ID = "id";
-    process.env.AUTH_OIDC_CLIENT_SECRET = "secret";
-    expect(isOidcConfigured()).toBe(true);
-  });
-});