fix: rabbit comments

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

View File

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

View File

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

View File

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

View File

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