@hexdspace/react 0.0.22 → 0.0.25

package/dist/index.js

@@ -522,7 +522,11 @@ var FetchHttpClient = class {
         signal: config?.signal
       });
       const data = await (res.headers.get("content-type")?.includes("application/json") ? res.json() : res.text());
-      if (!res.ok) throw new HttpError(res.statusText, res.status, data);
+      if (!res.ok) {
+        const errorResponse = data;
+        const message = errorResponse?.error ?? res.statusText;
+        throw new HttpError(message, res.status, errorResponse);
+      }
       return {
         data,
         status: res.status,
@@ -856,16 +860,22 @@ function dispatchLoginResult(res, dispatch) {
   if (res.ok) {
     dispatch({ type: "COMPLETE", user: res.value });
   } else {
-    dispatch({ type: "FAILED", error: res.error.message });
+    dispatch({ type: "FAILED", error: getErrorMessage(res.error) });
   }
 }
 function dispatchRegisterResult(res, dispatch) {
   if (res.ok) {
     dispatch({ type: "SUCCESS", message: res.value.message });
   } else {
-    dispatch({ type: "FAILED", error: res.error.message });
+    dispatch({ type: "FAILED", error: getErrorMessage(res.error) });
   }
 }
+function getErrorMessage(error) {
+  if (error instanceof HttpError) {
+    return error.response.error ?? error.message;
+  }
+  return error.message;
+}
 
 // src/feature/auth/interface/web/react/hook/useAuthedUser.tsx
 function useAuthedUser() {
@@ -925,7 +935,7 @@ function RequireAuth({
     return /* @__PURE__ */ jsx6(Fragment, { children: loadingPlaceholder ?? null });
   }
   if (auth.status === "error") {
-    return /* @__PURE__ */ jsx6(Fragment, { children: errorPlaceholder ?? unauthenticatedPlaceholder ?? loadingPlaceholder ?? null });
+    return /* @__PURE__ */ jsx6(Fragment, { children: errorPlaceholder ?? null });
   }
   if (auth.status === "unauthenticated") {
     if (unauthenticatedRedirectTo) {
@@ -947,16 +957,13 @@ function RedirectIfAuthed({
     return /* @__PURE__ */ jsx6(Fragment, { children: loadingPlaceholder ?? null });
   }
   if (auth.status === "error") {
-    return /* @__PURE__ */ jsx6(Fragment, { children: errorPlaceholder ?? nonAuthedPlaceholder ?? loadingPlaceholder ?? null });
+    return /* @__PURE__ */ jsx6(Fragment, { children: errorPlaceholder ?? loadingPlaceholder ?? null });
   }
   if (auth.status === "authenticated") {
     if (redirectTo) {
       return /* @__PURE__ */ jsx6(Navigate, { to: redirectTo, replace: true });
     }
-    if (authenticatedPlaceholder) {
-      return /* @__PURE__ */ jsx6(Fragment, { children: authenticatedPlaceholder });
-    }
-    return /* @__PURE__ */ jsx6(Outlet, {});
+    return /* @__PURE__ */ jsx6(Fragment, { children: authenticatedPlaceholder ?? null });
   }
   return nonAuthedPlaceholder ? /* @__PURE__ */ jsx6(Fragment, { children: nonAuthedPlaceholder }) : /* @__PURE__ */ jsx6(Outlet, {});
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hexdspace/react",
-  "version": "0.0.22",
+  "version": "0.0.25",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",