Skip to content

refactor(api): update auth endpoints and request handling #82

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(api): update auth endpoints and request handling #82

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
33 changes: 28 additions & 5 deletions apps/admin/src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async function refreshAccessToken(retryCount = 0): Promise<string | null> {

try {
const response = await ky
.post(`${API_URL}/auth/refresh`, {
.post(`${API_URL}/refresh`, {
json: { refresh_token: refreshToken },
})
.json<{ access_token: string; token_type: string }>();
Expand Down Expand Up @@ -55,6 +55,20 @@ async function getValidAccessToken(): Promise<string | null> {
return token;
}

const kyClient = ky.create({
prefixUrl: API_URL,
hooks: {
beforeRequest: [
(request) => {
const token = localStorage.getItem("token");
if (token) {
request.headers.set("Authorization", `Bearer ${token}`);
}
},
],
},
});

export const api = createApi(API_URL, {
beforeRequest: [
(request) => {
Expand All @@ -67,13 +81,22 @@ export const api = createApi(API_URL, {
],
afterResponse: [
async (request, _options, response) => {
if (response.status === 401 && !request.url.includes("/auth/refresh")) {
if (response.status === 401 && !request.url.includes("/refresh")) {
const newToken = await getValidAccessToken();
if (newToken) {
request.headers.set("Authorization", `Bearer ${newToken}`);
return ky(request);
const url = request.url.replace(API_URL + "/", "");
return kyClient(url, {
method: request.method,
headers: {
Authorization: `Bearer ${newToken}`,
},
body:
request.method !== "GET" && request.method !== "HEAD"
? request.body
: undefined,
});
}
window.location.href = "/";
clearTokens();
}
return response;
},
Expand Down
8 changes: 2 additions & 6 deletions apps/platform/src/contexts/webSocketContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,8 @@ export const WebSocketProvider = ({ children }: { children: ReactNode }) => {
} = useWebSocket({
userId: account?.id || "",
onMessage: () => {},
onConnect: () => {
console.info("[WebSocket] Connected - User presence tracking active");
},
onDisconnect: () => {
console.info("[WebSocket] Disconnected - User presence tracking stopped");
},
onConnect: () => {},
onDisconnect: () => {},
onError: () => {
console.warn("[WebSocket] Connection error");
},
Expand Down
33 changes: 28 additions & 5 deletions apps/platform/src/utils/api.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ async function refreshAccessToken(retryCount = 0): Promise<string | null> {

try {
const response = await ky
.post(`${API_URL}/auth/refresh`, {
.post(`${API_URL}/refresh`, {
json: { refresh_token: refreshToken },
})
.json<{ access_token: string; token_type: string }>();
Expand Down Expand Up @@ -55,6 +55,20 @@ async function getValidAccessToken(): Promise<string | null> {
return token;
}

const kyClient = ky.create({
prefixUrl: API_URL,
hooks: {
beforeRequest: [
(request) => {
const token = localStorage.getItem("token");
if (token) {
request.headers.set("Authorization", `Bearer ${token}`);
}
},
],
},
});

export const api = createApi(API_URL, {
beforeRequest: [
(request) => {
Expand All @@ -67,13 +81,22 @@ export const api = createApi(API_URL, {
],
afterResponse: [
async (request, _options, response) => {
if (response.status === 401 && !request.url.includes("/auth/refresh")) {
if (response.status === 401 && !request.url.includes("/refresh")) {
const newToken = await getValidAccessToken();
if (newToken) {
request.headers.set("Authorization", `Bearer ${newToken}`);
return ky(request);
const url = request.url.replace(API_URL + "/", "");
return kyClient(url, {
method: request.method,
headers: {
Authorization: `Bearer ${newToken}`,
},
body:
request.method !== "GET" && request.method !== "HEAD"
? request.body
: undefined,
});
}
window.location.href = "/login";
clearTokens();
}
return response;
},
Expand Down