barbercollie/tinyauth
1
0
Fork 1
mirror of https://github.com/steveiliop56/tinyauth.git synced 2026-03-03 13:22:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: rabbit comments

Browse Source
This commit is contained in:
Stavros
2026-02-06 18:01:47 +02:00
parent a2ac5e2498
commit 5932221d4d
4 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/pages/continue-page.tsx
View File

@@ -83,7 +83,7 @@ export const ContinuePage = () => {
if (!isLoggedIn) { if (!isLoggedIn) {
return ( return (
<Navigate <Navigate
to={`/login${redirectUri && `?redirect_uri=${encodeURIComponent(redirectUri)}`}`} to={`/login${redirectUri ? `?redirect_uri=${encodeURIComponent(redirectUri)}` : ""}`}
replace replace
/> />
); );

22
frontend/src/pages/login-page.tsx
View File

@@ -76,7 +76,7 @@ export const LoginPage = () => {
} = useMutation({ } = useMutation({
mutationFn: (provider: string) => mutationFn: (provider: string) =>
axios.get( axios.get(
`/api/oauth/url/${provider}${props.redirect_uri && `?redirect_uri=${encodeURIComponent(props.redirect_uri)}`}`, `/api/oauth/url/${provider}${props.redirect_uri ? `?redirect_uri=${encodeURIComponent(props.redirect_uri)}` : ""}`,
), ),
mutationKey: ["oauth"], mutationKey: ["oauth"],
onSuccess: (data) => { onSuccess: (data) => {
@@ -108,7 +108,7 @@ export const LoginPage = () => {
onSuccess: (data) => { onSuccess: (data) => {
if (data.data.totpPending) { if (data.data.totpPending) {
window.location.replace( window.location.replace(
`/totp${props.redirect_uri && `?redirect_uri=${encodeURIComponent(props.redirect_uri)}`}`, `/totp${props.redirect_uri ? `?redirect_uri=${encodeURIComponent(props.redirect_uri)}` : ""}`,
); );
return; return;
} }
@@ -123,7 +123,7 @@ export const LoginPage = () => {
return; return;
} }
window.location.replace( window.location.replace(
`/continue${props.redirect_uri && `?redirect_uri=${encodeURIComponent(props.redirect_uri)}`}`, `/continue${props.redirect_uri ? `?redirect_uri=${encodeURIComponent(props.redirect_uri)}` : ""}`,
); );
}, 500); }, 500);
}, },
@@ -157,13 +157,15 @@ export const LoginPage = () => {
]); ]);
useEffect(() => { useEffect(() => {
if (redirectTimer.current) { return () => {
clearTimeout(redirectTimer.current); if (redirectTimer.current) {
} clearTimeout(redirectTimer.current);
}
if (redirectButtonTimer.current) { if (redirectButtonTimer.current) {
clearTimeout(redirectButtonTimer.current); clearTimeout(redirectButtonTimer.current);
} }
};
}, [redirectTimer, redirectButtonTimer]); }, [redirectTimer, redirectButtonTimer]);
if (isLoggedIn && isOidc) { if (isLoggedIn && isOidc) {
@@ -173,7 +175,7 @@ export const LoginPage = () => {
if (isLoggedIn && props.redirect_uri !== "") { if (isLoggedIn && props.redirect_uri !== "") {
return ( return (
<Navigate <Navigate
to={`/continue${props.redirect_uri && `?redirect_uri=${encodeURIComponent(props.redirect_uri)}`}`} to={`/continue${props.redirect_uri ? `?redirect_uri=${encodeURIComponent(props.redirect_uri)}` : ""}`}
replace replace
/> />
); );

6
frontend/src/pages/logout-page.tsx
View File

@@ -40,7 +40,11 @@ export const LogoutPage = () => {
}); });
useEffect(() => { useEffect(() => {
if (redirectTimer.current) clearTimeout(redirectTimer.current); return () => {
if (redirectTimer.current) {
clearTimeout(redirectTimer.current);
}
};
}, [redirectTimer]); }, [redirectTimer]);
if (!isLoggedIn) { if (!isLoggedIn) {

8
frontend/src/pages/totp-page.tsx
View File

@@ -48,7 +48,7 @@ export const TotpPage = () => {
} }
window.location.replace( window.location.replace(
`/continue${props.redirect_uri && `?redirect_uri=${encodeURIComponent(props.redirect_uri)}`}`, `/continue${props.redirect_uri ? `?redirect_uri=${encodeURIComponent(props.redirect_uri)}` : ""}`,
); );
}, 500); }, 500);
}, },
@@ -60,7 +60,11 @@ export const TotpPage = () => {
}); });
useEffect(() => { useEffect(() => {
if (redirectTimer.current) clearTimeout(redirectTimer.current); return () => {
if (redirectTimer.current) {
clearTimeout(redirectTimer.current);
}
};
}, [redirectTimer]); }, [redirectTimer]);
if (!totpPending) { if (!totpPending) {