src/lib/components/app/auth-form/auth-button.svelte

@@ -1,28 +0,0 @@
-<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>

src/lib/components/app/auth-form/auth-form.svelte

@@ -1,26 +1,54 @@
 <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';
 
-	interface Props {
+	let { inviteToken, class: className, ...rest }: {
 		inviteToken?: string;
 		class?: string;
-	}
-	let { inviteToken, class: className }: Props = $props();
+		rest?: { [p: string]: unknown }
+	} = $props();
+
+	let submitted = $state(false);
 </script>
 
-<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}
-		/>
+<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>
 	{/if}
-	{#if enabledAuthProviders.google}
-		<AuthButton providerName="google" displayName="Google" iconSrc={googleIcon} {inviteToken} />
+	{#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}
 </div>

src/routes/invite/[id]/+layout.server.ts

@@ -2,7 +2,6 @@ import type { LayoutServerLoad } from './$types';
 import { redirect } from '@sveltejs/kit';
 import { isValidInviteToken } from '$lib/server/auth';
 
-export const load: LayoutServerLoad = ({ params, locals }) => {
-	if (!isValidInviteToken(params.id)) redirect(302, '/');
-	if (locals.user !== null) redirect(302, '/');
+export const load: LayoutServerLoad = ({ params }) => {
+	if (!isValidInviteToken(params.id)) redirect(307, '/')
 };

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">
-	You are invited to VPGen
+	Welcome to VPGen
 </h1>
 
-<AuthForm {inviteToken} />
+<AuthForm inviteToken={inviteToken} />