@bzbs/react-api-client 0.2.3 → 1.0.1

package/dist/index.mjs

@@ -75,43 +75,30 @@ var BaseService = class {
     if (response.status === 204) {
       return { model: {}, response, type: "success" };
     }
-    if ("Success" in response.data || "success" in response.data) {
-      const data = response.data;
-      if (data.Success) {
-        if ("Data" in response.data) {
-          return { model: data.Data, response, type: "success" };
-        } else if ("data" in response.data) {
-          return { model: data.data, response, type: "success" };
-        } else {
-          return { model: {}, response, type: "success" };
-        }
-      } else if (data.success) {
-        if ("Data" in response.data) {
-          return { model: data.Data, response, type: "success" };
-        } else if ("data" in response.data) {
-          return { model: data.data, response, type: "success" };
-        } else {
-          return { model: {}, response, type: "success" };
-        }
-      } else {
-        const error = {
-          type: "server-error",
+    const data = response.data;
+    const isSuccess = (data == null ? void 0 : data.Success) === true || (data == null ? void 0 : data.success) === true;
+    if (isSuccess) {
+      const model = "Data" in data ? data.Data : "data" in data ? data.data : {};
+      return { model, response, type: "success" };
+    }
+    if ("Success" in data || "success" in data) {
+      const error = {
+        type: "server-error",
+        error: {
+          requestId: data.RequestId || "",
           error: {
-            requestId: response.data.RequestId || "",
-            error: {
-              id: response.data.Code || response.status,
-              message: response.data.Message || response.statusText,
-              code: response.data.Code || response.status,
-              type: "buzzebees"
-            }
-          },
-          statusCode: response.data.Code || response.status,
-          response
-        };
-        return this.normalizeError(error);
-      }
+            id: data.Code || data.code || response.status,
+            message: data.Message || data.message || response.statusText,
+            code: data.Code || data.code || response.status,
+            type: "buzzebees"
+          }
+        },
+        statusCode: data.Code || response.status,
+        response
+      };
+      return this.normalizeError(error);
     }
-    return { model: response.data, response, type: "success" };
+    return { model: data, response, type: "success" };
   }
   request(method, path, data, requestOptions) {
     return __async(this, null, function* () {
@@ -157,7 +144,9 @@ var BaseService = class {
     });
   }
   joinUrl(baseUrl, path) {
-    return new URL(path, baseUrl).toString();
+    const sanitizedBase = baseUrl.replace(/\/+$/, "");
+    const sanitizedPath = path.replace(/^\/+/, "");
+    return `${sanitizedBase}/${sanitizedPath}`;
   }
   getHeaders(customHeaders) {
     return __spreadValues({
@@ -1156,7 +1145,7 @@ var HistoryApi = class extends BaseService {
    */
   redeemHistories(params, requestOptions) {
     return __async(this, null, function* () {
-      return yield this.get(
+      const response = yield this.get(
         "redeem",
         __spreadValues({
           byConfig: params.byConfig,
@@ -1169,6 +1158,18 @@ var HistoryApi = class extends BaseService {
         }, params.options),
         requestOptions
       );
+      if (response.type === "success") {
+        const purchases = response.model.map((item) => {
+          var _a, _b;
+          return __spreadProps(__spreadValues({}, item), {
+            ParcelNo: (_b = (_a = item.ParcelNo) != null ? _a : item.PacelNo) != null ? _b : void 0
+          });
+        });
+        return __spreadProps(__spreadValues({}, response), {
+          model: purchases
+        });
+      }
+      return response;
     });
   }
   /**