-
Notifications
You must be signed in to change notification settings - Fork 3
[READY] Replace axios with native fetch wrapper #1109
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.
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
Open
Sharqiewicz
wants to merge
5
commits into
staging
Choose a base branch
from
chore/remove-axios
base: staging
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
0a3efc0
replace axios with native fetch wrapper in frontend
Sharqiewicz 1aa743d
replace axios with native fetch in shared package
Sharqiewicz ff17113
thread AbortSignal from TanStack Query into service calls
Sharqiewicz b8c48e7
remove axios dependency
Sharqiewicz cbeeae1
address PR comments
Sharqiewicz File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,83 +1,90 @@ | ||
| import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from "axios"; | ||
| import { SIGNING_SERVICE_URL } from "../../constants/constants"; | ||
| import { AuthService } from "../auth"; | ||
|
|
||
| // TODO: CONSIDER REACT TANSTACK QUERY | ||
| export class ApiError extends Error { | ||
| status: number; | ||
| data: { error?: string; message?: string; details?: string }; | ||
|
|
||
| /** | ||
| * Base API client for making requests to the backend | ||
| */ | ||
| export const apiClient: AxiosInstance = axios.create({ | ||
| baseURL: `${SIGNING_SERVICE_URL}/v1`, | ||
| headers: { | ||
| "Content-Type": "application/json" | ||
| }, | ||
| timeout: 30000 | ||
| }); | ||
| constructor(status: number, data: Record<string, unknown>, message: string) { | ||
| super(message); | ||
| this.status = status; | ||
| this.data = data; | ||
| } | ||
| } | ||
|
|
||
| export function isApiError(error: unknown): error is ApiError { | ||
| return error instanceof ApiError; | ||
| } | ||
|
|
||
| // Add request interceptor for common headers and auth token | ||
| apiClient.interceptors.request.use( | ||
| config => { | ||
| // Add Authorization header if user is authenticated | ||
| const tokens = AuthService.getTokens(); | ||
| if (tokens?.accessToken) { | ||
| config.headers.Authorization = `Bearer ${tokens.accessToken}`; | ||
| async function apiFetch<T>( | ||
| method: string, | ||
| path: string, | ||
| options: { | ||
| data?: unknown; | ||
| params?: Record<string, string | number | boolean | undefined>; | ||
| headers?: Record<string, string>; | ||
| signal?: AbortSignal; | ||
| } = {} | ||
| ): Promise<T> { | ||
| const tokens = AuthService.getTokens(); | ||
|
|
||
| const url = new URL(`${SIGNING_SERVICE_URL}/v1${path}`); | ||
| if (options.params) { | ||
| for (const [key, value] of Object.entries(options.params)) { | ||
| if (value !== undefined) url.searchParams.set(key, String(value)); | ||
| } | ||
| return config; | ||
| }, | ||
| error => { | ||
| return Promise.reject(error); | ||
| } | ||
| ); | ||
|
|
||
| // Add response interceptor for error handling | ||
| apiClient.interceptors.response.use( | ||
| response => { | ||
| return response; | ||
| }, | ||
| (error: AxiosError) => { | ||
| console.error("API Error:", error.response?.data || error.message); | ||
| return Promise.reject(error); | ||
| const isFormData = options.data instanceof FormData; | ||
|
|
||
| const response = await fetch(url.toString(), { | ||
| body: isFormData ? (options.data as FormData) : options.data !== undefined ? JSON.stringify(options.data) : undefined, | ||
| headers: { | ||
| ...(tokens?.accessToken ? { Authorization: `Bearer ${tokens.accessToken}` } : {}), | ||
| ...(!isFormData ? { "Content-Type": "application/json" } : {}), | ||
| ...options.headers | ||
| }, | ||
| method, | ||
| signal: options.signal ?? AbortSignal.timeout(30000) | ||
| }); | ||
|
Comment on lines
+40
to
+49
|
||
|
|
||
| if (!response.ok) { | ||
| const errorData = (await response.json().catch(() => ({}))) as { error?: string; message?: string }; | ||
| console.error("API Error:", errorData); | ||
| throw new ApiError(response.status, errorData, errorData.error ?? errorData.message ?? response.statusText); | ||
| } | ||
| ); | ||
|
|
||
| /** | ||
| * Helper function to handle API errors | ||
| * @param error The error object | ||
| * @param defaultMessage Default error message | ||
| * @returns Formatted error message | ||
| */ | ||
| if (response.status === 204) return undefined as T; | ||
| return response.json() as Promise<T>; | ||
| } | ||
|
|
||
| export const handleApiError = (error: unknown, defaultMessage = "An error occurred"): string => { | ||
| if (axios.isAxiosError(error)) { | ||
| const responseData = error.response?.data as { error?: string; message?: string; details?: string } | undefined; | ||
| return responseData?.error || responseData?.message || error.message || defaultMessage; | ||
| if (isApiError(error)) { | ||
| return error.data?.error ?? error.data?.message ?? error.message ?? defaultMessage; | ||
| } | ||
| return error instanceof Error ? error.message : defaultMessage; | ||
| }; | ||
|
Comment on lines
+4
to
66
|
||
|
|
||
| /** | ||
| * Generic API request function with error handling | ||
| * @param method The HTTP method | ||
| * @param url The endpoint URL | ||
| * @param data The request data | ||
| * @param config Additional axios config | ||
| * @returns The response data | ||
| */ | ||
| export async function apiRequest<T>( | ||
| method: "get" | "post" | "put" | "delete", | ||
| url: string, | ||
| data?: unknown, | ||
| config?: AxiosRequestConfig | ||
| ): Promise<T> { | ||
| try { | ||
| const response = await apiClient.request<T>({ | ||
| data, | ||
| method, | ||
| url, | ||
| ...config | ||
| }); | ||
| return response.data; | ||
| } catch (error) { | ||
| throw new Error(handleApiError(error)); | ||
| config?: { | ||
| params?: Record<string, string | number | boolean | undefined>; | ||
| headers?: Record<string, string>; | ||
| signal?: AbortSignal; | ||
| } | ||
| ): Promise<T> { | ||
| return apiFetch<T>(method, url, { data, ...config }); | ||
| } | ||
|
|
||
| type Params = Record<string, string | number | boolean | undefined>; | ||
|
|
||
| export const apiClient = { | ||
| delete: <T>(url: string, config?: { params?: Params }) => apiFetch<T>("DELETE", url, { params: config?.params }), | ||
| get: <T>(url: string, config?: { params?: Params; signal?: AbortSignal }) => | ||
| apiFetch<T>("GET", url, { params: config?.params, signal: config?.signal }), | ||
| post: <T>(url: string, data?: unknown, config?: { headers?: Record<string, string>; params?: Params }) => | ||
| apiFetch<T>("POST", url, { data, headers: config?.headers, params: config?.params }), | ||
| put: <T>(url: string, data?: unknown) => apiFetch<T>("PUT", url, { data }) | ||
| }; | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ApiError.datais declared as{ error?: string; message?: string; details?: string }, but the constructor acceptsRecord<string, unknown>and assigns it directly. This is not type-safe (and likely fails TS assignability becauseunknownisn’t assignable tostring). Consider typingdataasRecord<string, unknown>(or makingApiErrorgeneric) and extractingerror/message/detailsvia a helper when needed.