Merge pull request 'feat(web): fetch auth settings in server pages' (#20) from t3code/server-side-auth-pages into main

This commit was merged in pull request #20.
This commit is contained in:
joshuafhiggins committed 2026-10-06 11:28:30 -04:00
commit 8828d049b7
3 files changed
+27 -13

No files matched your search

+10 -4
View File
@@ -1,7 +1,13 @@
"use client"
import { fetchQuery } from "convex/nextjs"
import { connection } from "next/server"
import { AuthForm } from "@/components/auth-form"
import { api } from "@otunes/convex/_generated/api"
export default function SignInPage() {
return <AuthForm flow="signIn" />
export default async function SignInPage() {
await connection()
const { disableAccountCreation } = await fetchQuery(api.users.getAppSettings)
return (
<AuthForm flow="signIn" accountCreationDisabled={disableAccountCreation} />
)
}
+10 -4
View File
@@ -1,7 +1,13 @@
"use client"
import { fetchQuery } from "convex/nextjs"
import { connection } from "next/server"
import { AuthForm } from "@/components/auth-form"
import { api } from "@otunes/convex/_generated/api"
export default function SignUpPage() {
return <AuthForm flow="signUp" />
export default async function SignUpPage() {
await connection()
const { disableAccountCreation } = await fetchQuery(api.users.getAppSettings)
return (
<AuthForm flow="signUp" accountCreationDisabled={disableAccountCreation} />
)
}
+7 -5
View File
@@ -4,10 +4,8 @@ import { useState } from "react"
import { useRouter } from "next/navigation"
import Link from "next/link"
import { useAuthActions } from "@convex-dev/auth/react"
import { useQuery } from "convex/react"
import { Button } from "@/components/ui/button"
import { api } from "@otunes/convex/_generated/api"
import {
Card,
CardContent,
@@ -50,15 +48,19 @@ const copy: Record<
},
}
export function AuthForm({ flow }: { flow: AuthFlow }) {
export function AuthForm({
flow,
accountCreationDisabled,
}: {
flow: AuthFlow
accountCreationDisabled: boolean
}) {
const { signIn } = useAuthActions()
const router = useRouter()
const appSettings = useQuery(api.users.getAppSettings)
const [error, setError] = useState<string | null>(null)
const [submitting, setSubmitting] = useState(false)
const text = copy[flow]
const accountCreationDisabled = appSettings?.disableAccountCreation ?? false
const signupsDisabled = flow === "signUp" && accountCreationDisabled
const hideSignUpLink = flow === "signIn" && accountCreationDisabled