Compare commits

...

1 Commits

Author SHA1 Message Date
Stavros e15e92c45f feat: preserve login params in forgot password screen 2026-04-26 17:50:38 +03:00
5 changed files with 23 additions and 6 deletions
@@ -17,6 +17,7 @@ interface Props {
onSubmit: (data: LoginSchema) => void; onSubmit: (data: LoginSchema) => void;
loading?: boolean; loading?: boolean;
formId?: string; formId?: string;
params?: string;
} }
export const LoginForm = (props: Props) => { export const LoginForm = (props: Props) => {
@@ -71,6 +72,12 @@ export const LoginForm = (props: Props) => {
</FormControl> </FormControl>
<a <a
href="/forgot-password" href="/forgot-password"
onClick={(e) => {
e.preventDefault();
window.location.replace(
`/forgot-password${props.params ? `${props.params}` : ""}`,
);
}}
className="text-muted-foreground hover:text-muted-foreground/80 text-sm absolute right-0 bottom-[2.565rem]" // 2.565 is *just* perfect className="text-muted-foreground hover:text-muted-foreground/80 text-sm absolute right-0 bottom-[2.565rem]" // 2.565 is *just* perfect
> >
{t("forgotPasswordTitle")} {t("forgotPasswordTitle")}
+2 -1
View File
@@ -79,5 +79,6 @@
"profileScopeName": "Profile", "profileScopeName": "Profile",
"profileScopeDescription": "Allows the app to access your profile information.", "profileScopeDescription": "Allows the app to access your profile information.",
"groupsScopeName": "Groups", "groupsScopeName": "Groups",
"groupsScopeDescription": "Allows the app to access your group information." "groupsScopeDescription": "Allows the app to access your group information.",
"backToLoginButton": "Back to login"
} }
+2 -1
View File
@@ -79,5 +79,6 @@
"profileScopeName": "Profile", "profileScopeName": "Profile",
"profileScopeDescription": "Allows the app to access your profile information.", "profileScopeDescription": "Allows the app to access your profile information.",
"groupsScopeName": "Groups", "groupsScopeName": "Groups",
"groupsScopeDescription": "Allows the app to access your group information." "groupsScopeDescription": "Allows the app to access your group information.",
"backToLoginButton": "Back to login"
} }
+8 -4
View File
@@ -10,12 +10,13 @@ import { Button } from "@/components/ui/button";
import { useAppContext } from "@/context/app-context"; import { useAppContext } from "@/context/app-context";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import Markdown from "react-markdown"; import Markdown from "react-markdown";
import { useNavigate } from "react-router"; import { useLocation } from "react-router";
export const ForgotPasswordPage = () => { export const ForgotPasswordPage = () => {
const { forgotPasswordMessage } = useAppContext(); const { forgotPasswordMessage } = useAppContext();
const { t } = useTranslation(); const { t } = useTranslation();
const navigate = useNavigate(); const { search } = useLocation();
const searchParams = new URLSearchParams(search);
return ( return (
<Card> <Card>
@@ -36,10 +37,13 @@ export const ForgotPasswordPage = () => {
className="w-full" className="w-full"
variant="outline" variant="outline"
onClick={() => { onClick={() => {
navigate("/login"); const eparams = searchParams.toString();
window.location.replace(
`/login${eparams.length > 0 ? `?${eparams}` : ""}`,
);
}} }}
> >
{t("notFoundButton")} {t("backToLoginButton")}
</Button> </Button>
</CardFooter> </CardFooter>
</Card> </Card>
+4
View File
@@ -264,6 +264,10 @@ export const LoginPage = () => {
onSubmit={(values) => loginMutate(values)} onSubmit={(values) => loginMutate(values)}
loading={loginIsPending || oauthIsPending} loading={loginIsPending || oauthIsPending}
formId={formId} formId={formId}
params={(() => {
const eparams = searchParams.toString();
return eparams.length > 0 ? `?${eparams}` : "";
})()}
/> />
)} )}
{providers.length == 0 && ( {providers.length == 0 && (