Merge pull request #10 from Chewbaccalakis/cursor/fix-oidc-email-userinfo-e593

Fix OIDC email: use Authelia UserInfo (not just ID token)

.github/workflows/ci.yml

@@ -22,11 +22,3 @@ jobs:
       - run: npm run build
         env:
           AUTH_SECRET: ci-build-secret-at-least-32-characters
-
-  docker:
-    name: docker-build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build production image
-        run: docker build -t rfid-database:ci .

.github/workflows/docker.yml

@@ -0,0 +1,60 @@
+name: Docker
+
+on:
+  push:
+    branches: [main]
+    tags: ["v*"]
+  pull_request:
+    branches: [main]
+
+env:
+  REGISTRY: ghcr.io
+  # GHCR requires lowercase image names
+  IMAGE_NAME: ghcr.io/chewbaccalakis/rfid-database
+
+jobs:
+  build-and-push:
+    name: build-and-push
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Log in to GitHub Container Registry
+        if: github.event_name != 'pull_request'
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels)
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.IMAGE_NAME }}
+          tags: |
+            type=raw,value=latest,enable={{is_default_branch}}
+            type=sha,prefix=sha-,format=short
+            type=ref,event=branch
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}.{{minor}}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+          cache-from: type=gha
+          cache-to: type=gha,mode=max

README.md

@@ -67,8 +67,26 @@ Open http://localhost:3000 and sign in.
 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.
+- `AUTH_OIDC_ISSUER` must match discovery (`{issuer}/.well-known/openid-configuration`).
-- The IdP must return an **email** claim (we request `openid email profile`).
+- The app requests `openid email profile` and loads profile from **UserInfo** (Authelia puts `email` there by default).
+- Optional Authelia hardening — also put email on the ID token:
+
+```yaml
+identity_providers:
+  oidc:
+    claims_policies:
+      rfiddb:
+        id_token:
+          - 'email'
+          - 'email_verified'
+          - 'preferred_username'
+          - 'name'
+    clients:
+      - client_id: 'rfiddb'
+        claims_policy: 'rfiddb'
+        # ...rest of client...
+```
+
 - Local password login stays available alongside SSO.
 - If the button is missing, you are almost certainly on an old image — rebuild.
 
