addded error codes and improved error handling
This commit is contained in:
@@ -0,0 +1,10 @@
|
||||
export type ApiError = Error & { code?: string };
|
||||
|
||||
export const createApiError = (
|
||||
code?: string,
|
||||
message: string = "Request failed",
|
||||
): ApiError => {
|
||||
const error = new Error(message) as ApiError;
|
||||
error.code = code || "unknown-error";
|
||||
return error;
|
||||
};
|
||||
@@ -1,8 +1,9 @@
|
||||
import { API_BASE } from "../../config/api.config";
|
||||
import Cookies from "js-cookie";
|
||||
import type { TFunction } from "i18next";
|
||||
import { toast } from "react-toastify";
|
||||
import { fetchSettings } from "./settings";
|
||||
import type { ChangePasswordIntf } from "../../misc/interfaces";
|
||||
import { createApiError } from "./apiError";
|
||||
|
||||
export async function isAuthenticated() {
|
||||
if (Cookies.get("token")) {
|
||||
@@ -52,11 +53,33 @@ export async function signInUser(
|
||||
}
|
||||
|
||||
Cookies.remove("token");
|
||||
toast.error(t(response.code));
|
||||
return { ok: false as const };
|
||||
throw createApiError(response.code, t(response.code || "unknown-error"));
|
||||
}
|
||||
|
||||
export function signOutUser() {
|
||||
Cookies.remove("token");
|
||||
return { ok: true as const };
|
||||
}
|
||||
|
||||
export const mutatePassword = async (payload: ChangePasswordIntf) => {
|
||||
const result = await fetch(`${API_BASE}/users/change-password`, {
|
||||
method: "POST",
|
||||
headers: {
|
||||
Authorization: `Bearer ${Cookies.get("token") || ""}`,
|
||||
"Content-Type": "application/json",
|
||||
Accept: "application/json",
|
||||
},
|
||||
body: JSON.stringify({
|
||||
currentPassword: payload.currentPassword,
|
||||
newPassword: payload.newPassword,
|
||||
}),
|
||||
});
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "su005") {
|
||||
return { code: response.code };
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Change password failed");
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { API_BASE } from "../../config/api.config";
|
||||
import Cookies from "js-cookie";
|
||||
import type { ProductFormValues } from "../../misc/interfaces";
|
||||
import { createApiError } from "./apiError";
|
||||
|
||||
export const getProducts = async () => {
|
||||
const result = await fetch(`${API_BASE}/products/all-products`, {
|
||||
@@ -12,13 +13,11 @@ export const getProducts = async () => {
|
||||
});
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "ep002") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "sp002") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Get products failed");
|
||||
};
|
||||
|
||||
export const getProductDetails = async (uuid: string) => {
|
||||
@@ -32,13 +31,11 @@ export const getProductDetails = async (uuid: string) => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "ep003") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "sp003") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Get product details failed");
|
||||
};
|
||||
|
||||
export const mutateProduct = async (
|
||||
@@ -66,13 +63,11 @@ export const mutateProduct = async (
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "ep004") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "sp004") {
|
||||
if (response.code === "sp005") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Update product failed");
|
||||
};
|
||||
|
||||
export const deleteSelectedProducts = async (uuids: string[]) => {
|
||||
@@ -88,7 +83,11 @@ export const deleteSelectedProducts = async (uuids: string[]) => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
console.log(response);
|
||||
if (response.code === "sp006") {
|
||||
return { success: true };
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Delete products failed");
|
||||
};
|
||||
|
||||
export const createProduct = async (values: ProductFormValues) => {
|
||||
@@ -114,11 +113,9 @@ export const createProduct = async (values: ProductFormValues) => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "ep001") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "sp001") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Create product failed");
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { API_BASE } from "../../config/api.config";
|
||||
import Cookies from "js-cookie";
|
||||
import type { SettingsIntf } from "../../misc/interfaces";
|
||||
import { createApiError } from "./apiError";
|
||||
|
||||
export const fetchSettings = async () => {
|
||||
const result = await fetch(`${API_BASE}/users/settings`, {
|
||||
@@ -14,13 +15,11 @@ export const fetchSettings = async () => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "eu005") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "su004") {
|
||||
return { success: true, data: response.data, code: response.code };
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Fetch settings failed");
|
||||
};
|
||||
|
||||
export const mutateSettings = async (payload: SettingsIntf) => {
|
||||
@@ -36,11 +35,9 @@ export const mutateSettings = async (payload: SettingsIntf) => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "eu004") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "su003") {
|
||||
return { success: true, code: response.code };
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Update settings failed");
|
||||
};
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { API_BASE } from "../../config/api.config";
|
||||
import Cookies from "js-cookie";
|
||||
import type { NewStorage, Storage } from "../../misc/interfaces";
|
||||
import { createApiError } from "./apiError";
|
||||
|
||||
export const getStorages = async () => {
|
||||
const result = await fetch(`${API_BASE}/storage/all-storages`, {
|
||||
@@ -13,13 +14,11 @@ export const getStorages = async () => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "es001") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "ss001") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Get storages failed");
|
||||
};
|
||||
|
||||
export const mutateNewStorage = async (values: NewStorage) => {
|
||||
@@ -35,13 +34,11 @@ export const mutateNewStorage = async (values: NewStorage) => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "es002") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "ss002") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Create storage failed");
|
||||
};
|
||||
|
||||
export const updateStorage = async (
|
||||
@@ -63,13 +60,11 @@ export const updateStorage = async (
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "ep001") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "sp001") {
|
||||
if (response.code === "ss003") {
|
||||
return response.data;
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Update storage failed");
|
||||
};
|
||||
|
||||
export const deleteStorage = async (uuid: string) => {
|
||||
@@ -84,11 +79,9 @@ export const deleteStorage = async (uuid: string) => {
|
||||
|
||||
const response = await result.json();
|
||||
|
||||
if (response.code === "es004") {
|
||||
return { success: false, code: response.code };
|
||||
}
|
||||
|
||||
if (response.code === "ss004") {
|
||||
return { success: true, code: response.code };
|
||||
}
|
||||
|
||||
throw createApiError(response.code, "Delete storage failed");
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user