From e6396fa2dcf07c5851310f08912d9e7e35d78a57 Mon Sep 17 00:00:00 2001
From: Alexander Bocken <alexander@bocken.org>
Date: Thu, 26 Feb 2026 19:25:43 +0100
Subject: [PATCH] auth: smart login/logout redirect back to original page

Login link now includes callbackUrl for the current page. Logout
redirects intelligently: stays on public pages, falls back to the
recipe detail for /edit/[name], to the recipe root for auth-only
sub-routes (add, favorites, to-try, admin), and to / for cospend.
---
 src/lib/components/UserHeader.svelte          | 28 +++++++++++++++++--
 .../favorites/+page.server.ts                 |  3 +-
 .../to-try/+page.server.ts                    |  7 ++++-
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/lib/components/UserHeader.svelte b/src/lib/components/UserHeader.svelte
index 58e2e2c6..f4527d23 100644
--- a/src/lib/components/UserHeader.svelte
+++ b/src/lib/components/UserHeader.svelte
@@ -1,5 +1,6 @@
 <script lang="ts">
 	import { onMount } from "svelte";
+	import { page } from '$app/stores';
 
 	let { user, recipeLang = 'rezepte', lang = 'de' } = $props();
 
@@ -18,6 +19,29 @@
 			}
 		})
 	})
+
+	function getLogoutCallbackUrl(pathname: string): string {
+		// Cospend has no public equivalent
+		if (pathname.startsWith('/cospend')) return '/';
+
+		// Match /rezepte or /recipes prefix
+		const m = pathname.match(/^\/(rezepte|recipes)(\/.*)?$/);
+		if (m) {
+			const base = `/${m[1]}`;
+			const rest = m[2] ?? '';
+
+			// /edit/[name] → the recipe detail page
+			const editMatch = rest.match(/^\/edit\/(.+)$/);
+			if (editMatch) return `${base}/${editMatch[1]}`;
+
+			// Auth-only sub-routes → recipe root
+			if (/^\/(add|favorites|to-try|admin|administration)(\/|$)/.test(rest))
+				return base;
+		}
+
+		// Public page: stay here
+		return pathname;
+	}
 </script>
 <style>
 	/* (A) SPEECH BOX */
@@ -155,10 +179,10 @@ h2 + p{
 					<li><a href="/{recipeLang}/administration">Administration</a></li>
 				{/if}
 				<li><a href="https://sso.bocken.org/if/user/#/settings" >Einstellungen</a></li>
-				<li><a href="/logout" >Log Out</a></li>
+				<li><a href="/logout?callbackUrl={encodeURIComponent(getLogoutCallbackUrl($page.url.pathname))}">Log Out</a></li>
 			</ul>
 		</div>
 	</button>
 {:else}
-	<a class=entry href=/login>Login</a>
+	<a class=entry href="/login?callbackUrl={encodeURIComponent($page.url.pathname + $page.url.search)}">Login</a>
 {/if}
diff --git a/src/routes/[recipeLang=recipeLang]/favorites/+page.server.ts b/src/routes/[recipeLang=recipeLang]/favorites/+page.server.ts
index 92a7ca2b..34da5e8c 100644
--- a/src/routes/[recipeLang=recipeLang]/favorites/+page.server.ts
+++ b/src/routes/[recipeLang=recipeLang]/favorites/+page.server.ts
@@ -6,7 +6,8 @@ export const load: PageServerLoad = async ({ fetch, locals, params }) => {
     const session = await locals.auth();
 
     if (!session?.user?.nickname) {
-        throw redirect(302, `/${params.recipeLang}`);
+        const callbackUrl = encodeURIComponent(`/${params.recipeLang}/favorites`);
+        throw redirect(302, `/login?callbackUrl=${callbackUrl}`);
     }
 
     try {
diff --git a/src/routes/[recipeLang=recipeLang]/to-try/+page.server.ts b/src/routes/[recipeLang=recipeLang]/to-try/+page.server.ts
index 93e32627..f14cd625 100644
--- a/src/routes/[recipeLang=recipeLang]/to-try/+page.server.ts
+++ b/src/routes/[recipeLang=recipeLang]/to-try/+page.server.ts
@@ -6,7 +6,12 @@ import { dbConnect } from '$utils/db';
 export const load: PageServerLoad = async ({ locals, params }) => {
     const session = await locals.auth();
 
-    if (!session?.user?.groups?.includes('rezepte_users')) {
+    if (!session?.user) {
+        const callbackUrl = encodeURIComponent(`/${params.recipeLang}/to-try`);
+        throw redirect(302, `/login?callbackUrl=${callbackUrl}`);
+    }
+
+    if (!session.user.groups?.includes('rezepte_users')) {
         throw redirect(302, `/${params.recipeLang}`);
     }