@scayle/storefront-core 8.59.3 → 8.59.4

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @scayle/storefront-core
 
+## 8.59.4
+
+### Patch Changes
+
+- Fixed error handling in `oauthRegister` and other OAuth-related RPC methods to properly propagate HTTP status codes like 409 Conflict instead of converting them to 500 Internal Server Error.
+
+  The `convertErrorForRpcCall` function now correctly handles `OAuthRequestError` instances that wrap `FetchError` objects. Previously, when OAuth API errors occurred (such as attempting to register with an existing email), the error handling only checked for direct `FetchError` instances, causing wrapped errors to fall through to a generic 500 error response. Now the function extracts the underlying `FetchError` from `OAuthRequestError` instances, ensuring that the correct HTTP status codes are returned to the frontend.
+
 ## 8.59.3
 
 ## 8.59.2

package/dist/rpc/methods/checkout/checkout.mjs

@@ -40,7 +40,7 @@ export const getCheckoutToken = defineRpcHandler(async (jwtPayload = {}, context
       ...customData,
       ...orderCustomData
     }
-  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.59.3"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
+  }).setIssuedAt(now).setNotBefore(now).setExpirationTime("1h").setIssuer(`${"@scayle/storefront-core"}@${"8.59.4"}`).setProtectedHeader({ alg: "HS256", typ: "JWT" }).sign(secret);
   return {
     accessToken: refreshedAccessToken,
     checkoutJwt

package/dist/rpc/methods/session.d.ts

@@ -1,6 +1,18 @@
 import type { Optional } from 'utility-types';
 import type { GuestRequest, LoginRequest, Oauth, ParamRpcHandler, RegisterRequest, RpcContextWithSession, RpcHandler, UpdatePasswordByHashRequest } from '../../types';
 import { ErrorResponse } from '../../errors';
+/**
+ * Ensure error is a fetch error with one of the status codes
+ *
+ * @param error Any error object.
+ * @param httpStatuses Array of HTTP status codes to check against.
+ *
+ * @returns A Response object if the error matches the criteria, undefined otherwise.
+ * It will return an `ErrorResponse` if the provided Error is a `FetchError`
+ * or an `OAuthRequestError` with a `FetchError` cause, and its status is included in httpStatuses.
+ * Otherwise, it returns undefined.
+ */
+export declare const convertErrorForRpcCall: (error: any, httpStatuses: Array<number>) => Response | undefined;
 /**
  * Handles the post-login logic, including fetching user data, updating tokens,
  * merging baskets and wishlists, and creating a user-bound session.

package/dist/rpc/methods/session.mjs

@@ -9,15 +9,21 @@ import { FetchError } from "../../utils/fetch.mjs";
 import { mergeBaskets, mergeWishlists } from "../../utils/user.mjs";
 import { fetchUser } from "../../rpc/methods/user.mjs";
 import { unwrap } from "../../utils/response.mjs";
-import { getOAuthClient } from "../../api/oauth.mjs";
+import { getOAuthClient, OAuthRequestError } from "../../api/oauth.mjs";
 import { ErrorResponse } from "../../errors/index.mjs";
 import { defineRpcHandler } from "../../utils/index.mjs";
-const convertErrorForRpcCall = (error, httpStatuses) => {
-  if (error instanceof FetchError && httpStatuses.includes(error.response.status)) {
+export const convertErrorForRpcCall = (error, httpStatuses) => {
+  let fetchError;
+  if (error instanceof FetchError) {
+    fetchError = error;
+  } else if (error instanceof OAuthRequestError && error.cause instanceof FetchError) {
+    fetchError = error.cause;
+  }
+  if (fetchError && httpStatuses.includes(fetchError.response.status)) {
     return new ErrorResponse(
-      error.response.status,
-      error.response.statusText,
-      error.name
+      fetchError.response.status,
+      fetchError.response.statusText,
+      fetchError.name
     );
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-core",
-  "version": "8.59.3",
+  "version": "8.59.4",
   "description": "Collection of essential utilities to work with the Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",