From d47b20326f96b6fff405fcc211719bf3068085ee Mon Sep 17 00:00:00 2001
From: Elias Schneider <login@eliasschneider.com>
Date: Tue, 30 Sep 2025 14:44:08 +0200
Subject: [PATCH] fix: improve back button handling on auth pages

---
 .../src/lib/components/login-wrapper.svelte   |  2 +-
 frontend/src/routes/authorize/+page.svelte    |  2 +-
 frontend/src/routes/login/+page.svelte        |  5 ++++-
 frontend/src/routes/login/+page.ts            |  7 +++++++
 .../login/alternative/code/+page.svelte       | 20 +++++++++----------
 5 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 frontend/src/routes/login/+page.ts

diff --git a/frontend/src/lib/components/login-wrapper.svelte b/frontend/src/lib/components/login-wrapper.svelte
index 7997e246..315180cf 100644
--- a/frontend/src/lib/components/login-wrapper.svelte
+++ b/frontend/src/lib/components/login-wrapper.svelte
@@ -33,7 +33,7 @@
 			alternativeSignInButton.label = m.sign_in_with_login_code();
 		}
 
-		if (page.url.pathname == '/login') {
+		if (page.url.pathname != '/login') {
 			alternativeSignInButton.href = `${alternativeSignInButton.href}?redirect=${encodeURIComponent(page.url.pathname + page.url.search)}`;
 		}
 	});
diff --git a/frontend/src/routes/authorize/+page.svelte b/frontend/src/routes/authorize/+page.svelte
index a70d68ef..0867b817 100644
--- a/frontend/src/routes/authorize/+page.svelte
+++ b/frontend/src/routes/authorize/+page.svelte
@@ -179,7 +179,7 @@
 					{m.try_again()}
 				</Button>
 			{/if}
-			<Button onclick={() => history.back()} class="flex-1" variant="secondary">
+			<Button href={document.referrer || '/'} class="flex-1" variant="secondary">
 				{m.cancel()}
 			</Button>
 		</div>
diff --git a/frontend/src/routes/login/+page.svelte b/frontend/src/routes/login/+page.svelte
index 68133a13..f920286f 100644
--- a/frontend/src/routes/login/+page.svelte
+++ b/frontend/src/routes/login/+page.svelte
@@ -10,6 +10,9 @@
 	import { startAuthentication } from '@simplewebauthn/browser';
 	import { fade } from 'svelte/transition';
 	import LoginLogoErrorSuccessIndicator from './components/login-logo-error-success-indicator.svelte';
+
+	let { data } = $props();
+
 	const webauthnService = new WebAuthnService();
 
 	let isLoading = $state(false);
@@ -24,7 +27,7 @@
 			const user = await webauthnService.finishLogin(authResponse);
 
 			await userStore.setUser(user);
-			goto('/settings');
+			goto(data.redirect || '/settings');
 		} catch (e) {
 			error = getWebauthnErrorMessage(e);
 		}
diff --git a/frontend/src/routes/login/+page.ts b/frontend/src/routes/login/+page.ts
new file mode 100644
index 00000000..8ec2e0c0
--- /dev/null
+++ b/frontend/src/routes/login/+page.ts
@@ -0,0 +1,7 @@
+import type { PageLoad } from './$types';
+
+export const load: PageLoad = async ({ url }) => {
+	return {
+		redirect: url.searchParams.get('redirect') || '/settings'
+	};
+};
diff --git a/frontend/src/routes/login/alternative/code/+page.svelte b/frontend/src/routes/login/alternative/code/+page.svelte
index 38a4277c..a9f861b9 100644
--- a/frontend/src/routes/login/alternative/code/+page.svelte
+++ b/frontend/src/routes/login/alternative/code/+page.svelte
@@ -1,12 +1,10 @@
 <script lang="ts">
-	import { goto } from '$app/navigation';
-	import { page } from '$app/state';
+	import { afterNavigate, goto } from '$app/navigation';
 	import SignInWrapper from '$lib/components/login-wrapper.svelte';
 	import { Button } from '$lib/components/ui/button';
 	import Input from '$lib/components/ui/input/input.svelte';
 	import { m } from '$lib/paraglide/messages';
 	import UserService from '$lib/services/user-service';
-	import appConfigStore from '$lib/stores/application-configuration-store';
 	import userStore from '$lib/stores/user-store.js';
 	import { getAxiosErrorMessage } from '$lib/utils/error-util';
 	import { preventDefault } from '$lib/utils/event-util';
@@ -17,9 +15,17 @@
 	let code = $state(data.code ?? '');
 	let isLoading = $state(false);
 	let error: string | undefined = $state();
+	let backHref = $state('/login/alternative');
 
 	const userService = new UserService();
 
+	// If the previous page is a Pocket ID page, go back there instead of the generic alternative login page
+	afterNavigate((e) => {
+		if (e.from?.url.pathname) {
+			backHref = e.from.url.pathname + e.from.url.search;
+		}
+	});
+
 	async function authenticate() {
 		isLoading = true;
 		try {
@@ -64,13 +70,7 @@
 	<form onsubmit={preventDefault(authenticate)} class="w-full max-w-[450px]">
 		<Input id="Code" class="mt-7" placeholder={m.code()} bind:value={code} type="text" />
 		<div class="mt-8 flex justify-between gap-2">
-			<Button
-				variant="secondary"
-				class="flex-1"
-				href={($appConfigStore.emailOneTimeAccessAsUnauthenticatedEnabled
-					? '/login/alternative'
-					: '/login') + page.url.search}>{m.go_back()}</Button
-			>
+			<Button variant="secondary" class="flex-1" href={backHref}>{m.go_back()}</Button>
 			<Button class="flex-1" type="submit" {isLoading}>{m.submit()}</Button>
 		</div>
 	</form>