Skip to content

fix: tokens #113

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
4ndrelim merged 1 commit into from
Feb 7, 2026
Merged

fix: tokens #113

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
34 changes: 25 additions & 9 deletions webapp/_webapp/src/libs/apiclient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { EventEmitter } from "events";
import { ErrorCode, ErrorSchema } from "../pkg/gen/apiclient/shared/v1/shared_pb";
import { errorToast } from "./toasts";
import { storage } from "./storage";
import { useAuthStore } from "../stores/auth-store";

// Exhaustive type check helper - will cause compile error if a case is not handled
const assertNever = (x: never): never => {
Expand All @@ -29,6 +30,7 @@ class ApiClient {
private axiosInstance: AxiosInstance;
private refreshToken: string | null;
private onTokenRefreshedEventEmitter: EventEmitter;
private refreshPromise: Promise<void> | null = null;

constructor(baseURL: string, apiVersion: ApiVersion) {
this.axiosInstance = axios.create({
Expand Down Expand Up @@ -64,6 +66,8 @@ class ApiClient {
}

setTokens(token: string, refreshToken: string): void {
useAuthStore.getState().setToken(token);
useAuthStore.getState().setRefreshToken(refreshToken);
this.refreshToken = refreshToken;
this.axiosInstance.defaults.headers.common["Authorization"] = `Bearer ${token}`;
}
Expand All @@ -89,15 +93,27 @@ class ApiClient {
}

async refresh() {
const response = await this.axiosInstance.post<JsonValue>("/auth/refresh", {
refreshToken: this.refreshToken,
});
const resp = fromJson(RefreshTokenResponseSchema, response.data);
this.setTokens(resp.token, resp.refreshToken);
this.onTokenRefreshedEventEmitter.emit("tokenRefreshed", {
token: resp.token,
refreshToken: resp.refreshToken,
});
if (this.refreshPromise) {
return this.refreshPromise;
}

this.refreshPromise = (async () => {
try {
const response = await this.axiosInstance.post<JsonValue>("/auth/refresh", {
refreshToken: this.refreshToken,
});
const resp = fromJson(RefreshTokenResponseSchema, response.data);
this.setTokens(resp.token, resp.refreshToken);
this.onTokenRefreshedEventEmitter.emit("tokenRefreshed", {
token: resp.token,
refreshToken: resp.refreshToken,
});
} finally {
this.refreshPromise = null;
}
})();

return this.refreshPromise;
}

private async requestWithRefresh(config: AxiosRequestConfig): Promise<JsonValue> {
Expand Down