mirror of
https://github.com/Shadowfita/docmost.git
synced 2025-11-13 08:12:32 +10:00
add forgot-password ui (#273)
This commit is contained in:
committed by
GitHub
parent
f34812653e
commit
e43ea66442
@ -24,6 +24,7 @@ import PageRedirect from "@/pages/page/page-redirect.tsx";
|
|||||||
import Layout from "@/components/layouts/global/layout.tsx";
|
import Layout from "@/components/layouts/global/layout.tsx";
|
||||||
import { ErrorBoundary } from "react-error-boundary";
|
import { ErrorBoundary } from "react-error-boundary";
|
||||||
import InviteSignup from "@/pages/auth/invite-signup.tsx";
|
import InviteSignup from "@/pages/auth/invite-signup.tsx";
|
||||||
|
import ForgotPassword from "@/pages/auth/forgot-password.tsx";
|
||||||
|
|
||||||
export default function App() {
|
export default function App() {
|
||||||
const [, setSocket] = useAtom(socketAtom);
|
const [, setSocket] = useAtom(socketAtom);
|
||||||
@ -61,6 +62,7 @@ export default function App() {
|
|||||||
<Routes>
|
<Routes>
|
||||||
<Route index element={<Navigate to="/home" />} />
|
<Route index element={<Navigate to="/home" />} />
|
||||||
<Route path={"/login"} element={<LoginPage />} />
|
<Route path={"/login"} element={<LoginPage />} />
|
||||||
|
<Route path={"/forgotPassword"} element={<ForgotPassword />} />
|
||||||
<Route path={"/invites/:invitationId"} element={<InviteSignup />} />
|
<Route path={"/invites/:invitationId"} element={<InviteSignup />} />
|
||||||
<Route path={"/setup/register"} element={<SetupWorkspace />} />
|
<Route path={"/setup/register"} element={<SetupWorkspace />} />
|
||||||
|
|
||||||
|
|||||||
@ -3,3 +3,12 @@
|
|||||||
border-radius: 4px;
|
border-radius: 4px;
|
||||||
background: light-dark(var(--mantine-color-body), rgba(0, 0, 0, 0.1));
|
background: light-dark(var(--mantine-color-body), rgba(0, 0, 0, 0.1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.forgotPasswordBtn {
|
||||||
|
font-size: var(--input-label-size, var(--mantine-font-size-sm));
|
||||||
|
text-decoration: underline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.formElemWithTopMargin {
|
||||||
|
margin-top: var(--mantine-spacing-md);
|
||||||
|
}
|
||||||
|
|||||||
@ -0,0 +1,109 @@
|
|||||||
|
import * as React from "react";
|
||||||
|
import {useState} from "react";
|
||||||
|
import * as z from "zod";
|
||||||
|
import {useForm, zodResolver} from "@mantine/form";
|
||||||
|
import useAuth from "@/features/auth/hooks/use-auth";
|
||||||
|
import {IForgotPassword} from "@/features/auth/types/auth.types";
|
||||||
|
import {Box, Button, Container, PasswordInput, TextInput, Title,} from "@mantine/core";
|
||||||
|
import classes from "./auth.module.css";
|
||||||
|
import {useRedirectIfAuthenticated} from "@/features/auth/hooks/use-redirect-if-authenticated.ts";
|
||||||
|
import {notifications} from "@mantine/notifications";
|
||||||
|
|
||||||
|
const stepOneSchema = z.object({
|
||||||
|
email: z
|
||||||
|
.string()
|
||||||
|
.min(1, {message: "Email is required"})
|
||||||
|
.email({message: "Invalid email address"}),
|
||||||
|
});
|
||||||
|
|
||||||
|
const stepTwoSchema = z.object({
|
||||||
|
email: z
|
||||||
|
.string()
|
||||||
|
.min(1, {message: "Email is required"})
|
||||||
|
.email({message: "Invalid email address"}),
|
||||||
|
token: z.string().min(1, {message: 'Token is required'}),
|
||||||
|
newPassword: z.string().min(8, {message: 'Password must contain at least 8 character(s)'}),
|
||||||
|
});
|
||||||
|
|
||||||
|
export function ForgotPasswordForm() {
|
||||||
|
const {forgotPassword, isLoading} = useAuth();
|
||||||
|
const [isTokenSend, setIsTokenSend] = useState<boolean>(false)
|
||||||
|
useRedirectIfAuthenticated();
|
||||||
|
|
||||||
|
const form = useForm<IForgotPassword>({
|
||||||
|
validate: isTokenSend ? zodResolver(stepTwoSchema) : zodResolver(stepOneSchema),
|
||||||
|
initialValues: {
|
||||||
|
email: "",
|
||||||
|
token: null,
|
||||||
|
newPassword: null,
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
async function onSubmit(data: IForgotPassword) {
|
||||||
|
const success = await forgotPassword(data);
|
||||||
|
|
||||||
|
if (success) {
|
||||||
|
if (isTokenSend) {
|
||||||
|
notifications.show({
|
||||||
|
message: 'Password updated',
|
||||||
|
color: "green",
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!isTokenSend) {
|
||||||
|
setIsTokenSend(true);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Container size={420} my={40} className={classes.container}>
|
||||||
|
<Box p="xl" mt={200}>
|
||||||
|
<Title order={2} ta="center" fw={500} mb="md">
|
||||||
|
Forgot password
|
||||||
|
</Title>
|
||||||
|
|
||||||
|
<form onSubmit={form.onSubmit(onSubmit)}>
|
||||||
|
<TextInput
|
||||||
|
id="email"
|
||||||
|
type="email"
|
||||||
|
label="Email"
|
||||||
|
placeholder="email@example.com"
|
||||||
|
variant="filled"
|
||||||
|
disabled={isTokenSend}
|
||||||
|
{...form.getInputProps("email")}
|
||||||
|
/>
|
||||||
|
|
||||||
|
{
|
||||||
|
isTokenSend
|
||||||
|
&& (
|
||||||
|
<>
|
||||||
|
<TextInput
|
||||||
|
id="token"
|
||||||
|
className={classes.formElemWithTopMargin}
|
||||||
|
type="text"
|
||||||
|
label="Token"
|
||||||
|
placeholder="token"
|
||||||
|
variant="filled"
|
||||||
|
{...form.getInputProps("token")}
|
||||||
|
/>
|
||||||
|
|
||||||
|
<PasswordInput
|
||||||
|
label="Password"
|
||||||
|
placeholder="Your password"
|
||||||
|
variant="filled"
|
||||||
|
mt="md"
|
||||||
|
{...form.getInputProps("newPassword")}
|
||||||
|
/>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
<Button type="submit" fullWidth mt="xl" loading={isLoading}>
|
||||||
|
{isTokenSend ? 'Set password' : 'Send Token'}
|
||||||
|
</Button>
|
||||||
|
</form>
|
||||||
|
</Box>
|
||||||
|
</Container>
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -10,9 +10,13 @@ import {
|
|||||||
Button,
|
Button,
|
||||||
PasswordInput,
|
PasswordInput,
|
||||||
Box,
|
Box,
|
||||||
|
UnstyledButton,
|
||||||
} from "@mantine/core";
|
} from "@mantine/core";
|
||||||
import classes from "./auth.module.css";
|
import classes from "./auth.module.css";
|
||||||
import { useRedirectIfAuthenticated } from "@/features/auth/hooks/use-redirect-if-authenticated.ts";
|
import { useRedirectIfAuthenticated } from "@/features/auth/hooks/use-redirect-if-authenticated.ts";
|
||||||
|
import clsx from "clsx";
|
||||||
|
import {useNavigate} from "react-router-dom";
|
||||||
|
import APP_ROUTE from "@/lib/app-route.ts";
|
||||||
|
|
||||||
const formSchema = z.object({
|
const formSchema = z.object({
|
||||||
email: z
|
email: z
|
||||||
@ -24,6 +28,7 @@ const formSchema = z.object({
|
|||||||
|
|
||||||
export function LoginForm() {
|
export function LoginForm() {
|
||||||
const { signIn, isLoading } = useAuth();
|
const { signIn, isLoading } = useAuth();
|
||||||
|
const navigate = useNavigate();
|
||||||
useRedirectIfAuthenticated();
|
useRedirectIfAuthenticated();
|
||||||
|
|
||||||
const form = useForm<ILogin>({
|
const form = useForm<ILogin>({
|
||||||
@ -62,6 +67,14 @@ export function LoginForm() {
|
|||||||
mt="md"
|
mt="md"
|
||||||
{...form.getInputProps("password")}
|
{...form.getInputProps("password")}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<UnstyledButton
|
||||||
|
onClick={() => navigate(APP_ROUTE.AUTH.FORGOT_PASSWORD)}
|
||||||
|
className = {clsx(classes.forgotPasswordBtn, classes.formElemWithTopMargin)}>
|
||||||
|
<div>
|
||||||
|
<span>Forgot Password</span>
|
||||||
|
</div>
|
||||||
|
</UnstyledButton>
|
||||||
<Button type="submit" fullWidth mt="xl" loading={isLoading}>
|
<Button type="submit" fullWidth mt="xl" loading={isLoading}>
|
||||||
Sign In
|
Sign In
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@ -1,10 +1,10 @@
|
|||||||
import { useState } from "react";
|
import { useState } from "react";
|
||||||
import { login, setupWorkspace } from "@/features/auth/services/auth-service";
|
import {forgotPassword, login, setupWorkspace} from "@/features/auth/services/auth-service";
|
||||||
import { useNavigate } from "react-router-dom";
|
import { useNavigate } from "react-router-dom";
|
||||||
import { useAtom } from "jotai";
|
import { useAtom } from "jotai";
|
||||||
import { authTokensAtom } from "@/features/auth/atoms/auth-tokens-atom";
|
import { authTokensAtom } from "@/features/auth/atoms/auth-tokens-atom";
|
||||||
import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
|
import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
|
||||||
import { ILogin, ISetupWorkspace } from "@/features/auth/types/auth.types";
|
import {IForgotPassword, ILogin, ISetupWorkspace} from "@/features/auth/types/auth.types";
|
||||||
import { notifications } from "@mantine/notifications";
|
import { notifications } from "@mantine/notifications";
|
||||||
import { IAcceptInvite } from "@/features/workspace/types/workspace.types.ts";
|
import { IAcceptInvite } from "@/features/workspace/types/workspace.types.ts";
|
||||||
import { acceptInvitation } from "@/features/workspace/services/workspace-service.ts";
|
import { acceptInvitation } from "@/features/workspace/services/workspace-service.ts";
|
||||||
@ -105,12 +105,33 @@ export default function useAuth() {
|
|||||||
navigate(APP_ROUTE.AUTH.LOGIN);
|
navigate(APP_ROUTE.AUTH.LOGIN);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const handleForgotPassword = async (data: IForgotPassword) => {
|
||||||
|
setIsLoading(true);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const res = await forgotPassword(data);
|
||||||
|
setIsLoading(false);
|
||||||
|
|
||||||
|
return true;
|
||||||
|
} catch (err) {
|
||||||
|
console.log(err);
|
||||||
|
setIsLoading(false);
|
||||||
|
notifications.show({
|
||||||
|
message: err.response?.data.message,
|
||||||
|
color: "red",
|
||||||
|
});
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return {
|
return {
|
||||||
signIn: handleSignIn,
|
signIn: handleSignIn,
|
||||||
invitationSignup: handleInvitationSignUp,
|
invitationSignup: handleInvitationSignUp,
|
||||||
setupWorkspace: handleSetupWorkspace,
|
setupWorkspace: handleSetupWorkspace,
|
||||||
isAuthenticated: handleIsAuthenticated,
|
isAuthenticated: handleIsAuthenticated,
|
||||||
logout: handleLogout,
|
logout: handleLogout,
|
||||||
|
forgotPassword: handleForgotPassword,
|
||||||
hasTokens,
|
hasTokens,
|
||||||
isLoading,
|
isLoading,
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,6 +1,7 @@
|
|||||||
import api from "@/lib/api-client";
|
import api from "@/lib/api-client";
|
||||||
import {
|
import {
|
||||||
IChangePassword,
|
IChangePassword,
|
||||||
|
IForgotPassword,
|
||||||
ILogin,
|
ILogin,
|
||||||
IRegister,
|
IRegister,
|
||||||
ISetupWorkspace,
|
ISetupWorkspace,
|
||||||
@ -31,3 +32,9 @@ export async function setupWorkspace(
|
|||||||
const req = await api.post<ITokenResponse>("/auth/setup", data);
|
const req = await api.post<ITokenResponse>("/auth/setup", data);
|
||||||
return req.data;
|
return req.data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export async function forgotPassword(data: IForgotPassword): Promise<any> {
|
||||||
|
const req = await api.post<any>("/auth/forgot-password", data);
|
||||||
|
return req.data;
|
||||||
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3,6 +3,12 @@ export interface ILogin {
|
|||||||
password: string;
|
password: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export interface IForgotPassword {
|
||||||
|
email: string;
|
||||||
|
token: string;
|
||||||
|
newPassword: string;
|
||||||
|
}
|
||||||
|
|
||||||
export interface IRegister {
|
export interface IRegister {
|
||||||
name?: string;
|
name?: string;
|
||||||
email: string;
|
email: string;
|
||||||
|
|||||||
@ -4,6 +4,7 @@ const APP_ROUTE = {
|
|||||||
LOGIN: "/login",
|
LOGIN: "/login",
|
||||||
SIGNUP: "/signup",
|
SIGNUP: "/signup",
|
||||||
SETUP: "/setup/register",
|
SETUP: "/setup/register",
|
||||||
|
FORGOT_PASSWORD: "/forgotPassword",
|
||||||
},
|
},
|
||||||
SETTINGS: {
|
SETTINGS: {
|
||||||
ACCOUNT: {
|
ACCOUNT: {
|
||||||
|
|||||||
13
apps/client/src/pages/auth/forgot-password.tsx
Normal file
13
apps/client/src/pages/auth/forgot-password.tsx
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
import { Helmet } from "react-helmet-async";
|
||||||
|
import {ForgotPasswordForm} from "@/features/auth/components/forgot-password-form.tsx";
|
||||||
|
|
||||||
|
export default function ForgotPassword() {
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Helmet>
|
||||||
|
<title>Forgot Password</title>
|
||||||
|
</Helmet>
|
||||||
|
<ForgotPasswordForm />
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user