Fix the no-org redirect loop and swallowed Google sign-in errors
Redirect chain traced across middleware.ts, ChromeSwitcher.tsx and
AuthProvider.tsx before touching anything, per the ask. Those three were
already correct as of c7f985d/2a1d52b/83416fe (middleware exempts
/onboarding and /signup from the drb_session cookie gate, ChromeSwitcher
sends any signed-in no-org user to /onboarding, AuthProvider only sets the
cookie once an org_id claim exists). The actual loop was one file upstream
of all three: app/login/page.tsx hardcoded `router.push("/dashboard")`
after both the email/password and Google handlers resolved. That push
races AuthProvider's async onAuthStateChanged -> getIdTokenResult ->
cookie decision. For a no-org account the cookie never gets set, so
middleware bounces the very next request back to /login with no
explanation — the ping-pong the coordinator saw live.
Fix: login page no longer navigates from the handlers. It waits on
AuthProvider's own `loading`/`orgId` and redirects once claims are
settled (/dashboard with org_id, /onboarding without). This also fixes a
second case: a user who lands on /login already signed in (e.g. bounced
there by middleware while their Firebase session was still valid) now
gets routed the same way instead of sitting inert on a login form with no
feedback. /onboarding itself (org-name form, single action) was already
adequate as the "explain the state" screen once the loop stopped
recreating it.
Also, live tonight: Google sign-in was failing outright in prod with no
console/network trace. app/login/page.tsx's Google handler did
`catch { setError("Google sign-in failed. Try again.") }` — no binding,
error discarded. Added lib/authErrors.ts: logs the raw error, and maps
Firebase codes to messages that distinguish two categories — the user's
own situation (popup blocked/closed, bad password, network) says "try
again"; deployment misconfiguration (auth/unauthorized-domain,
auth/operation-not-allowed) says so explicitly and does not suggest
retrying, since retrying can't fix a missing authorized-domain entry or a
disabled provider. Applied to both handlers in login/page.tsx and both
in signup/page.tsx (same swallowing pattern, same fix). Per the
coordinator's steer: this is diagnosis only — no popup-to-redirect
fallback, no auth method change. If production is hitting
auth/unauthorized-domain, that's a Firebase Console fix
(drb.cusano.net -> Authorized domains), not a code fix.
Nav.tsx: sign-out was only reachable from /profile. Added a profile
dropdown (desktop) and drawer entries (mobile) with Profile / Refresh
access / Sign out, so sign-out is reachable from anywhere in the app.
"Refresh access" calls AuthProvider.refreshClaims() (already existed,
already used by /onboarding after signup) so a user whose role or org
was just changed server-side can pick it up without a full logout.
Decision on unknown Google accounts (point 4): kept self-serve org
creation via /onboarding rather than a "request access" pending state.
BUSINESS_MODEL.md #2.1 already answers this for the owner: "a limited
free public tier *and* full paid access without contributing... cash is
the primary revenue line from day one." A pending-approval gate would
contradict that — it would make org creation itself the thing being
gated, when the model explicitly does not want contribution (or approval)
to be the only door. Self-serve org provisioning via POST /auth/signup
was already built for this (2a1d52b) and needed no further gating
decision, just for the loop in front of it to stop.
Reversible: no schema change, no new gating, no billing/Stripe touched.
Bench: rsync'd to the WSL-native ~/drb-frontend workspace and ran
`npx tsc --noEmit` there (per CLAUDE.md — the H: drive install path is
not viable) — exit 0, no errors. No Python touched this pass.
This commit is contained in:
@@ -1,48 +1,74 @@
|
||||
"use client";
|
||||
|
||||
import { useState } from "react";
|
||||
import { useEffect, useState } from "react";
|
||||
import Link from "next/link";
|
||||
import { signInWithEmailAndPassword, GoogleAuthProvider, signInWithPopup } from "firebase/auth";
|
||||
import { auth } from "@/lib/firebase";
|
||||
import { c2api } from "@/lib/c2api";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { useAuth } from "@/components/AuthProvider";
|
||||
import { describeAuthError } from "@/lib/authErrors";
|
||||
|
||||
export default function LoginPage() {
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [misconfigured, setMisconfigured] = useState(false);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
const router = useRouter();
|
||||
const { user, loading: authLoading, orgId } = useAuth();
|
||||
|
||||
// Do NOT navigate straight from the sign-in handlers below: signInWith*
|
||||
// resolves before AuthProvider's onAuthStateChanged listener has fetched
|
||||
// claims and set/cleared the drb_session cookie. Pushing to /dashboard
|
||||
// immediately races that — for a no-org account the cookie never gets
|
||||
// set, so middleware.ts bounces the very next request straight back to
|
||||
// /login, which is the ping-pong this screen used to cause. Instead,
|
||||
// react to AuthProvider's own settled state: this also covers a user who
|
||||
// arrives here already signed in (e.g. redirected from a protected route
|
||||
// by middleware while their Firebase session was still valid) — same
|
||||
// destination logic, no separate code path, no bounce.
|
||||
useEffect(() => {
|
||||
if (authLoading) return;
|
||||
if (!user) return;
|
||||
router.replace(orgId ? "/dashboard" : "/onboarding");
|
||||
}, [authLoading, user, orgId, router]);
|
||||
|
||||
async function handleSubmit(e: React.FormEvent) {
|
||||
e.preventDefault();
|
||||
setLoading(true);
|
||||
setSubmitting(true);
|
||||
setError(null);
|
||||
setMisconfigured(false);
|
||||
try {
|
||||
await signInWithEmailAndPassword(auth, email, password);
|
||||
c2api.recordSession().catch(() => {});
|
||||
router.push("/dashboard");
|
||||
} catch {
|
||||
setError("Invalid email or password.");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
// Redirect happens via the effect above once claims are settled.
|
||||
} catch (err) {
|
||||
const info = describeAuthError(err, "Invalid email or password.");
|
||||
setError(info.message);
|
||||
setMisconfigured(info.misconfiguration);
|
||||
setSubmitting(false);
|
||||
}
|
||||
}
|
||||
|
||||
async function handleGoogle() {
|
||||
setLoading(true);
|
||||
setSubmitting(true);
|
||||
setError(null);
|
||||
setMisconfigured(false);
|
||||
try {
|
||||
await signInWithPopup(auth, new GoogleAuthProvider());
|
||||
c2api.recordSession().catch(() => {});
|
||||
router.push("/dashboard");
|
||||
} catch {
|
||||
setError("Google sign-in failed. Try again.");
|
||||
} finally {
|
||||
setLoading(false);
|
||||
// Redirect happens via the effect above once claims are settled.
|
||||
} catch (err) {
|
||||
const info = describeAuthError(err, "Google sign-in failed. Try again.");
|
||||
setError(info.message);
|
||||
setMisconfigured(info.misconfiguration);
|
||||
setSubmitting(false);
|
||||
}
|
||||
}
|
||||
|
||||
const loading = submitting || !!user;
|
||||
|
||||
return (
|
||||
<div className="max-w-sm mx-auto pt-16">
|
||||
<Link href="/" className="flex items-center justify-center gap-2 mb-6 font-mono font-bold text-white">
|
||||
@@ -75,7 +101,9 @@ export default function LoginPage() {
|
||||
className="w-full bg-gray-800 border border-gray-700 rounded-lg px-3 py-2 text-white text-sm focus:outline-none focus:border-indigo-500"
|
||||
/>
|
||||
</div>
|
||||
{error && <p className="text-red-400 text-xs">{error}</p>}
|
||||
{error && (
|
||||
<p className={`text-xs ${misconfigured ? "text-amber-400" : "text-red-400"}`}>{error}</p>
|
||||
)}
|
||||
<button
|
||||
type="submit"
|
||||
disabled={loading}
|
||||
|
||||
@@ -5,6 +5,7 @@ import Link from "next/link";
|
||||
import { createUserWithEmailAndPassword, GoogleAuthProvider, signInWithPopup } from "firebase/auth";
|
||||
import { auth } from "@/lib/firebase";
|
||||
import { useRouter } from "next/navigation";
|
||||
import { describeAuthError } from "@/lib/authErrors";
|
||||
|
||||
/**
|
||||
* Self-serve account creation (SAAS_PLAN.md B4). Only creates the Firebase
|
||||
@@ -17,6 +18,7 @@ export default function SignupPage() {
|
||||
const [email, setEmail] = useState("");
|
||||
const [password, setPassword] = useState("");
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [misconfigured, setMisconfigured] = useState(false);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const router = useRouter();
|
||||
|
||||
@@ -24,18 +26,14 @@ export default function SignupPage() {
|
||||
e.preventDefault();
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
setMisconfigured(false);
|
||||
try {
|
||||
await createUserWithEmailAndPassword(auth, email, password);
|
||||
router.push("/onboarding");
|
||||
} catch (err: unknown) {
|
||||
const code = (err as { code?: string })?.code;
|
||||
if (code === "auth/email-already-in-use") {
|
||||
setError("An account with this email already exists. Try signing in instead.");
|
||||
} else if (code === "auth/weak-password") {
|
||||
setError("Password is too weak — use at least 6 characters.");
|
||||
} else {
|
||||
setError("Could not create your account. Check your details and try again.");
|
||||
}
|
||||
} catch (err) {
|
||||
const info = describeAuthError(err, "Could not create your account. Check your details and try again.");
|
||||
setError(info.message);
|
||||
setMisconfigured(info.misconfiguration);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -44,11 +42,14 @@ export default function SignupPage() {
|
||||
async function handleGoogle() {
|
||||
setLoading(true);
|
||||
setError(null);
|
||||
setMisconfigured(false);
|
||||
try {
|
||||
await signInWithPopup(auth, new GoogleAuthProvider());
|
||||
router.push("/onboarding");
|
||||
} catch {
|
||||
setError("Google sign-up failed. Try again.");
|
||||
} catch (err) {
|
||||
const info = describeAuthError(err, "Google sign-up failed. Try again.");
|
||||
setError(info.message);
|
||||
setMisconfigured(info.misconfiguration);
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -87,7 +88,9 @@ export default function SignupPage() {
|
||||
className="w-full bg-gray-800 border border-gray-700 rounded-lg px-3 py-2 text-white text-sm focus:outline-none focus:border-indigo-500"
|
||||
/>
|
||||
</div>
|
||||
{error && <p className="text-red-400 text-xs">{error}</p>}
|
||||
{error && (
|
||||
<p className={`text-xs ${misconfigured ? "text-amber-400" : "text-red-400"}`}>{error}</p>
|
||||
)}
|
||||
<button
|
||||
type="submit"
|
||||
disabled={loading}
|
||||
|
||||
@@ -61,16 +61,37 @@ function MoonIcon() {
|
||||
}
|
||||
|
||||
export function Nav() {
|
||||
const { user, isAdmin, isOperator, isOrgOwner, orgId } = useAuth();
|
||||
const { user, isAdmin, isOperator, isOrgOwner, orgId, signOut, refreshClaims } = useAuth();
|
||||
const pathname = usePathname();
|
||||
const router = useRouter();
|
||||
const { nodes: pending } = useUnconfiguredNodes();
|
||||
const unackedAlerts = useUnacknowledgedAlerts();
|
||||
const { theme, toggle } = useTheme();
|
||||
const [mobileOpen, setMobileOpen] = useState(false);
|
||||
const [profileMenuOpen, setProfileMenuOpen] = useState(false);
|
||||
const [refreshing, setRefreshing] = useState(false);
|
||||
|
||||
if (!user) return null;
|
||||
|
||||
async function handleSignOut() {
|
||||
setProfileMenuOpen(false);
|
||||
await signOut();
|
||||
router.push("/login");
|
||||
}
|
||||
|
||||
// Re-fetches the ID token so a claims change made server-side (e.g. an
|
||||
// admin granting a role, or org_id being provisioned) takes effect without
|
||||
// a full sign-out/sign-in. See AuthProvider.refreshClaims.
|
||||
async function handleRefreshClaims() {
|
||||
setRefreshing(true);
|
||||
try {
|
||||
await refreshClaims();
|
||||
} finally {
|
||||
setRefreshing(false);
|
||||
setProfileMenuOpen(false);
|
||||
}
|
||||
}
|
||||
|
||||
const allLinks = [
|
||||
...viewerLinks,
|
||||
...(orgId === FOUNDING_ORG_ID || isAdmin ? [tripsLink] : []),
|
||||
@@ -120,18 +141,51 @@ export function Nav() {
|
||||
{theme === "dark" ? <SunIcon /> : <MoonIcon />}
|
||||
</button>
|
||||
|
||||
{/* Profile avatar (desktop) */}
|
||||
<button
|
||||
onClick={() => router.push("/profile")}
|
||||
className={`hidden md:flex items-center justify-center w-7 h-7 rounded-full text-xs font-bold transition-colors ${
|
||||
pathname.startsWith("/profile")
|
||||
? "bg-indigo-600 text-white"
|
||||
: "bg-gray-800 text-gray-300 hover:bg-gray-700"
|
||||
}`}
|
||||
title="Profile"
|
||||
>
|
||||
{(user?.displayName || user?.email || "?")[0].toUpperCase()}
|
||||
</button>
|
||||
{/* Profile avatar + dropdown (desktop) */}
|
||||
<div className="hidden md:block relative">
|
||||
<button
|
||||
onClick={() => setProfileMenuOpen((v) => !v)}
|
||||
className={`flex items-center justify-center w-7 h-7 rounded-full text-xs font-bold transition-colors ${
|
||||
pathname.startsWith("/profile") || profileMenuOpen
|
||||
? "bg-indigo-600 text-white"
|
||||
: "bg-gray-800 text-gray-300 hover:bg-gray-700"
|
||||
}`}
|
||||
title="Account"
|
||||
>
|
||||
{(user?.displayName || user?.email || "?")[0].toUpperCase()}
|
||||
</button>
|
||||
|
||||
{profileMenuOpen && (
|
||||
<>
|
||||
{/* Click-away backdrop */}
|
||||
<div className="fixed inset-0 z-40" onClick={() => setProfileMenuOpen(false)} />
|
||||
<div className="absolute right-0 mt-2 w-48 bg-gray-900 border border-gray-800 rounded-lg shadow-lg z-50 py-1 font-mono text-sm">
|
||||
<Link
|
||||
href="/profile"
|
||||
onClick={() => setProfileMenuOpen(false)}
|
||||
className="block px-3 py-2 text-gray-300 hover:bg-gray-800 hover:text-white transition-colors"
|
||||
>
|
||||
Profile
|
||||
</Link>
|
||||
<button
|
||||
onClick={handleRefreshClaims}
|
||||
disabled={refreshing}
|
||||
className="w-full text-left px-3 py-2 text-gray-300 hover:bg-gray-800 hover:text-white transition-colors disabled:opacity-50"
|
||||
title="Pick up a role or org change made server-side, without signing out"
|
||||
>
|
||||
{refreshing ? "Refreshing…" : "Refresh access"}
|
||||
</button>
|
||||
<div className="border-t border-gray-800 my-1" />
|
||||
<button
|
||||
onClick={handleSignOut}
|
||||
className="w-full text-left px-3 py-2 text-red-500 hover:bg-gray-800 hover:text-red-400 transition-colors"
|
||||
>
|
||||
Sign out
|
||||
</button>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
|
||||
{/* Hamburger (mobile) */}
|
||||
<button
|
||||
@@ -177,7 +231,7 @@ export function Nav() {
|
||||
)}
|
||||
</Link>
|
||||
))}
|
||||
<div className="border-t border-gray-800 pt-3 mt-1">
|
||||
<div className="border-t border-gray-800 pt-3 mt-1 flex flex-col gap-1">
|
||||
<Link
|
||||
href="/profile"
|
||||
onClick={() => setMobileOpen(false)}
|
||||
@@ -187,6 +241,19 @@ export function Nav() {
|
||||
>
|
||||
Profile
|
||||
</Link>
|
||||
<button
|
||||
onClick={() => { setMobileOpen(false); handleRefreshClaims(); }}
|
||||
disabled={refreshing}
|
||||
className="py-2 text-sm font-mono text-gray-500 text-left disabled:opacity-50"
|
||||
>
|
||||
{refreshing ? "Refreshing…" : "Refresh access"}
|
||||
</button>
|
||||
<button
|
||||
onClick={() => { setMobileOpen(false); handleSignOut(); }}
|
||||
className="py-2 text-sm font-mono text-red-500 text-left"
|
||||
>
|
||||
Sign out
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
/**
|
||||
* Maps Firebase Auth error codes to user-facing messages instead of
|
||||
* discarding them. Two categories:
|
||||
*
|
||||
* - misconfiguration: something is wrong with *our* deployment (a domain
|
||||
* not on the authorized list, a sign-in provider not enabled in the
|
||||
* Firebase console). Retrying can never fix these — the message says so
|
||||
* instead of "try again", which would send a user into a retry loop
|
||||
* against a config problem only we can fix.
|
||||
* - everything else: the user's own situation (blocked/closed popup, bad
|
||||
* password, a network blip) — retrying might well work.
|
||||
*
|
||||
* Always logs the raw error so it isn't silently discarded — the point of
|
||||
* this file is to stop swallowing that information, not just relabel it.
|
||||
*/
|
||||
|
||||
export interface AuthErrorInfo {
|
||||
message: string;
|
||||
misconfiguration: boolean;
|
||||
}
|
||||
|
||||
const MISCONFIGURATION_MESSAGES: Record<string, string> = {
|
||||
"auth/unauthorized-domain":
|
||||
"This domain isn't authorized for sign-in yet. That's a configuration issue on our end (Firebase Console → Authentication → Settings → Authorized domains) — retrying won't fix it. Please report this.",
|
||||
"auth/operation-not-allowed":
|
||||
"This sign-in method isn't enabled for this app yet. That's a configuration issue on our end (Firebase Console → Authentication → Sign-in method) — retrying won't fix it. Please report this.",
|
||||
};
|
||||
|
||||
const USER_MESSAGES: Record<string, string> = {
|
||||
"auth/popup-blocked": "Your browser blocked the sign-in popup. Allow popups for this site and try again.",
|
||||
"auth/popup-closed-by-user": "Sign-in window was closed before finishing. Try again.",
|
||||
"auth/cancelled-popup-request": "Sign-in was interrupted by another sign-in attempt. Try again.",
|
||||
"auth/network-request-failed": "Network error — check your connection and try again.",
|
||||
"auth/invalid-credential": "Invalid email or password.",
|
||||
"auth/wrong-password": "Invalid email or password.",
|
||||
"auth/user-not-found": "Invalid email or password.",
|
||||
"auth/too-many-requests": "Too many attempts. Wait a few minutes and try again.",
|
||||
"auth/email-already-in-use": "An account with this email already exists. Try signing in instead.",
|
||||
"auth/weak-password": "Password is too weak — use at least 6 characters.",
|
||||
};
|
||||
|
||||
export function describeAuthError(err: unknown, fallback: string): AuthErrorInfo {
|
||||
const code = (err as { code?: string } | null | undefined)?.code;
|
||||
|
||||
// eslint-disable-next-line no-console
|
||||
console.error("[auth]", code ?? "(no error code)", err);
|
||||
|
||||
if (code && MISCONFIGURATION_MESSAGES[code]) {
|
||||
return { message: MISCONFIGURATION_MESSAGES[code], misconfiguration: true };
|
||||
}
|
||||
if (code && USER_MESSAGES[code]) {
|
||||
return { message: USER_MESSAGES[code], misconfiguration: false };
|
||||
}
|
||||
return { message: fallback, misconfiguration: false };
|
||||
}
|
||||
Reference in New Issue
Block a user