mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-11 13:08:51 +01:00
* ✨feat: OAuth for Actions * WIP: PoC flow state manager * refactor: Add identifier field to token model from action schema * chore: fix potential file type issues * ci: fix type issue with action metadata auth * fix: ensure FlowManagerOptions has a default ttl value * WIP: OAUTH actions * WIP: first pass OAuth Action * fix: standardize identifier usage in OAuth flow handling * fix: update token retrieval to include userId in query and use correct identifier * refacotr: update token retrieval to use userId for OAuth token query * feat: Tool Call Auth styling * fix: streamline token creation and add type field to token schema * refactor: cleanup OAuth flow by encrypting client credentials and ensuring oauth operations only run under condition * refactor: use encrypted credentials in OAuth callback * fix: update Token collection indexes to use expiresAt TTL index and not createdAt legacy index * refactor: enhance Token index cleanup by improving logging and removing redundant index creation logic * refactor: remove unused OAuth login route and related logic for improved clarity * refactor: replace fetch with axios for OAuth token exchange and improve error handling * refactor: better UX after authentication before oauth tool execution * refactor: implement cleanup handlers for FlowStateManager intervals to enhance resource management * refactor: encrypt OAuth tokens before storing and decrypt upon retrieval for enhanced security * refactor: enhance authentication success page with improved styling and countdown feature * refactor: add response_type parameter to OAuth redirect URI for improved compatibility * chore: update translation.json new localizations * chore: remove unused OGDialog import from OGDialogTemplate component * refactor: Actions Auth using new Dialog styling, use same component with Agents/Assistants * refactor: update removeNullishValues function to support removal of empty strings and adjust transform usage in schemas * chore: bump version of librechat-data-provider to 0.7.6991 * refactor: integrate removeNullishValues function to clean metadata before encryption in agent and assistant routes * refactor: update OAuth input fields to use 'password' type for better security * refactor: update localization placeholders for sign-in message to use double curly braces * refactor: add access_type parameter for offline access in createActionTool function * refactor: implement handleOAuthToken function for token management and encryption * feat: refresh token support * refactor: add default expiration for access token and error handling for missing token * feat: localizations for ActionAuth * refactor: set refresh token expiration to null to not expire if expiry never given * fix: prevent crash fromerror within async handleAbortError in AskController, EditController, and AgentController * feat: Action Callback URL * 🌍 i18n: Update translation.json with latest translations * refactor: handle errors in flow state checking to prevent unhandled promise rejections * fix: improve flow state concurrency to prevent multiple token creation calls * refactor: RequestExecutor to use separate axios instance * refactor: improve concurrency flows by keeping completed state until TTL expiry * refactor: increase TTL for flow state management and adjust monitoring interval * ci: mock axios instance creation in actions spec * feat: add Babel and Jest configuration files; implement FlowStateManager tests with concurrency handling * chore: add disableOAuth prop to ActionsAuth (not implemented for Assistants yet) --------- Co-authored-by: Danny Avila <danny@librechat.ai> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
162 lines
5.8 KiB
TypeScript
162 lines
5.8 KiB
TypeScript
import { useEffect } from 'react';
|
|
import { useForm, FormProvider } from 'react-hook-form';
|
|
import {
|
|
AuthTypeEnum,
|
|
AuthorizationTypeEnum,
|
|
TokenExchangeMethodEnum,
|
|
} from 'librechat-data-provider';
|
|
import { ChevronLeft } from 'lucide-react';
|
|
import type { AgentPanelProps, ActionAuthForm } from '~/common';
|
|
import ActionsAuth from '~/components/SidePanel/Builder/ActionsAuth';
|
|
import { OGDialog, OGDialogTrigger, Label } from '~/components/ui';
|
|
import OGDialogTemplate from '~/components/ui/OGDialogTemplate';
|
|
import { useDeleteAgentAction } from '~/data-provider';
|
|
import useLocalize from '~/hooks/useLocalize';
|
|
import { useToastContext } from '~/Providers';
|
|
import { TrashIcon } from '~/components/svg';
|
|
import ActionsInput from './ActionsInput';
|
|
import { Panel } from '~/common';
|
|
|
|
export default function ActionsPanel({
|
|
// activePanel,
|
|
action,
|
|
setAction,
|
|
agent_id,
|
|
setActivePanel,
|
|
}: AgentPanelProps) {
|
|
const localize = useLocalize();
|
|
const { showToast } = useToastContext();
|
|
const deleteAgentAction = useDeleteAgentAction({
|
|
onSuccess: () => {
|
|
showToast({
|
|
message: localize('com_assistants_delete_actions_success'),
|
|
status: 'success',
|
|
});
|
|
setActivePanel(Panel.builder);
|
|
setAction(undefined);
|
|
},
|
|
onError(error) {
|
|
showToast({
|
|
message: (error as Error).message ?? localize('com_assistants_delete_actions_error'),
|
|
status: 'error',
|
|
});
|
|
},
|
|
});
|
|
|
|
const methods = useForm<ActionAuthForm>({
|
|
defaultValues: {
|
|
/* General */
|
|
type: AuthTypeEnum.None,
|
|
saved_auth_fields: false,
|
|
/* API key */
|
|
api_key: '',
|
|
authorization_type: AuthorizationTypeEnum.Basic,
|
|
custom_auth_header: '',
|
|
/* OAuth */
|
|
oauth_client_id: '',
|
|
oauth_client_secret: '',
|
|
authorization_url: '',
|
|
client_url: '',
|
|
scope: '',
|
|
token_exchange_method: TokenExchangeMethodEnum.DefaultPost,
|
|
},
|
|
});
|
|
|
|
const { reset, watch } = methods;
|
|
|
|
useEffect(() => {
|
|
if (action?.metadata.auth) {
|
|
reset({
|
|
type: action.metadata.auth.type || AuthTypeEnum.None,
|
|
saved_auth_fields: false,
|
|
api_key: action.metadata.api_key ?? '',
|
|
authorization_type: action.metadata.auth.authorization_type || AuthorizationTypeEnum.Basic,
|
|
oauth_client_id: action.metadata.oauth_client_id ?? '',
|
|
oauth_client_secret: action.metadata.oauth_client_secret ?? '',
|
|
authorization_url: action.metadata.auth.authorization_url ?? '',
|
|
client_url: action.metadata.auth.client_url ?? '',
|
|
scope: action.metadata.auth.scope ?? '',
|
|
token_exchange_method:
|
|
action.metadata.auth.token_exchange_method ?? TokenExchangeMethodEnum.DefaultPost,
|
|
});
|
|
}
|
|
}, [action, reset]);
|
|
|
|
return (
|
|
<FormProvider {...methods}>
|
|
<form className="h-full grow overflow-hidden">
|
|
<div className="h-full overflow-auto px-2 pb-12 text-sm">
|
|
<div className="relative flex flex-col items-center px-16 py-6 text-center">
|
|
<div className="absolute left-0 top-6">
|
|
<button
|
|
type="button"
|
|
className="btn btn-neutral relative"
|
|
onClick={() => {
|
|
setActivePanel(Panel.builder);
|
|
setAction(undefined);
|
|
}}
|
|
>
|
|
<div className="flex w-full items-center justify-center gap-2">
|
|
<ChevronLeft />
|
|
</div>
|
|
</button>
|
|
</div>
|
|
|
|
{!!action && (
|
|
<OGDialog>
|
|
<OGDialogTrigger asChild>
|
|
<div className="absolute right-0 top-6">
|
|
<button
|
|
type="button"
|
|
disabled={!agent_id || !action.action_id}
|
|
className="btn btn-neutral border-token-border-light relative h-9 rounded-lg font-medium"
|
|
>
|
|
<TrashIcon className="text-red-500" />
|
|
</button>
|
|
</div>
|
|
</OGDialogTrigger>
|
|
<OGDialogTemplate
|
|
showCloseButton={false}
|
|
title={localize('com_ui_delete_action')}
|
|
className="max-w-[450px]"
|
|
main={
|
|
<Label className="text-left text-sm font-medium">
|
|
{localize('com_ui_delete_action_confirm')}
|
|
</Label>
|
|
}
|
|
selection={{
|
|
selectHandler: () => {
|
|
if (!agent_id) {
|
|
return showToast({
|
|
message: 'No agent_id found, is the agent created?',
|
|
status: 'error',
|
|
});
|
|
}
|
|
deleteAgentAction.mutate({
|
|
action_id: action.action_id,
|
|
agent_id,
|
|
});
|
|
},
|
|
selectClasses:
|
|
'bg-red-700 dark:bg-red-600 hover:bg-red-800 dark:hover:bg-red-800 transition-color duration-200 text-white',
|
|
selectText: localize('com_ui_delete'),
|
|
}}
|
|
/>
|
|
</OGDialog>
|
|
)}
|
|
|
|
<div className="text-xl font-medium">{(action ? 'Edit' : 'Add') + ' ' + 'actions'}</div>
|
|
<div className="text-xs text-text-secondary">
|
|
{localize('com_assistants_actions_info')}
|
|
</div>
|
|
{/* <div className="text-sm text-text-secondary">
|
|
<a href="https://help.openai.com/en/articles/8554397-creating-a-gpt" target="_blank" rel="noreferrer" className="font-medium">Learn more.</a>
|
|
</div> */}
|
|
</div>
|
|
<ActionsAuth />
|
|
<ActionsInput action={action} agent_id={agent_id} setAction={setAction} />
|
|
</div>
|
|
</form>
|
|
</FormProvider>
|
|
);
|
|
}
|