Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix: Refresh Token Renovation #1511

Merged
merged 1 commit into from Mar 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/backend/langflow/api/v1/login.py
Expand Up @@ -98,7 +98,7 @@ async def refresh_token(request: Request, response: Response, settings_service=D
response.set_cookie(
"refresh_token_lf",
tokens["refresh_token"],
httponly=auth_settings.REFRESH_TOKEN_HTTPONLY,
httponly=auth_settings.REFRESH_HTTPONLY,
samesite=auth_settings.REFRESH_SAME_SITE,
secure=auth_settings.REFRESH_SECURE,
expires=auth_settings.REFRESH_TOKEN_EXPIRE_MINUTES * 60,
Expand Down
23 changes: 11 additions & 12 deletions src/frontend/src/controllers/API/api.tsx
@@ -1,7 +1,6 @@
import axios, { AxiosError, AxiosInstance } from "axios";
import { useContext, useEffect } from "react";
import { Cookies } from "react-cookie";
import { useNavigate } from "react-router-dom";
import { renewAccessToken } from ".";
import { BuildStatus } from "../../constants/enums";
import { AuthContext } from "../../contexts/authContext";
Expand All @@ -17,26 +16,25 @@ function ApiInterceptor() {
const setErrorData = useAlertStore((state) => state.setErrorData);
let { accessToken, login, logout, authenticationErrorCount, autoLogin } =
useContext(AuthContext);
const navigate = useNavigate();
const cookies = new Cookies();

useEffect(() => {
const interceptor = api.interceptors.response.use(
(response) => response,
async (error: AxiosError) => {
if (error.response?.status === 401) {
const accessToken = cookies.get("access_token_lf");

if (accessToken && !autoLogin) {
if (error.response?.status === 403 || error.response?.status === 401) {
if (!autoLogin) {
checkErrorCount();
await tryToRenewAccessToken(error);
}
const acceptedRequest = await tryToRenewAccessToken(error);

if (!accessToken && error?.config?.url?.includes("login")) {
return Promise.reject(error);
}
const accessToken = cookies.get("access_token_lf");

return logout();
if (!accessToken && error?.config?.url?.includes("login")) {
return Promise.reject(error);
}

return acceptedRequest;
}
}
await clearBuildVerticesState(error);
return Promise.reject(error);
Expand Down Expand Up @@ -116,6 +114,7 @@ function ApiInterceptor() {
return response;
}
} catch (error) {
clearBuildVerticesState(error);
logout();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/pages/StorePage/index.tsx
Expand Up @@ -147,7 +147,7 @@ export default function StorePage(): JSX.Element {
}
})
.catch((err) => {
if (err.response.status === 403 || err.response.status === 401) {
if (err.response?.status === 403 || err.response?.status === 401) {
setValidApiKey(false);
} else {
setSearchData([]);
Expand Down