mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-04-07 08:25:23 +02:00
* fix: add basePath pattern to support login/register and image paths * Fix linter errors * refactor: Update import statements for getBasePath and isEnabled, and add path utility functions with tests - Refactored imports in addImages.js and StableDiffusion.js to use getBasePath from '@librechat/api'. - Consolidated isEnabled and getBasePath imports in validateImageRequest.js. - Introduced new path utility functions in path.ts and corresponding unit tests in path.spec.ts to validate base path extraction logic. * fix: Update domain server base URL in MarkdownComponents and refactor authentication redirection logic - Changed the domain server base URL in MarkdownComponents.tsx to use the API base URL. - Refactored the useAuthRedirect hook to utilize React Router's navigate for redirection instead of window.location, ensuring a smoother SPA experience. - Added unit tests for the useAuthRedirect hook to verify authentication redirection behavior. * test: Mock isEnabled in validateImages.spec.js for improved test isolation - Updated validateImages.spec.js to mock the isEnabled function from @librechat/api, ensuring that tests can run independently of the actual implementation. - Cleared the DOMAIN_CLIENT environment variable before tests to avoid interference with basePath resolution. --------- Co-authored-by: Danny Avila <danny@librechat.ai>
148 lines
5.2 KiB
TypeScript
148 lines
5.2 KiB
TypeScript
import { useForm } from 'react-hook-form';
|
|
import { useState, ReactNode } from 'react';
|
|
import { Spinner, Button } from '@librechat/client';
|
|
import { useOutletContext } from 'react-router-dom';
|
|
import { useRequestPasswordResetMutation } from 'librechat-data-provider/react-query';
|
|
import { loginPage } from 'librechat-data-provider';
|
|
import type { TRequestPasswordReset, TRequestPasswordResetResponse } from 'librechat-data-provider';
|
|
import type { TLoginLayoutContext } from '~/common';
|
|
import type { FC } from 'react';
|
|
import { useLocalize } from '~/hooks';
|
|
|
|
const BodyTextWrapper: FC<{ children: ReactNode }> = ({ children }) => {
|
|
return (
|
|
<div
|
|
className="relative mt-6 rounded-xl border border-green-500/20 bg-green-50/50 px-6 py-4 text-green-700 shadow-sm transition-all dark:bg-green-950/30 dark:text-green-100"
|
|
role="alert"
|
|
>
|
|
{children}
|
|
</div>
|
|
);
|
|
};
|
|
|
|
const ResetPasswordBodyText = () => {
|
|
const localize = useLocalize();
|
|
return (
|
|
<div className="flex flex-col space-y-4">
|
|
<p>{localize('com_auth_reset_password_if_email_exists')}</p>
|
|
<a
|
|
className="inline-flex text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
|
|
href={loginPage()}
|
|
>
|
|
{localize('com_auth_back_to_login')}
|
|
</a>
|
|
</div>
|
|
);
|
|
};
|
|
|
|
function RequestPasswordReset() {
|
|
const localize = useLocalize();
|
|
const {
|
|
register,
|
|
handleSubmit,
|
|
formState: { errors },
|
|
} = useForm<TRequestPasswordReset>();
|
|
const [bodyText, setBodyText] = useState<ReactNode | undefined>(undefined);
|
|
const { startupConfig, setHeaderText } = useOutletContext<TLoginLayoutContext>();
|
|
|
|
const requestPasswordReset = useRequestPasswordResetMutation();
|
|
const { isLoading } = requestPasswordReset;
|
|
|
|
const onSubmit = (data: TRequestPasswordReset) => {
|
|
requestPasswordReset.mutate(data, {
|
|
onSuccess: (data: TRequestPasswordResetResponse) => {
|
|
if (data.link && !startupConfig?.emailEnabled) {
|
|
setHeaderText('com_auth_reset_password');
|
|
setBodyText(
|
|
<span>
|
|
{localize('com_auth_click')}{' '}
|
|
<a className="text-green-500 hover:underline" href={data.link}>
|
|
{localize('com_auth_here')}
|
|
</a>{' '}
|
|
{localize('com_auth_to_reset_your_password')}
|
|
</span>,
|
|
);
|
|
} else {
|
|
setHeaderText('com_auth_reset_password_link_sent');
|
|
setBodyText(<ResetPasswordBodyText />);
|
|
}
|
|
},
|
|
onError: () => {
|
|
setHeaderText('com_auth_reset_password_link_sent');
|
|
setBodyText(<ResetPasswordBodyText />);
|
|
},
|
|
});
|
|
};
|
|
|
|
if (bodyText) {
|
|
return <BodyTextWrapper>{bodyText}</BodyTextWrapper>;
|
|
}
|
|
|
|
return (
|
|
<form
|
|
className="mt-8 space-y-6"
|
|
aria-label="Password reset form"
|
|
method="POST"
|
|
onSubmit={handleSubmit(onSubmit)}
|
|
>
|
|
<div className="space-y-2">
|
|
<div className="relative">
|
|
<input
|
|
type="email"
|
|
id="email"
|
|
autoComplete="off"
|
|
aria-label={localize('com_auth_email')}
|
|
{...register('email', {
|
|
required: localize('com_auth_email_required'),
|
|
minLength: {
|
|
value: 3,
|
|
message: localize('com_auth_email_min_length'),
|
|
},
|
|
maxLength: {
|
|
value: 120,
|
|
message: localize('com_auth_email_max_length'),
|
|
},
|
|
pattern: {
|
|
value: /\S+@\S+\.\S+/,
|
|
message: localize('com_auth_email_pattern'),
|
|
},
|
|
})}
|
|
aria-invalid={!!errors.email}
|
|
className="webkit-dark-styles transition-color peer w-full rounded-2xl border border-border-light bg-surface-primary px-3.5 pb-2.5 pt-3 text-text-primary duration-200 focus:border-green-500 focus:outline-none"
|
|
placeholder=" "
|
|
/>
|
|
<label
|
|
htmlFor="email"
|
|
className="absolute -top-2 left-2 z-10 bg-white px-2 text-sm text-gray-600 transition-all peer-placeholder-shown:top-3 peer-placeholder-shown:text-base peer-placeholder-shown:text-gray-500 peer-focus:-top-2 peer-focus:text-sm peer-focus:text-green-600 dark:bg-gray-900 dark:text-gray-400 dark:peer-focus:text-green-500"
|
|
>
|
|
{localize('com_auth_email_address')}
|
|
</label>
|
|
</div>
|
|
{errors.email && (
|
|
<p role="alert" className="text-sm font-medium text-red-600 dark:text-red-400">
|
|
{errors.email.message}
|
|
</p>
|
|
)}
|
|
</div>
|
|
<div className="space-y-4">
|
|
<Button
|
|
aria-label="Continue with password reset"
|
|
type="submit"
|
|
disabled={!!errors.email || isLoading}
|
|
variant="submit"
|
|
className="h-12 w-full rounded-2xl"
|
|
>
|
|
{isLoading ? <Spinner /> : localize('com_auth_continue')}
|
|
</Button>
|
|
<a
|
|
href={loginPage()}
|
|
className="block text-center text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
|
|
>
|
|
{localize('com_auth_back_to_login')}
|
|
</a>
|
|
</div>
|
|
</form>
|
|
);
|
|
}
|
|
|
|
export default RequestPasswordReset;
|