@@ -117,10 +135,26 @@ npm run typecheck
 npm run build
 ```
 
-GitHub Actions runs on every pull request and push to `main`:
+GitHub Actions on every pull request and push to `main`:
 
 1. **lint / typecheck / test / Next.js build**
-2. **`docker build`** — catches Dockerfile parse/build failures (the class of break that conflict markers previously caused)
+2. **Docker image** — build on PRs; on `main` (and `v*` tags) push to GHCR:
+   `ghcr.io/chewbaccalakis/rfid-database`
+
+### Pull the published image
+
+```bash
+docker pull ghcr.io/chewbaccalakis/rfid-database:latest
+# or a specific commit: ghcr.io/chewbaccalakis/rfid-database:sha-<shortsha>
+```
+
+If the package is private, authenticate first:
+
+```bash
+echo $GITHUB_TOKEN | docker login ghcr.io -u USERNAME --password-stdin
+```
+
+Or in Compose, set `image: ghcr.io/chewbaccalakis/rfid-database:latest` and comment out `build:`.
 
 ## Docker
 

docker-compose.yml

@@ -1,9 +1,13 @@
 services:
   rfid-database:
+    # Local build (default):
     build:
       context: .
       dockerfile: Dockerfile
     image: rfid-database:local
+    # Or pull from GHCR instead of building:
+    # image: ghcr.io/chewbaccalakis/rfid-database:latest
+    # pull_policy: always
     container_name: rfid-database
     restart: unless-stopped
     ports:

src/app/login/page.tsx

@@ -6,16 +6,10 @@ import { LoginPageClient } from "@/components/LoginPageClient";
 export const dynamic = "force-dynamic";
 
 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";
-
   return (
     <LoginPageClient
       oidcEnabled={isOidcConfigured()}
       oidcName={process.env.AUTH_OIDC_NAME || "SSO"}
-      callbackUrlHint={callbackUrlHint}
     />
   );
 }

src/components/LoginPageClient.tsx

@@ -8,13 +8,11 @@ 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 {
@@ -36,7 +34,7 @@ function authErrorMessage(code: string | null): string | null {
   }
 }
 
-function LoginForm({ oidcEnabled, oidcName, callbackUrlHint }: Props) {
+function LoginForm({ oidcEnabled, oidcName }: Props) {
   const router = useRouter();
   const params = useSearchParams();
   const callbackUrl = params.get("callbackUrl") || "/";
@@ -62,7 +60,6 @@ function LoginForm({ oidcEnabled, oidcName, callbackUrlHint }: Props) {
 
   const showOidc = runtimeOidc?.oidcEnabled ?? oidcEnabled;
   const displayName = runtimeOidc?.oidcName || oidcName;
-  const redirectHint = runtimeOidc?.callbackUrl || callbackUrlHint;
 
   async function onSubmit(e: FormEvent) {
     e.preventDefault();
@@ -121,7 +118,6 @@ function LoginForm({ oidcEnabled, oidcName, callbackUrlHint }: Props) {
           {loading ? "Signing in…" : "Sign in"}
         </button>
         {showOidc && (
-          <>
           <button
             type="button"
             className="btn btn-secondary"
@@ -129,12 +125,6 @@ function LoginForm({ oidcEnabled, oidcName, callbackUrlHint }: Props) {
           >
             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>

src/lib/auth/auth.ts

@@ -6,9 +6,9 @@ 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";
+import { emailFromOidcProfile, isOidcConfigured } from "@/lib/auth/oidc";
 
-export { isOidcConfigured } from "@/lib/auth/oidc";
+export { emailFromOidcProfile, isOidcConfigured } from "@/lib/auth/oidc";
 
 function buildProviders(): Provider[] {
   const providers: Provider[] = [
@@ -45,6 +45,11 @@ function buildProviders(): Provider[] {
       wellKnown: `${issuer}/.well-known/openid-configuration`,
       clientId: process.env.AUTH_OIDC_CLIENT_ID!,
       clientSecret: process.env.AUTH_OIDC_CLIENT_SECRET!,
+      // Auth.js OIDC defaults to PKCE-only; Authelia requires a strong `state`
+      checks: ["pkce", "state"],
+      // Authelia (and many IdPs) put `email` on UserInfo, not the ID token.
+      // Auth.js OIDC otherwise only reads ID-token claims.
+      idToken: false,
       authorization: {
         params: {
           scope: "openid email profile",
@@ -56,21 +61,16 @@ function buildProviders(): Provider[] {
       // Link OIDC logins to existing local users by email
       allowDangerousEmailAccountLinking: true,
       profile(profile: Record<string, unknown>) {
-        const email =
+        const email = emailFromOidcProfile(profile);
-          (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 ?? ""),
+          id: String(profile.sub ?? email ?? crypto.randomUUID()),
           name:
             (typeof profile.name === "string" && profile.name) ||
             (typeof profile.preferred_username === "string" &&
               profile.preferred_username) ||
             email ||
             "OIDC user",
-          email,
+          email: email ?? undefined,
           image: typeof profile.picture === "string" ? profile.picture : null,
         };
       },
@@ -85,17 +85,24 @@ export const { handlers, auth, signIn, signOut } = NextAuth({
   providers: buildProviders(),
   callbacks: {
     ...authConfig.callbacks,
-    async signIn({ user, account }) {
+    async signIn({ user, account, profile }) {
       if (account?.provider === "credentials") return true;
-      if (!user.email) {
+
+      const email =
+        user.email?.trim().toLowerCase() ||
+        emailFromOidcProfile((profile ?? {}) as Record<string, unknown>);
+
+      if (!email) {
         console.error(
-          "[auth] OIDC sign-in rejected: IdP did not return an email claim. Enable the email scope/claim on the client."
+          "[auth] OIDC sign-in rejected: no email in profile. Claim keys:",
+          profile ? Object.keys(profile) : []
         );
         return "/login?error=EmailRequired";
       }
 
+      user.email = email;
+
       const db = getDb();
-      const email = user.email.toLowerCase();
       let existing = db.select().from(users).where(eq(users.email, email)).get();
       if (!existing) {
         const id = crypto.randomUUID();

src/lib/auth/oidc.ts

@@ -5,3 +5,23 @@ export function isOidcConfigured(): boolean {
       process.env.AUTH_OIDC_CLIENT_SECRET?.trim()
   );
 }
+
+/** Pull an email out of common OIDC claim shapes (Authelia, Keycloak, etc.). */
+export function emailFromOidcProfile(
+  profile: Record<string, unknown>
+): string | null {
+  const candidates = [
+    profile.email,
+    profile.preferred_username,
+    profile.upn,
+    profile.mail,
+    (profile.user as { email?: unknown } | undefined)?.email,
+  ];
+
+  for (const value of candidates) {
+    if (typeof value !== "string") continue;
+    const trimmed = value.trim();
+    if (trimmed.includes("@")) return trimmed.toLowerCase();
+  }
+  return null;
+}

tests/unit/oidc-email.test.ts

@@ -0,0 +1,24 @@
+import { describe, expect, it } from "vitest";
+import { emailFromOidcProfile } from "@/lib/auth/oidc";
+
+describe("emailFromOidcProfile", () => {
+  it("reads email claim", () => {
+    expect(emailFromOidcProfile({ email: "[email protected]" })).toBe(
+      "[email protected]"
+    );
+  });
+
+  it("falls back to preferred_username when it looks like an email", () => {
+    expect(
+      emailFromOidcProfile({ preferred_username: "[email protected]" })
+    ).toBe("[email protected]");
+  });
+
+  it("ignores non-email preferred_username", () => {
+    expect(emailFromOidcProfile({ preferred_username: "nick" })).toBeNull();
+  });
+
+  it("returns null when nothing usable is present", () => {
+    expect(emailFromOidcProfile({ sub: "abc", name: "Nick" })).toBeNull();
+  });
+});