Skip to content

armgit / alook

Public Imported from GitHub
0

Multi-Agent Collaboration for Team and Friends

fix(auth): prevent lost email-entry clicks before hydration (#1158)

Gustavo Yea3505b5e2a7c
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts b/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts
index f7df021fc..3f608a611 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts
+++ b/src/web/src/app/(auth)/sign-in/sign-in-client.dom.test.ts
@@ -1,4 +1,5 @@
import { createElement } from "react"
+import { renderToString } from "react-dom/server"
import { beforeEach, describe, expect, it, vi } from "vitest"
import { act, fireEvent, render, screen, setupUser } from "@/test/react-dom-harness"
import type { LoginMethod } from "@/lib/last-login-method"
@@ -100,6 +101,25 @@ describe("sign-in client layout, consent-on-continue, and last-used method", ()
})) as never
})
+ it("enables the same email entry only after hydration and handles its first enabled click", async () => {
+ const element = createElement(SignInPageClient, { isProd: true, appleEnabled: true })
+ const container = document.createElement("div")
+ container.innerHTML = renderToString(element)
+ document.body.appendChild(container)
+ const entry = Array.from(container.querySelectorAll("button")).find(button => button.textContent === "Continue with email")!
+ expect(entry).toBeDisabled()
+ const user = setupUser()
+ await user.click(entry)
+ expect(container.querySelector('input[type="email"]')).toBeNull()
+
+ render(element, { container, hydrate: true })
+ expect(screen.getByRole("button", { name: "Continue with email", exact: true })).toBe(entry)
+ expect(entry).toBeEnabled()
+ await user.click(entry)
+ expect(screen.getByRole("textbox", { name: "Email" })).toBeVisible()
+ expect(mocks.send).not.toHaveBeenCalled()
+ })
+
it("shows only method buttons before opening a separate email screen", async () => {
render(createElement(SignInPageClient, { isProd: true, appleEnabled: true }))
expect(screen.queryByRole("textbox")).toBeNull()
diff --git a/src/web/src/app/(auth)/sign-in/sign-in-client.tsx b/src/web/src/app/(auth)/sign-in/sign-in-client.tsx
index c65f02d07..e427c1ace 100644
--- a/src/web/src/app/(auth)/sign-in/sign-in-client.tsx
+++ b/src/web/src/app/(auth)/sign-in/sign-in-client.tsx
@@ -6,6 +6,7 @@ import { ObservedStaticContent } from "@/lib/observability/regions"
import { useAtom, useCreateAtom } from "@tanstack/react-store"
import { useCallback, useEffect, useRef } from "react"
import { useSearchParams } from "next/navigation"
+import { useHydratedClient } from "@/hooks/use-hydrated-client"
import { signIn, signUp, authClient } from "@/lib/auth-client"
import {
normalizeLoginMethod,
@@ -83,6 +84,8 @@ function SignInForm({
appleEnabled: boolean
initialLastUsedMethod?: LoginMethod | null
}) {
+ const hydrated = useHydratedClient()
+
useEffect(() => {
void captureProductAnalytics({ event: "login_page_view" })
}, [])
@@ -429,7 +432,7 @@ function SignInForm({
</FieldSeparator>
<div className="relative">
- <Button variant="outline" size="lg" type="button" aria-describedby={isEmailLastUsed ? "last-used-email-badge" : undefined} className="h-11 w-full justify-start px-4 text-sm font-medium" onClick={() => switchMethodsStep("email")}>
+ <Button variant="outline" size="lg" type="button" aria-describedby={isEmailLastUsed ? "last-used-email-badge" : undefined} className="h-11 w-full justify-start px-4 text-sm font-medium" disabled={!hydrated} onClick={() => switchMethodsStep("email")}>
<span className="flex items-center gap-2"><span className="grid h-9 w-6 place-items-center"><Mail className="size-4" aria-hidden /></span>Continue with email</span>
</Button>
{isEmailLastUsed ? <span id="last-used-email-badge" data-testid="last-used-email" className="pointer-events-none absolute -top-2 right-3 rounded-md border border-border bg-background px-1.5 text-[10px] leading-4 font-medium text-muted-foreground">Last used</span> : null}