mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-17 17:00:15 +01:00
🔧 fix: URL params, package mismatch, typing, shared link redirect, and o1 (azure) (#4899)
* fix: double decoding of URL params * fix: prevent streaming options for O1 model (azure) * fix: update @langchain/openai to version 0.3.14 in package-lock.json * chore(AuthContext): typing * chore(useTimeout): typing * fix: shared link redirecting to login when code block includes "Run Code" button * fix: typing
This commit is contained in:
parent
85d92c2353
commit
2875380bf1
8 changed files with 41 additions and 22 deletions
|
|
@ -1324,6 +1324,11 @@ ${convo}
|
||||||
/** @type {(value: void | PromiseLike<void>) => void} */
|
/** @type {(value: void | PromiseLike<void>) => void} */
|
||||||
let streamResolve;
|
let streamResolve;
|
||||||
|
|
||||||
|
if (this.isO1Model === true && this.azure && modelOptions.stream) {
|
||||||
|
delete modelOptions.stream;
|
||||||
|
delete modelOptions.stop;
|
||||||
|
}
|
||||||
|
|
||||||
if (modelOptions.stream) {
|
if (modelOptions.stream) {
|
||||||
streamPromise = new Promise((resolve) => {
|
streamPromise = new Promise((resolve) => {
|
||||||
streamResolve = resolve;
|
streamResolve = resolve;
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,12 @@ const RunCode: React.FC<CodeBarProps> = React.memo(({ lang, codeRef, blockIndex
|
||||||
|
|
||||||
const { messageId, conversationId, partIndex } = useMessageContext();
|
const { messageId, conversationId, partIndex } = useMessageContext();
|
||||||
const normalizedLang = useMemo(() => normalizeLanguage(lang), [lang]);
|
const normalizedLang = useMemo(() => normalizeLanguage(lang), [lang]);
|
||||||
const { data } = useVerifyAgentToolAuth({ toolId: Tools.execute_code });
|
const { data } = useVerifyAgentToolAuth(
|
||||||
|
{ toolId: Tools.execute_code },
|
||||||
|
{
|
||||||
|
retry: 1,
|
||||||
|
},
|
||||||
|
);
|
||||||
const authType = useMemo(() => data?.message ?? false, [data?.message]);
|
const authType = useMemo(() => data?.message ?? false, [data?.message]);
|
||||||
const isAuthenticated = useMemo(() => data?.authenticated ?? false, [data?.authenticated]);
|
const isAuthenticated = useMemo(() => data?.authenticated ?? false, [data?.authenticated]);
|
||||||
const { methods, onSubmit, isDialogOpen, setIsDialogOpen, handleRevokeApiKey } =
|
const { methods, onSubmit, isDialogOpen, setIsDialogOpen, handleRevokeApiKey } =
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ const AuthContextProvider = ({
|
||||||
//@ts-ignore - ok for token to be undefined initially
|
//@ts-ignore - ok for token to be undefined initially
|
||||||
setTokenHeader(token);
|
setTokenHeader(token);
|
||||||
setIsAuthenticated(isAuthenticated);
|
setIsAuthenticated(isAuthenticated);
|
||||||
if (redirect) {
|
if (redirect != null && redirect) {
|
||||||
navigate(redirect, { replace: true });
|
navigate(redirect, { replace: true });
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
@ -83,7 +83,7 @@ const AuthContextProvider = ({
|
||||||
});
|
});
|
||||||
|
|
||||||
const logout = useCallback(() => logoutUser.mutate(undefined), [logoutUser]);
|
const logout = useCallback(() => logoutUser.mutate(undefined), [logoutUser]);
|
||||||
const userQuery = useGetUserQuery({ enabled: !!token });
|
const userQuery = useGetUserQuery({ enabled: !!(token ?? '') });
|
||||||
const refreshToken = useRefreshTokenMutation();
|
const refreshToken = useRefreshTokenMutation();
|
||||||
|
|
||||||
const login = (data: TLoginUser) => {
|
const login = (data: TLoginUser) => {
|
||||||
|
|
@ -102,18 +102,18 @@ const AuthContextProvider = ({
|
||||||
};
|
};
|
||||||
|
|
||||||
const silentRefresh = useCallback(() => {
|
const silentRefresh = useCallback(() => {
|
||||||
if (authConfig?.test) {
|
if (authConfig?.test === true) {
|
||||||
console.log('Test mode. Skipping silent refresh.');
|
console.log('Test mode. Skipping silent refresh.');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
refreshToken.mutate(undefined, {
|
refreshToken.mutate(undefined, {
|
||||||
onSuccess: (data: TLoginResponse) => {
|
onSuccess: (data: TLoginResponse | undefined) => {
|
||||||
const { user, token } = data;
|
const { user, token = '' } = data ?? {};
|
||||||
if (token) {
|
if (token) {
|
||||||
setUserContext({ token, isAuthenticated: true, user });
|
setUserContext({ token, isAuthenticated: true, user });
|
||||||
} else {
|
} else {
|
||||||
console.log('Token is not present. User is not authenticated.');
|
console.log('Token is not present. User is not authenticated.');
|
||||||
if (authConfig?.test) {
|
if (authConfig?.test === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
navigate('/login');
|
navigate('/login');
|
||||||
|
|
@ -121,7 +121,7 @@ const AuthContextProvider = ({
|
||||||
},
|
},
|
||||||
onError: (error) => {
|
onError: (error) => {
|
||||||
console.log('refreshToken mutation error:', error);
|
console.log('refreshToken mutation error:', error);
|
||||||
if (authConfig?.test) {
|
if (authConfig?.test === true) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
navigate('/login');
|
navigate('/login');
|
||||||
|
|
@ -136,10 +136,10 @@ const AuthContextProvider = ({
|
||||||
doSetError((userQuery.error as Error).message);
|
doSetError((userQuery.error as Error).message);
|
||||||
navigate('/login', { replace: true });
|
navigate('/login', { replace: true });
|
||||||
}
|
}
|
||||||
if (error && isAuthenticated) {
|
if (error != null && error && isAuthenticated) {
|
||||||
doSetError(undefined);
|
doSetError(undefined);
|
||||||
}
|
}
|
||||||
if (!token || !isAuthenticated) {
|
if (token == null || !token || !isAuthenticated) {
|
||||||
silentRefresh();
|
silentRefresh();
|
||||||
}
|
}
|
||||||
}, [
|
}, [
|
||||||
|
|
@ -149,7 +149,9 @@ const AuthContextProvider = ({
|
||||||
userQuery.isError,
|
userQuery.isError,
|
||||||
userQuery.error,
|
userQuery.error,
|
||||||
error,
|
error,
|
||||||
|
setUser,
|
||||||
navigate,
|
navigate,
|
||||||
|
silentRefresh,
|
||||||
setUserContext,
|
setUserContext,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,13 +14,11 @@ export default function useQueryParams({
|
||||||
const maxAttempts = 50; // 5 seconds maximum (50 * 100ms)
|
const maxAttempts = 50; // 5 seconds maximum (50 * 100ms)
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const promptParam = searchParams.get('prompt');
|
const decodedPrompt = searchParams.get('prompt') ?? '';
|
||||||
if (!promptParam) {
|
if (!decodedPrompt) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const decodedPrompt = decodeURIComponent(promptParam);
|
|
||||||
|
|
||||||
const intervalId = setInterval(() => {
|
const intervalId = setInterval(() => {
|
||||||
// If already processed or max attempts reached, clear interval and stop
|
// If already processed or max attempts reached, clear interval and stop
|
||||||
if (processedRef.current || attemptsRef.current >= maxAttempts) {
|
if (processedRef.current || attemptsRef.current >= maxAttempts) {
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ function useTimeout({ callback, delay = 400 }: TUseTimeoutParams) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Set new timeout
|
// Set new timeout
|
||||||
if (value) {
|
if (value != null && value) {
|
||||||
console.log(value);
|
console.log(value);
|
||||||
timeout.current = setTimeout(() => {
|
timeout.current = setTimeout(() => {
|
||||||
callback(value);
|
callback(value);
|
||||||
|
|
|
||||||
6
package-lock.json
generated
6
package-lock.json
generated
|
|
@ -665,9 +665,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"api/node_modules/@langchain/openai": {
|
"api/node_modules/@langchain/openai": {
|
||||||
"version": "0.3.12",
|
"version": "0.3.14",
|
||||||
"resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.3.12.tgz",
|
"resolved": "https://registry.npmjs.org/@langchain/openai/-/openai-0.3.14.tgz",
|
||||||
"integrity": "sha512-z8y0zdKovjY6bB0D3D+K99bPAN+wFRQcrWDfHfX7yVmYwq1O8GOIzQgCBth0vbhbzeuaJ4dz3+oqN/4Q2PCpHg==",
|
"integrity": "sha512-lNWjUo1tbvsss45IF7UQtMu1NJ6oUKvhgPYWXnX9f/d6OmuLu7D99HQ3Y88vLcUo9XjjOy417olYHignMduMjA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"js-tiktoken": "^1.0.12",
|
"js-tiktoken": "^1.0.12",
|
||||||
|
|
|
||||||
|
|
@ -338,7 +338,7 @@ export const useRegisterUserMutation = (
|
||||||
};
|
};
|
||||||
|
|
||||||
export const useRefreshTokenMutation = (): UseMutationResult<
|
export const useRefreshTokenMutation = (): UseMutationResult<
|
||||||
t.TRefreshTokenResponse,
|
t.TRefreshTokenResponse | undefined,
|
||||||
unknown,
|
unknown,
|
||||||
unknown,
|
unknown,
|
||||||
unknown
|
unknown
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@
|
||||||
import axios, { AxiosError, AxiosRequestConfig } from 'axios';
|
import axios, { AxiosError, AxiosRequestConfig } from 'axios';
|
||||||
import * as endpoints from './api-endpoints';
|
import * as endpoints from './api-endpoints';
|
||||||
import { setTokenHeader } from './headers-helpers';
|
import { setTokenHeader } from './headers-helpers';
|
||||||
|
import type * as t from './types';
|
||||||
|
|
||||||
async function _get<T>(url: string, options?: AxiosRequestConfig): Promise<T> {
|
async function _get<T>(url: string, options?: AxiosRequestConfig): Promise<T> {
|
||||||
const response = await axios.get(url, { ...options });
|
const response = await axios.get(url, { ...options });
|
||||||
|
|
@ -63,7 +64,8 @@ async function _patch(url: string, data?: any) {
|
||||||
let isRefreshing = false;
|
let isRefreshing = false;
|
||||||
let failedQueue: { resolve: (value?: any) => void; reject: (reason?: any) => void }[] = [];
|
let failedQueue: { resolve: (value?: any) => void; reject: (reason?: any) => void }[] = [];
|
||||||
|
|
||||||
const refreshToken = (retry?: boolean) => _post(endpoints.refreshToken(retry));
|
const refreshToken = (retry?: boolean): Promise<t.TRefreshTokenResponse | undefined> =>
|
||||||
|
_post(endpoints.refreshToken(retry));
|
||||||
|
|
||||||
const dispatchTokenUpdatedEvent = (token: string) => {
|
const dispatchTokenUpdatedEvent = (token: string) => {
|
||||||
setTokenHeader(token);
|
setTokenHeader(token);
|
||||||
|
|
@ -90,6 +92,7 @@ axios.interceptors.response.use(
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error.response.status === 401 && !originalRequest._retry) {
|
if (error.response.status === 401 && !originalRequest._retry) {
|
||||||
|
console.warn('401 error, refreshing token');
|
||||||
originalRequest._retry = true;
|
originalRequest._retry = true;
|
||||||
|
|
||||||
if (isRefreshing) {
|
if (isRefreshing) {
|
||||||
|
|
@ -107,16 +110,22 @@ axios.interceptors.response.use(
|
||||||
isRefreshing = true;
|
isRefreshing = true;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const { token } = await refreshToken(
|
const response = await refreshToken(
|
||||||
// Handle edge case where we get a blank screen if the initial 401 error is from a refresh token request
|
// Handle edge case where we get a blank screen if the initial 401 error is from a refresh token request
|
||||||
originalRequest.url?.includes('api/auth/refresh') ? true : false,
|
originalRequest.url?.includes('api/auth/refresh') === true ? true : false,
|
||||||
);
|
);
|
||||||
|
|
||||||
|
const token = response?.token ?? '';
|
||||||
|
|
||||||
if (token) {
|
if (token) {
|
||||||
originalRequest.headers['Authorization'] = 'Bearer ' + token;
|
originalRequest.headers['Authorization'] = 'Bearer ' + token;
|
||||||
dispatchTokenUpdatedEvent(token);
|
dispatchTokenUpdatedEvent(token);
|
||||||
processQueue(null, token);
|
processQueue(null, token);
|
||||||
return await axios(originalRequest);
|
return await axios(originalRequest);
|
||||||
|
} else if (window.location.href.includes('share/')) {
|
||||||
|
console.log(
|
||||||
|
`Refresh token failed from shared link, attempting request to ${originalRequest.url}`,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
window.location.href = '/login';
|
window.location.href = '/login';
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue