Merge remote-tracking branch 'origin/main' into feat/129-link-geusts-frontend-to-backend

Author: zaydaanjahangir

clients/shared/src/api/client.ts

@@ -8,12 +8,12 @@ export const createRequest = (
   getToken: () => Promise<string | null>,
   baseUrl: string,
 ) => {
-  const hardCodedHotelId = "a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11"
   return async <T>(config: RequestConfig): Promise<T> => {
+    const hotelId = getConfig().hotelId;
     let fullUrl = `${baseUrl}${config.url}`;
     if (config.params && Object.keys(config.params).length > 0) {
       const searchParams = new URLSearchParams(config.params);
-      fullUrl += '?' + searchParams.toString();
+      fullUrl += "?" + searchParams.toString();
     }
 
     try {
@@ -24,7 +24,7 @@ export const createRequest = (
         headers: {
           "Content-Type": "application/json",
           ...(token && { Authorization: `Bearer ${token}` }),
-          "X-Hotel-ID": hardCodedHotelId,
+          "X-Hotel-ID": hotelId,
           ...config.headers,
         },
         body: config.data ? JSON.stringify(config.data) : undefined,
@@ -100,10 +100,5 @@ export const getBaseUrl = (): string => {
     throw new Error("API_BASE_URL is not configured. Check your .env file.");
   }
 
-  const trimmed = url.replace(/\/+$/, "");
-  if (trimmed.endsWith("/api/v1")) {
-    return trimmed;
-  }
-
-  return `${trimmed}/api/v1`;
+  return url;
 };