Skip to content

A self-hosted media server and file management system

fix: code smells

aminnausin25417b775979
diff --git a/resources/js/service/api.ts b/resources/js/service/api.ts
index 1fee50d3..ad6586f0 100644
--- a/resources/js/service/api.ts
+++ b/resources/js/service/api.ts
@@ -1,12 +1,9 @@
-import type { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
-
import { useAuthStore } from '@/stores/AuthStore';
-import { AxiosError } from 'axios';
import { getCSRF } from '@/service/authAPI';
import { toast } from '@aminnausin/cedar-ui';
+import axios, { AxiosError, type AxiosResponse, type InternalAxiosRequestConfig } from 'axios';
import nProgress from 'nprogress';
-import axios from 'axios';
// For progress bar
let progressTimeout: NodeJS.Timeout;
@@ -17,11 +14,9 @@ let isRefreshing = false;
let queue: Array<(tokenReady: boolean) => void> = []; // A queue of promises that are conditionally called after attempt at refreshing csrf
function refreshCsrf() {
- if (!csrfRefreshPromise) {
- csrfRefreshPromise = getCSRF().finally(() => {
- csrfRefreshPromise = null;
- });
- }
+ csrfRefreshPromise ??= getCSRF().finally(() => {
+ csrfRefreshPromise = null;
+ });
return csrfRefreshPromise;
}
@@ -47,7 +42,7 @@ const handleError = async (error: AxiosError<{ message?: string }>) => {
const auth = useAuthStore();
const status = error.response?.status ?? 0;
- const config = error.config as InternalAxiosRequestConfig & { _retried?: boolean };
+ const config = error.config;
const message = error.response?.data?.message ?? error.message;
const showToast = !config?.headers?.['X-Skip-Toast'];
diff --git a/resources/js/service/authAPI.ts b/resources/js/service/authAPI.ts
index 4e46a359..315ba881 100644
--- a/resources/js/service/authAPI.ts
+++ b/resources/js/service/authAPI.ts
@@ -29,7 +29,7 @@ export const register = async (credentials: any) => {
export const logout = async () => {
const response = await API.delete('/logout');
- return Promise.resolve({ response: response.data });
+ return { response: response.data };
};
export const authenticate = async (): Promise<AxiosResponse<{ user: UserResource | null; isAuthenticated: boolean }>> => {
diff --git a/resources/js/stores/AuthStore.ts b/resources/js/stores/AuthStore.ts
index 27dcd9ab..8cec4ec9 100644
--- a/resources/js/stores/AuthStore.ts
+++ b/resources/js/stores/AuthStore.ts
@@ -60,7 +60,7 @@ export const useAuthStore = defineStore('Auth', () => {
localStorage.removeItem('auth-token'); // Legacy: Clears existing auth-tokens. No auth-tokens are created ever again.
if (!showMessage) return;
- const message = `Login Expired${status ? ` (${status})` : ''}`;
+ const message = 'Login Expired' + status ? ` ${status}` : '';
// Can remove?
toast.warning(message, {
diff --git a/resources/js/types/axios.d.ts b/resources/js/types/axios.d.ts
new file mode 100644
index 00000000..2916fe7d
--- /dev/null
+++ b/resources/js/types/axios.d.ts
@@ -0,0 +1,8 @@
+// axios.d.ts
+import 'axios';
+
+declare module 'axios' {
+ export interface InternalAxiosRequestConfig {
+ _retried?: boolean;
+ }
+}