misc: fix-up return to logic

ShokoAnime · Nov 14, 2023 · 409decf · 409decf
1 parent d2806bd
commit 409decf
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/core/router/AuthenticatedRoute.tsx b/src/core/router/AuthenticatedRoute.tsx
@@ -19,7 +19,7 @@ function AuthenticatedRoute(props: Props) {
 
   return (serverState === 2 && isAuthenticated)
     ? props.children
-    : <Navigate to={`/webui/login#?returnTo=${from}`} replace />;
+    : <Navigate to={from === '/' || from === '/webui/' ? '/webui/login' : `/webui/login#?returnTo=${from}`} replace />;
 }
 
 export default AuthenticatedRoute;
diff --git a/src/pages/login/LoginPage.tsx b/src/pages/login/LoginPage.tsx
@@ -18,12 +18,12 @@ import { usePostAuthMutation } from '@/core/rtkQuery/splitApi/authApi';
 import { useGetRandomMetadataQuery } from '@/core/rtkQuery/splitV3Api/imageApi';
 import { useGetInitStatusQuery, useGetInitVersionQuery } from '@/core/rtkQuery/splitV3Api/initApi';
 import { ImageTypeEnum } from '@/core/types/api/common';
-import { useHashQuery } from '@/hooks/query';
+import { useHashQueryParameter } from '@/hooks/query';
 
 import type { RootState } from '@/core/store';
 
 function LoginPage() {
-  const [{ returnTo = '/', ...rest }, setHashQuery] = useHashQuery();
+  const [returnTo, setReturnTo] = useHashQueryParameter('returnTo', '/webui/');
   const navigate = useNavigate();
 
   const apiSession = useSelector((state: RootState) => state.apiSession);
@@ -45,7 +45,7 @@ function LoginPage() {
 
   const setRedirect = () => {
     if (seriesId === 0) return;
-    setHashQuery({ returnTo: `/webui/collection/series/${seriesId}`, ...rest });
+    setReturnTo(`/webui/collection/series/${seriesId}`);
   };
 
   useEffect(() => {