From bb8077677644ef1c7c56b22dc07888f6d34717df Mon Sep 17 00:00:00 2001
From: Yuri Tatishchev <itatishch@gmail.com>
Date: Sun, 4 May 2025 18:43:15 -0700
Subject: [PATCH] ui: auth: improve auth form and invite page

---
 .../app/auth-form/auth-button.svelte          | 28 ++++++++++
 .../components/app/auth-form/auth-form.svelte | 56 +++++--------------
 src/routes/invite/[id]/+layout.server.ts      |  5 +-
 src/routes/invite/[id]/+page.svelte           |  4 +-
 4 files changed, 47 insertions(+), 46 deletions(-)
 create mode 100644 src/lib/components/app/auth-form/auth-button.svelte

diff --git a/src/lib/components/app/auth-form/auth-button.svelte b/src/lib/components/app/auth-form/auth-button.svelte
new file mode 100644
index 0000000..0fec16f
--- /dev/null
+++ b/src/lib/components/app/auth-form/auth-button.svelte
@@ -0,0 +1,28 @@
+<script lang="ts">
+	import { LucideLoaderCircle } from '@lucide/svelte';
+	import { Button } from '$lib/components/ui/button';
+
+	interface Props {
+		providerName: string;
+		displayName: string;
+		iconSrc: string;
+		inviteToken?: string;
+	}
+	let { providerName, displayName, inviteToken, iconSrc }: Props = $props();
+
+	let submitted = $state(false);
+</script>
+
+<form method="get" onsubmit={() => (submitted = true)} action="/auth/{providerName}">
+	{#if inviteToken}
+		<input type="hidden" value={inviteToken} name="invite" />
+	{/if}
+	<Button type="submit" disabled={submitted}>
+		{#if submitted}
+			<LucideLoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+		{:else}
+			<img class="mr-2 h-4 w-4" alt="{displayName} Logo" src={iconSrc} />
+		{/if}
+		Sign {inviteToken ? 'up' : 'in'} with {displayName}
+	</Button>
+</form>
diff --git a/src/lib/components/app/auth-form/auth-form.svelte b/src/lib/components/app/auth-form/auth-form.svelte
index 2a19451..d1c332b 100644
--- a/src/lib/components/app/auth-form/auth-form.svelte
+++ b/src/lib/components/app/auth-form/auth-form.svelte
@@ -1,54 +1,26 @@
 <script lang="ts">
-	import { LucideLoaderCircle } from '@lucide/svelte';
-	import { Button } from '$lib/components/ui/button';
 	import { cn } from '$lib/utils.js';
 	import googleIcon from '$lib/assets/google.svg';
 	import { enabledAuthProviders } from '$lib/auth';
+	import AuthButton from './auth-button.svelte';
 
-	let { inviteToken, class: className, ...rest }: {
+	interface Props {
 		inviteToken?: string;
 		class?: string;
-		rest?: { [p: string]: unknown }
-	} = $props();
-
-	let submitted = $state(false);
+	}
+	let { inviteToken, class: className }: Props = $props();
 </script>
 
-<div class={cn('flex gap-6', className)} {...rest}>
-	{#if enabledAuthProviders.authentik }
-	<form method="get" onsubmit={() => submitted = true}
-				action="/auth/authentik{inviteToken ? `?invite=${inviteToken}` : ''}">
-		<input type="hidden" value={inviteToken} name="invite" />
-		<Button type="submit" disabled={submitted}>
-			{#if submitted}
-				<LucideLoaderCircle class="mr-2 h-4 w-4 animate-spin" />
-			{:else}
-				<img
-					class="mr-2 h-4 w-4"
-					alt="Authentik Logo"
-					src="https://auth.cazzzer.com/static/dist/assets/icons/icon.svg"
-				/>
-			{/if}
-			Sign in with Authentik
-		</Button>
-	</form>
+<div class={cn('flex gap-6', className)}>
+	{#if enabledAuthProviders.authentik}
+		<AuthButton
+			providerName="authentik"
+			displayName="Authentik"
+			iconSrc="https://auth.cazzzer.com/static/dist/assets/icons/icon.svg"
+			{inviteToken}
+		/>
 	{/if}
-	{#if enabledAuthProviders.google }
-	<form method="get" onsubmit={() => submitted = true}
-				action="/auth/google{inviteToken ? `?invite=${inviteToken}` : ''}">
-		<input type="hidden" value={inviteToken} name="invite" />
-		<Button type="submit" disabled={submitted}>
-			{#if submitted}
-				<LucideLoaderCircle class="mr-2 h-4 w-4 animate-spin" />
-			{:else}
-				<img
-					class="mr-2 h-4 w-4"
-					alt="Google Logo"
-					src={googleIcon}
-				/>
-			{/if}
-			Sign in with Google
-		</Button>
-	</form>
+	{#if enabledAuthProviders.google}
+		<AuthButton providerName="google" displayName="Google" iconSrc={googleIcon} {inviteToken} />
 	{/if}
 </div>
diff --git a/src/routes/invite/[id]/+layout.server.ts b/src/routes/invite/[id]/+layout.server.ts
index 31cbbcd..faebc7c 100644
--- a/src/routes/invite/[id]/+layout.server.ts
+++ b/src/routes/invite/[id]/+layout.server.ts
@@ -2,6 +2,7 @@ import type { LayoutServerLoad } from './$types';
 import { redirect } from '@sveltejs/kit';
 import { isValidInviteToken } from '$lib/server/auth';
 
-export const load: LayoutServerLoad = ({ params }) => {
-	if (!isValidInviteToken(params.id)) redirect(307, '/')
+export const load: LayoutServerLoad = ({ params, locals }) => {
+	if (!isValidInviteToken(params.id)) redirect(302, '/');
+	if (locals.user !== null) redirect(302, '/');
 };
diff --git a/src/routes/invite/[id]/+page.svelte b/src/routes/invite/[id]/+page.svelte
index 5cbdd6b..d1b8391 100644
--- a/src/routes/invite/[id]/+page.svelte
+++ b/src/routes/invite/[id]/+page.svelte
@@ -10,7 +10,7 @@
 </svelte:head>
 
 <h1 class="mb-2 scroll-m-20 text-center text-3xl font-extrabold tracking-tight lg:text-4xl">
-	Welcome to VPGen
+	You are invited to VPGen
 </h1>
 
-<AuthForm inviteToken={inviteToken} />
+<AuthForm {inviteToken} />