dennii/Termix
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases 22 Wiki Activity

Finish migration into main-axios

Browse Source
This commit is contained in:
LukeGus
2025-08-27 11:24:17 -05:00
parent 56fddb6fcb
commit a34c60947d
1 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/ui/main-axios.ts
View File

@@ -187,7 +187,6 @@ function createApiInstance(baseURL: string): AxiosInstance {
(response) => response, (response) => response,
(error: AxiosError) => { (error: AxiosError) => {
if (error.response?.status === 401) { if (error.response?.status === 401) {
// Token expired or invalid - clear cookie
document.cookie = 'jwt=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;'; document.cookie = 'jwt=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
} }
return Promise.reject(error); return Promise.reject(error);
@@ -201,8 +200,6 @@ function createApiInstance(baseURL: string): AxiosInstance {
// API INSTANCES // API INSTANCES
// ============================================================================ // ============================================================================
// Check if we're in development mode (Vite dev server) or if we're accessing via a specific port
// that indicates we're using nginx proxy (not localhost:3000 or similar dev ports)
const isDev = process.env.NODE_ENV === 'development' && const isDev = process.env.NODE_ENV === 'development' &&
(window.location.port === '3000' || window.location.port === '5173' || window.location.port === ''); (window.location.port === '3000' || window.location.port === '5173' || window.location.port === '');
@@ -226,9 +223,9 @@ export const statsApi = createApiInstance(
isDev ? 'http://localhost:8085' : '' isDev ? 'http://localhost:8085' : ''
); );
// Authentication API (port 8081) // Authentication API (port 8081) - includes users, alerts, version, releases
export const authApi = createApiInstance( export const authApi = createApiInstance(
isDev ? 'http://localhost:8081/users' : '/users' isDev ? 'http://localhost:8081' : ''
); );
// ============================================================================ // ============================================================================
@@ -471,7 +468,6 @@ export async function getFileManagerRecent(hostId: number): Promise<FileManagerF
const response = await sshHostApi.get(`/file_manager/recent?hostId=${hostId}`); const response = await sshHostApi.get(`/file_manager/recent?hostId=${hostId}`);
return response.data || []; return response.data || [];
} catch (error) { } catch (error) {
// Don't throw for file manager metadata - return empty array
return []; return [];
} }
} }
@@ -737,7 +733,7 @@ export async function getServerMetricsById(id: number): Promise<ServerMetrics> {
export async function registerUser(username: string, password: string): Promise<any> { export async function registerUser(username: string, password: string): Promise<any> {
try { try {
const response = await authApi.post('/create', { username, password }); const response = await authApi.post('/users/create', { username, password });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'register user'); handleApiError(error, 'register user');
@@ -746,7 +742,7 @@ export async function registerUser(username: string, password: string): Promise<
export async function loginUser(username: string, password: string): Promise<AuthResponse> { export async function loginUser(username: string, password: string): Promise<AuthResponse> {
try { try {
const response = await authApi.post('/login', { username, password }); const response = await authApi.post('/users/login', { username, password });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'login user'); handleApiError(error, 'login user');
@@ -755,7 +751,7 @@ export async function loginUser(username: string, password: string): Promise<Aut
export async function getUserInfo(): Promise<UserInfo> { export async function getUserInfo(): Promise<UserInfo> {
try { try {
const response = await authApi.get('/me'); const response = await authApi.get('/users/me');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'fetch user info'); handleApiError(error, 'fetch user info');
@@ -764,7 +760,7 @@ export async function getUserInfo(): Promise<UserInfo> {
export async function getRegistrationAllowed(): Promise<{ allowed: boolean }> { export async function getRegistrationAllowed(): Promise<{ allowed: boolean }> {
try { try {
const response = await authApi.get('/registration-allowed'); const response = await authApi.get('/users/registration-allowed');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'check registration status'); handleApiError(error, 'check registration status');
@@ -773,7 +769,7 @@ export async function getRegistrationAllowed(): Promise<{ allowed: boolean }> {
export async function getOIDCConfig(): Promise<any> { export async function getOIDCConfig(): Promise<any> {
try { try {
const response = await authApi.get('/oidc-config'); const response = await authApi.get('/users/oidc-config');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'fetch OIDC config'); handleApiError(error, 'fetch OIDC config');
@@ -782,7 +778,7 @@ export async function getOIDCConfig(): Promise<any> {
export async function getUserCount(): Promise<UserCount> { export async function getUserCount(): Promise<UserCount> {
try { try {
const response = await authApi.get('/count'); const response = await authApi.get('/users/count');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'fetch user count'); handleApiError(error, 'fetch user count');
@@ -791,7 +787,7 @@ export async function getUserCount(): Promise<UserCount> {
export async function initiatePasswordReset(username: string): Promise<any> { export async function initiatePasswordReset(username: string): Promise<any> {
try { try {
const response = await authApi.post('/initiate-reset', { username }); const response = await authApi.post('/users/initiate-reset', { username });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'initiate password reset'); handleApiError(error, 'initiate password reset');
@@ -800,7 +796,7 @@ export async function initiatePasswordReset(username: string): Promise<any> {
export async function verifyPasswordResetCode(username: string, resetCode: string): Promise<any> { export async function verifyPasswordResetCode(username: string, resetCode: string): Promise<any> {
try { try {
const response = await authApi.post('/verify-reset-code', { username, resetCode }); const response = await authApi.post('/users/verify-reset-code', { username, resetCode });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'verify reset code'); handleApiError(error, 'verify reset code');
@@ -809,7 +805,7 @@ export async function verifyPasswordResetCode(username: string, resetCode: strin
export async function completePasswordReset(username: string, tempToken: string, newPassword: string): Promise<any> { export async function completePasswordReset(username: string, tempToken: string, newPassword: string): Promise<any> {
try { try {
const response = await authApi.post('/complete-reset', { username, tempToken, newPassword }); const response = await authApi.post('/users/complete-reset', { username, tempToken, newPassword });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'complete password reset'); handleApiError(error, 'complete password reset');
@@ -818,7 +814,7 @@ export async function completePasswordReset(username: string, tempToken: string,
export async function getOIDCAuthorizeUrl(): Promise<OIDCAuthorize> { export async function getOIDCAuthorizeUrl(): Promise<OIDCAuthorize> {
try { try {
const response = await authApi.get('/oidc/authorize'); const response = await authApi.get('/users/oidc/authorize');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'get OIDC authorize URL'); handleApiError(error, 'get OIDC authorize URL');
@@ -831,7 +827,7 @@ export async function getOIDCAuthorizeUrl(): Promise<OIDCAuthorize> {
export async function getUserList(): Promise<{ users: UserInfo[] }> { export async function getUserList(): Promise<{ users: UserInfo[] }> {
try { try {
const response = await authApi.get('/list'); const response = await authApi.get('/users/list');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'fetch user list'); handleApiError(error, 'fetch user list');
@@ -840,7 +836,7 @@ export async function getUserList(): Promise<{ users: UserInfo[] }> {
export async function makeUserAdmin(username: string): Promise<any> { export async function makeUserAdmin(username: string): Promise<any> {
try { try {
const response = await authApi.post('/make-admin', { username }); const response = await authApi.post('/users/make-admin', { username });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'make user admin'); handleApiError(error, 'make user admin');
@@ -849,7 +845,7 @@ export async function makeUserAdmin(username: string): Promise<any> {
export async function removeAdminStatus(username: string): Promise<any> { export async function removeAdminStatus(username: string): Promise<any> {
try { try {
const response = await authApi.post('/remove-admin', { username }); const response = await authApi.post('/users/remove-admin', { username });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'remove admin status'); handleApiError(error, 'remove admin status');
@@ -858,7 +854,7 @@ export async function removeAdminStatus(username: string): Promise<any> {
export async function deleteUser(username: string): Promise<any> { export async function deleteUser(username: string): Promise<any> {
try { try {
const response = await authApi.delete('/delete-user', { data: { username } }); const response = await authApi.delete('/users/delete-user', { data: { username } });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'delete user'); handleApiError(error, 'delete user');
@@ -867,7 +863,7 @@ export async function deleteUser(username: string): Promise<any> {
export async function deleteAccount(password: string): Promise<any> { export async function deleteAccount(password: string): Promise<any> {
try { try {
const response = await authApi.delete('/delete-account', { data: { password } }); const response = await authApi.delete('/users/delete-account', { data: { password } });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'delete account'); handleApiError(error, 'delete account');
@@ -876,7 +872,7 @@ export async function deleteAccount(password: string): Promise<any> {
export async function updateRegistrationAllowed(allowed: boolean): Promise<any> { export async function updateRegistrationAllowed(allowed: boolean): Promise<any> {
try { try {
const response = await authApi.patch('/registration-allowed', { allowed }); const response = await authApi.patch('/users/registration-allowed', { allowed });
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'update registration allowed'); handleApiError(error, 'update registration allowed');
@@ -885,7 +881,7 @@ export async function updateRegistrationAllowed(allowed: boolean): Promise<any>
export async function updateOIDCConfig(config: any): Promise<any> { export async function updateOIDCConfig(config: any): Promise<any> {
try { try {
const response = await authApi.post('/oidc-config', config); const response = await authApi.post('/users/oidc-config', config);
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'update OIDC config'); handleApiError(error, 'update OIDC config');
@@ -942,7 +938,7 @@ export async function getVersionInfo(): Promise<any> {
export async function getDatabaseHealth(): Promise<any> { export async function getDatabaseHealth(): Promise<any> {
try { try {
const response = await authApi.get('/db-health'); const response = await authApi.get('/users/db-health');
return response.data; return response.data;
} catch (error) { } catch (error) {
handleApiError(error, 'check database health'); handleApiError(error, 'check database health');