From 0d62f08e774d69a8a3380b32399062d5e519a299 Mon Sep 17 00:00:00 2001
From: pavel444-byte <pavel.melnikov.kid.1993@gmail.com>
Date: Sat, 31 Oct 2026 13:56:01 +0500
Subject: [PATCH] Fix login return routes and recovery feedback

---
 components/AccountSettings.tsx |  5 +++--
 components/MapCommunity.tsx    |  5 ++++-
 components/StartGame.tsx       |  6 +++++-
 components/TournamentLobby.tsx | 14 ++++++++++++--
 shared/account.ts              |  7 +++++++
 tests/account.test.ts          | 17 ++++++++++++++++-
 6 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/components/AccountSettings.tsx b/components/AccountSettings.tsx
index 219cecc..c988c7d 100644
--- a/components/AccountSettings.tsx
+++ b/components/AccountSettings.tsx
@@ -158,6 +158,7 @@ export function AccountSettings({
   async function recover() {
     setSending(true);
     setRecoveryError("");
+    setRecoveryMessage("");
     try {
       const data = await api<{ message: string }>("auth", {
         action: "recover",
@@ -344,12 +345,12 @@ export function AccountSettings({
           </button>
           {recoveryMessage && (
             <p role="status" className="success-message">
-              {recoveryMessage}
+              {t(recoveryMessage)}
             </p>
           )}
           {recoveryError && (
             <p role="alert" className="error-message">
-              {recoveryError}
+              {t(recoveryError)}
             </p>
           )}
         </div>
diff --git a/components/MapCommunity.tsx b/components/MapCommunity.tsx
index cc6e29a..c314f1d 100644
--- a/components/MapCommunity.tsx
+++ b/components/MapCommunity.tsx
@@ -145,7 +145,10 @@ export function MapCommunity({
           </div>
           {!data.viewer && (
             <p>
-              <Link className="button" href="/log-in">
+              <Link
+                className="button"
+                href={`/log-in?next=${encodeURIComponent(`/servers/${datasetId}`)}`}
+              >
                 {t("Sign in to react, comment, or report.")}
               </Link>
             </p>
diff --git a/components/StartGame.tsx b/components/StartGame.tsx
index e2cfc09..e58613b 100644
--- a/components/StartGame.tsx
+++ b/components/StartGame.tsx
@@ -338,7 +338,11 @@ export function StartGame({
           ) : (
             <p className="muted">
               {t("Log in to create a multiplayer room")}{" "}
-              <Link href="/log-in?next=/servers">{t("Log in")}</Link>
+              <Link
+                href={`/log-in?next=${encodeURIComponent(`/servers/${datasetId}`)}`}
+              >
+                {t("Log in")}
+              </Link>
             </p>
           )}
           <label htmlFor="room-player-limit">
diff --git a/components/TournamentLobby.tsx b/components/TournamentLobby.tsx
index 3d862ae..b16954a 100644
--- a/components/TournamentLobby.tsx
+++ b/components/TournamentLobby.tsx
@@ -157,7 +157,14 @@ export function TournamentIndex({
             {t(creating ? "Close" : "Create tournament")}
           </button>
         ) : (
-          <Link href="/log-in" className="button primary">
+          <Link
+            href={`/log-in?next=${encodeURIComponent(
+              initialMapId
+                ? `/tournaments?map=${initialMapId}`
+                : "/tournaments",
+            )}`}
+            className="button primary"
+          >
             {t("Log in to create or join")}
           </Link>
         )}
@@ -595,7 +602,10 @@ export function TournamentLobby({
         {event.status === "scheduled" && (
           <div className="tournament-actions">
             {!signedIn ? (
-              <Link className="button primary" href="/log-in">
+              <Link
+                className="button primary"
+                href={`/log-in?next=${encodeURIComponent(`/tournaments/${id}`)}`}
+              >
                 {t("Log in to create or join")}
               </Link>
             ) : joined ? (
diff --git a/shared/account.ts b/shared/account.ts
index 08706b7..554a8ea 100644
--- a/shared/account.ts
+++ b/shared/account.ts
@@ -77,9 +77,16 @@ export function authDestination(value: string | null | undefined): string {
     value === "/dashboard" ||
     value === "/servers" ||
     value === "/support" ||
+    value === "/tournaments" ||
+    value === "/ban/appeal" ||
+    value === "/dev/api" ||
+    value === "/admin" ||
+    value === "/moderation" ||
     value === "/auth/reset-password"
   )
     return value;
+  if (value && /^\/(?:servers|tournaments)\/[0-9a-f-]{36}$/i.test(value))
+    return value;
   if (value && /^\/dashboard\/[0-9a-f-]{36}$/i.test(value)) return value;
   if (value && /^\/support\/[0-9a-f-]{36}$/i.test(value)) return value;
   if (value && /^\/tournaments\?map=[0-9a-f-]{36}$/i.test(value)) return value;
diff --git a/tests/account.test.ts b/tests/account.test.ts
index 258fd02..a4d4fd5 100644
--- a/tests/account.test.ts
+++ b/tests/account.test.ts
@@ -84,7 +84,22 @@ test("authentication redirects accept supported local routes and reject open red
     assert.equal(authDestination(next), "/dashboard");
   assert.equal(authDestination("/settings"), "/settings");
   assert.equal(authDestination("/servers"), "/servers");
-  const tournamentMap = "/tournaments?map=123e4567-e89b-12d3-a456-426614174000";
+  const id = "123e4567-e89b-12d3-a456-426614174000";
+  for (const next of [
+    "/ban/appeal",
+    "/dev/api",
+    "/admin",
+    "/moderation",
+    "/tournaments",
+    `/servers/${id}`,
+    `/tournaments/${id}`,
+  ])
+    assert.equal(authDestination(next), next);
+  assert.equal(
+    authDestination(`/servers/${id}?next=//evil.example`),
+    "/dashboard",
+  );
+  const tournamentMap = `/tournaments?map=${id}`;
   assert.equal(authDestination(tournamentMap), tournamentMap);
   assert.equal(
     authDestination(`${tournamentMap}&next=//evil.example`),