mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-03-16 12:46:34 +01:00
* feat: init @librechat/client * feat: Add common types and interfaces for accessibility, agents, artifacts, assistants, and tools * feat: Add jotai as a peer dependency * fix build client package * feat: cleanup unused types from common/index.ts - Remove 104 unused type exports from packages/client/src/common/index.ts - Keep only 7 actually used exports (93% reduction) - Add cleanup script with enhanced import pattern detection - Support both named imports and namespace imports (* as t) - Create automatic backups and comprehensive documentation - Maintain type safety with build verification - No breaking changes to existing code Kept exports: - TShowToast, Option, OptionWithIcon, DropdownValueSetter - MentionOption, NotificationSeverity, MenuItemProps Scripts: cleanup-common-types-safe.js, README-CLEANUP.md * fix: cleanup * fix: package; refactor: tsconfig * feat: add back `recoil` * fix: move dependencies to peerDependencies in client package * feat: add @librechat/client as a dependency in package.json and package-lock.json * feat: update client package configuration and dependencies - Added new dependencies for Rollup plugins and updated existing ones in package.json and package-lock.json. - Introduced a new Rollup configuration file for building the client package. - Refactored build scripts to include a dedicated build command for the client. - Updated TypeScript configuration for improved module resolution and type declaration output. - Integrated a Toast component from the client package into the main App component. * feat: enhance Rollup configuration for client package - Updated terser plugin settings to preserve directives like 'use client'. - Added custom warning handler to ignore "use client" directive warnings during the build process. * chore: rename package/client build script command * feat: update client package dependencies and Rollup configuration - Added rollup-plugin-postcss to package.json and updated package-lock.json. - Enhanced Rollup configuration to include postcss plugin for CSS handling. - Updated index.ts to export all components from the components directory for better modularity. * feat: add client package directory to update configuration - Included the 'client' package directory in the update.js configuration to ensure it is recognized during updates. * feat: export Toast component in client package - Added export for the Toast component in index.ts to enhance modularity and accessibility of components. * feat: /client transition to @librechat/client * chore: fixed formatting issues * fix: update peer dependencies in @librechat/client to prevent bundling them * fix: correct useSprings implementation in SplitText component * fix: circular dependencies in DataTable * fix: add remaining peer dependencies and match actual versions previously used in `client/package.json` * fix: correct frontend:ci script to include client package build * chore: enhance unused package detection for @librechat/client and improve dependency extraction * fix: add missing peer dependency for @radix-ui/react-collapsible * chore: include "packages/client" in unused i18next keys detection * test: update AgentFooter tests to use document.querySelector for spinner checks test: mock window.matchMedia in setupTests.js for consistent test environment * feat: add react-hook-form dependency and update FormInput component to use its types * chore: linting * refactor: remove unused defaultSelectedValues prop from MCPSelect and MultiSelect components * chore: linting * feat: update GitHub Actions workflow to publish @librechat/client * chore: update GitHub Actions workflow to install and build data-provider and client dependencies * chore: add missing @testing-library/react dependency to client package * chore: update tsconfig.json to exclude additional test files * chore: fix build issues, resolve latest LC changes * chore: move MCP components outside of `~/components/ui` * feat: implement dynamic theme system with environment variable support and Tailwind CSS integration * chore: remove unnecessary logging of sttExternal and ttsExternal in Speech component * chore: squashed cleanup commits chore: move @tanstack/react-virtual to dependencies and remove recoil from package.json chore: move dependencies to peerDependencies in package.json feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration feat: update package.json and rollup.config.js to include jotai and enhance bundling configuration refactor: reorganize exports in index.ts for improved clarity refactor: remove unused types and interfaces from common files refactor: update peer dependencies and improve component typings - Removed duplicate peer dependencies from package.json and organized them. - Updated rollup.config.js to disable TypeScript checking during the build process. - Modified AnimatedTabs component to use React.ReactNode for label and content types, and added TypeScript workarounds for compatibility. - Enhanced Label and Separator components to accept an optional className prop and improved prop spreading. - Updated Slider component to include an optional className prop and refined prop handling for better type safety. refactor: clean up client workflow and update package dependencies refactor: update package dependencies and improve PostCSS and Rollup configurations chore: bump version to 0.1.2 in package.json chore: bump client version to 0.1.2 in package-lock.json chore: bump client version to 0.1.3 and update dependencies chore: bump client version to 0.1.4 and update @react-spring dependencies chore: update package version to 0.1.5 and adjust peer dependencies - Bump version in package.json from 0.1.4 to 0.1.5. - Update peer dependency for @tanstack/react-query to allow version 5.0.0. - Add @tanstack/react-table and @tanstack/react-virtual as dependencies. - Update various dependencies to their latest compatible versions. - Simplify postcss.config.js by removing unnecessary options. - Clean up rollup.config.js by removing ignored PostCSS warnings. - Update CheckboxButton component to cast icon as React JSX element. - Adjust Combobox component's class names for better styling. - Change DropdownPopup component to use React's namespace import. - Modify InputOTP component to use 'any' type for OTPInputContext. - Ensure displayLabel and value in ModelParameters are converted to strings. - Update MultiSearch component's placeholder to ensure it's a string. - Cast selectIcon in MultiSelect as React JSX element for consistency. - Update OGDialogTemplate to cast selectText as React JSX element. - Initialize animationRef in PixelCard with undefined for clarity. - Add TypeScript ignore comments in Select and SelectDropDown components for Radix UI type conflicts. - Ensure title in SelectDropDown is a string and adjust rendering of options. - Update useLocalize hook to cast options as any for compatibility. refactor: code structure; chore: translations cleanup chore: remove unused imports and clean up code in NewChat component refactor: enhance Menu component to support custom render functions for menu items style: update itemClassName in ToolsDropdown for improved UI consistency fix: merge conflicts chore: update @radix-ui/react-accordion to version 1.2.11 * refactor: remove unnecessary TypeScript type assertions in AnimatedTabs, Label, Separator, and Slider components * feat: enhance theme system with localStorage persistence and new theme atoms * chore: bump version of @librechat/client to 0.1.7 * chore: fix ci/cd warnings/errors related to linting and unused localization keys * chore: update dependencies for class-variance-authority, clsx, and match-sorter * chore: bump @librechat/client to v0.1.8 * feat: add utility colors for theme customization and remove unused tailwindConfig * v0.1.9 --------- Co-authored-by: Marco Beretta <81851188+berry-13@users.noreply.github.com>
176 lines
6.2 KiB
TypeScript
176 lines
6.2 KiB
TypeScript
import React, { useState, useCallback } from 'react';
|
|
import { useSearchParams } from 'react-router-dom';
|
|
import { useToastContext } from '@librechat/client';
|
|
import { useForm, Controller } from 'react-hook-form';
|
|
import { REGEXP_ONLY_DIGITS, REGEXP_ONLY_DIGITS_AND_CHARS } from 'input-otp';
|
|
import { InputOTP, InputOTPGroup, InputOTPSeparator, InputOTPSlot, Label } from '@librechat/client';
|
|
import { useVerifyTwoFactorTempMutation } from '~/data-provider';
|
|
import { useLocalize } from '~/hooks';
|
|
|
|
interface VerifyPayload {
|
|
tempToken: string;
|
|
token?: string;
|
|
backupCode?: string;
|
|
}
|
|
|
|
type TwoFactorFormInputs = {
|
|
token?: string;
|
|
backupCode?: string;
|
|
};
|
|
|
|
const TwoFactorScreen: React.FC = React.memo(() => {
|
|
const [searchParams] = useSearchParams();
|
|
const tempTokenRaw = searchParams.get('tempToken');
|
|
const tempToken = tempTokenRaw !== null && tempTokenRaw !== '' ? tempTokenRaw : '';
|
|
|
|
const {
|
|
control,
|
|
handleSubmit,
|
|
formState: { errors },
|
|
} = useForm<TwoFactorFormInputs>();
|
|
const localize = useLocalize();
|
|
const { showToast } = useToastContext();
|
|
const [useBackup, setUseBackup] = useState<boolean>(false);
|
|
const [isLoading, setIsLoading] = useState<boolean>(false);
|
|
const { mutate: verifyTempMutate } = useVerifyTwoFactorTempMutation({
|
|
onSuccess: (result) => {
|
|
if (result.token != null && result.token !== '') {
|
|
window.location.href = '/';
|
|
}
|
|
},
|
|
onMutate: () => {
|
|
setIsLoading(true);
|
|
},
|
|
onError: (error: unknown) => {
|
|
setIsLoading(false);
|
|
const err = error as { response?: { data?: { message?: unknown } } };
|
|
const errorMsg =
|
|
typeof err.response?.data?.message === 'string'
|
|
? err.response.data.message
|
|
: 'Error verifying 2FA';
|
|
showToast({ message: errorMsg, status: 'error' });
|
|
},
|
|
});
|
|
|
|
const onSubmit = useCallback(
|
|
(data: TwoFactorFormInputs) => {
|
|
const payload: VerifyPayload = { tempToken };
|
|
if (useBackup && data.backupCode != null && data.backupCode !== '') {
|
|
payload.backupCode = data.backupCode;
|
|
} else if (data.token != null && data.token !== '') {
|
|
payload.token = data.token;
|
|
}
|
|
verifyTempMutate(payload);
|
|
},
|
|
[tempToken, useBackup, verifyTempMutate],
|
|
);
|
|
|
|
const toggleBackupOn = useCallback(() => {
|
|
setUseBackup(true);
|
|
}, []);
|
|
|
|
const toggleBackupOff = useCallback(() => {
|
|
setUseBackup(false);
|
|
}, []);
|
|
|
|
return (
|
|
<div className="mt-4">
|
|
<form onSubmit={handleSubmit(onSubmit)}>
|
|
<Label className="flex justify-center break-keep text-center text-sm text-text-primary">
|
|
{localize('com_auth_two_factor')}
|
|
</Label>
|
|
{!useBackup && (
|
|
<div className="my-4 flex justify-center text-text-primary">
|
|
<Controller
|
|
name="token"
|
|
control={control}
|
|
render={({ field: { onChange, value } }) => (
|
|
<InputOTP
|
|
maxLength={6}
|
|
value={value != null ? value : ''}
|
|
onChange={onChange}
|
|
pattern={REGEXP_ONLY_DIGITS}
|
|
>
|
|
<InputOTPGroup>
|
|
<InputOTPSlot index={0} />
|
|
<InputOTPSlot index={1} />
|
|
<InputOTPSlot index={2} />
|
|
</InputOTPGroup>
|
|
<InputOTPSeparator />
|
|
<InputOTPGroup>
|
|
<InputOTPSlot index={3} />
|
|
<InputOTPSlot index={4} />
|
|
<InputOTPSlot index={5} />
|
|
</InputOTPGroup>
|
|
</InputOTP>
|
|
)}
|
|
/>
|
|
{errors.token && <span className="text-sm text-red-500">{errors.token.message}</span>}
|
|
</div>
|
|
)}
|
|
{useBackup && (
|
|
<div className="my-4 flex justify-center text-text-primary">
|
|
<Controller
|
|
name="backupCode"
|
|
control={control}
|
|
render={({ field: { onChange, value } }) => (
|
|
<InputOTP
|
|
maxLength={8}
|
|
value={value != null ? value : ''}
|
|
onChange={onChange}
|
|
pattern={REGEXP_ONLY_DIGITS_AND_CHARS}
|
|
>
|
|
<InputOTPGroup>
|
|
<InputOTPSlot index={0} />
|
|
<InputOTPSlot index={1} />
|
|
<InputOTPSlot index={2} />
|
|
<InputOTPSlot index={3} />
|
|
<InputOTPSlot index={4} />
|
|
<InputOTPSlot index={5} />
|
|
<InputOTPSlot index={6} />
|
|
<InputOTPSlot index={7} />
|
|
</InputOTPGroup>
|
|
</InputOTP>
|
|
)}
|
|
/>
|
|
{errors.backupCode && (
|
|
<span className="text-sm text-red-500">{errors.backupCode.message}</span>
|
|
)}
|
|
</div>
|
|
)}
|
|
<div className="flex items-center justify-between">
|
|
<button
|
|
type="submit"
|
|
aria-label={localize('com_auth_continue')}
|
|
data-testid="login-button"
|
|
disabled={isLoading}
|
|
className="w-full rounded-2xl bg-green-600 px-4 py-3 text-sm font-medium text-white transition-colors hover:bg-green-700 disabled:opacity-80 dark:bg-green-600 dark:hover:bg-green-700"
|
|
>
|
|
{isLoading ? localize('com_auth_email_verifying_ellipsis') : localize('com_ui_verify')}
|
|
</button>
|
|
</div>
|
|
<div className="mt-4 flex justify-center">
|
|
{!useBackup ? (
|
|
<button
|
|
type="button"
|
|
onClick={toggleBackupOn}
|
|
className="inline-flex p-1 text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
|
|
>
|
|
{localize('com_ui_use_backup_code')}
|
|
</button>
|
|
) : (
|
|
<button
|
|
type="button"
|
|
onClick={toggleBackupOff}
|
|
className="inline-flex p-1 text-sm font-medium text-green-600 transition-colors hover:text-green-700 dark:text-green-400 dark:hover:text-green-300"
|
|
>
|
|
{localize('com_ui_use_2fa_code')}
|
|
</button>
|
|
)}
|
|
</div>
|
|
</form>
|
|
</div>
|
|
);
|
|
});
|
|
|
|
export default TwoFactorScreen;
|