Redirect to previous page on login

stashapp · Sep 1, 2024 · 75d5611 · 75d5611
1 parent 52d8823
commit 75d5611
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/frontend/src/Login.tsx b/frontend/src/Login.tsx
@@ -29,6 +29,7 @@ const Login: FC = () => {
   const navigate = useNavigate();
   const [loginError, setLoginError] = useState("");
   const msg = new URLSearchParams(location.search).get("msg");
+  const redirect = new URLSearchParams(location.search).get("redirect");
   const Auth = useContext<ContextType>(AuthContext);
   const {
     register,
@@ -49,8 +50,10 @@ const Login: FC = () => {
       method: "POST",
       body,
       credentials: getCredentialsSetting(),
-    }).finally(() => setLoading(false));
-    if (res.ok) window.location.replace("/");
+    });
+
+    const returnURL = decodeURIComponent(redirect ?? "") || "/";
+    if (res.ok) window.location.replace(returnURL);
     else setLoginError("Access denied");
   };
 

diff --git a/frontend/src/Main.tsx b/frontend/src/Main.tsx
@@ -50,7 +50,9 @@ const Main: FC<Props> = ({ children }) => {
       location.pathname !== ROUTE_FORGOT_PASSWORD &&
       location.pathname !== ROUTE_RESET_PASSWORD
     ) {
-      navigate(ROUTE_LOGIN);
+      navigate(
+        `${ROUTE_LOGIN}?redirect=${encodeURIComponent(location.pathname)}`
+      );
     }
   }, [loading, user, location, navigate]);