Skip to content

refactor(auth): improve token handling and add retry logic #81

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.

Sign up for GitHub

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

Merged
indrazm merged 1 commit into from
Nov 28, 2025
Merged

refactor(auth): improve token handling and add retry logic #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion apps/admin/src/components/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import {
Zap,
} from "lucide-react";
import { useAccount } from "../features/auth/hooks/useAccount";
import { clearTokens } from "../utils/api";

interface MenuItemProps {
icon: React.ReactNode;
Expand All @@ -38,7 +39,7 @@ export const Sidebar = () => {
const { account } = useAccount();

const handleLogout = () => {
localStorage.removeItem("token");
clearTokens();
window.location.href = "/";
};

Expand Down
22 changes: 18 additions & 4 deletions apps/admin/src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { createApi } from "@opencircle/core";
import ky from "ky";
import ky, { HTTPError } from "ky";

const API_URL = import.meta.env.VITE_API_URL || "http://localhost:8000/api";

let isRefreshing = false;
let refreshPromise: Promise<string | null> | null = null;

async function refreshAccessToken(): Promise<string | null> {
const MAX_REFRESH_RETRIES = 2;

async function refreshAccessToken(retryCount = 0): Promise<string | null> {
const refreshToken = localStorage.getItem("refreshToken");
if (!refreshToken) {
return null;
Expand All @@ -21,9 +23,21 @@ async function refreshAccessToken(): Promise<string | null> {

localStorage.setItem("token", response.access_token);
return response.access_token;
} catch {
} catch (error) {
if (error instanceof HTTPError && error.response.status === 401) {
localStorage.removeItem("token");
localStorage.removeItem("refreshToken");
return null;
}

if (retryCount < MAX_REFRESH_RETRIES) {
await new Promise((resolve) =>
setTimeout(resolve, 1000 * (retryCount + 1)),
);
return refreshAccessToken(retryCount + 1);
}

localStorage.removeItem("token");
localStorage.removeItem("refreshToken");
return null;
}
}
Expand Down
22 changes: 18 additions & 4 deletions apps/platform/src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import { createApi } from "@opencircle/core";
import ky from "ky";
import ky, { HTTPError } from "ky";

const API_URL = import.meta.env.VITE_API_URL || "http://localhost:8000/api";

let isRefreshing = false;
let refreshPromise: Promise<string | null> | null = null;

async function refreshAccessToken(): Promise<string | null> {
const MAX_REFRESH_RETRIES = 2;

async function refreshAccessToken(retryCount = 0): Promise<string | null> {
const refreshToken = localStorage.getItem("refreshToken");
if (!refreshToken) {
return null;
Expand All @@ -21,9 +23,21 @@ async function refreshAccessToken(): Promise<string | null> {

localStorage.setItem("token", response.access_token);
return response.access_token;
} catch {
} catch (error) {
if (error instanceof HTTPError && error.response.status === 401) {
localStorage.removeItem("token");
localStorage.removeItem("refreshToken");
return null;
}

if (retryCount < MAX_REFRESH_RETRIES) {
await new Promise((resolve) =>
setTimeout(resolve, 1000 * (retryCount + 1)),
);
return refreshAccessToken(retryCount + 1);
}

localStorage.removeItem("token");
localStorage.removeItem("refreshToken");
return null;
}
}
Expand Down