@techstuff-dev/foundation-api-utils 1.50.3 → 1.52.0

package/dist/cjs/chunks/{shared-9ChxyDgv.js → shared-DjCjH7LG.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var toolkit = require('@reduxjs/toolkit');
-var slice = require('./slice-Cy4kZKn1.js');
+var slice = require('./slice-Jly4VFS9.js');
 var slice$1 = require('./slice-CkWobkWw.js');
 
 // This file exists just so TypeScript has a module at ./store for IDEs/build.
@@ -11,4 +11,4 @@ var slice$1 = require('./slice-CkWobkWw.js');
 const rootReducer = toolkit.combineSlices(slice.cartSlice, slice$1.authSlice, slice.authApi, slice.contentApi, slice.paymentApi, slice.ordersApi);
 
 exports.rootReducer = rootReducer;
-//# sourceMappingURL=shared-9ChxyDgv.js.map
+//# sourceMappingURL=shared-DjCjH7LG.js.map

package/dist/cjs/chunks/{shared-9ChxyDgv.js.map → shared-DjCjH7LG.js.map}

@@ -1 +1 @@
-{"version":3,"file":"shared-9ChxyDgv.js","sources":["../../../lib/store/shared.ts"],"sourcesContent":[null],"names":["combineSlices","cartSlice","authSlice","authApi","contentApi","paymentApi","ordersApi"],"mappings":";;;;;;AAAA;AACA;AASA;AAEA;AACO,MAAM,WAAW,GAAGA,qBAAa,CACtCC,eAAS,EACTC,iBAAS,EACTC,aAAO,EACPC,gBAAU,EACVC,gBAAU,EACVC,eAAS;;;;"}
+{"version":3,"file":"shared-DjCjH7LG.js","sources":["../../../lib/store/shared.ts"],"sourcesContent":[null],"names":["combineSlices","cartSlice","authSlice","authApi","contentApi","paymentApi","ordersApi"],"mappings":";;;;;;AAAA;AACA;AASA;AAEA;AACO,MAAM,WAAW,GAAGA,qBAAa,CACtCC,eAAS,EACTC,iBAAS,EACTC,aAAO,EACPC,gBAAU,EACVC,gBAAU,EACVC,eAAS;;;;"}

package/dist/cjs/chunks/{slice-Cy4kZKn1.js → slice-Jly4VFS9.js}

@@ -4684,6 +4684,75 @@ Hook ${hookName} was either not provided or not a function.`);
 // src/query/react/index.ts
 var createApi = /* @__PURE__ */ buildCreateApi(coreModule(), reactHooksModule());
 
+/**
+ * Creates a base query that automatically unwraps standardized API responses.
+ *
+ * If the API returns `{ success: true, data: T }`, this will return just `T`.
+ * If the API returns `{ success: false, error: {...} }`, this will pass through the error correctly.
+ *
+ * This eliminates the need for `transformResponse` on every endpoint when using
+ * a standardized response format across your API routes.
+ *
+ * @param baseQueryOptions - The same options you would pass to fetchBaseQuery
+ * @returns A BaseQueryFn that unwraps standardized responses
+ *
+ * @example
+ * ```typescript
+ * const api = createApi({
+ *   baseQuery: createUnwrappingBaseQuery({
+ *     baseUrl: '/api',
+ *     prepareHeaders: (headers) => {
+ *       // Add auth headers
+ *       return headers;
+ *     },
+ *   }),
+ *   endpoints: (builder) => ({
+ *     getPlans: builder.query<{ plans: Plan[] }, void>({
+ *       query: () => '/payment/plans',
+ *       // No need for transformResponse!
+ *     }),
+ *   }),
+ * });
+ * ```
+ */
+function createUnwrappingBaseQuery(baseQueryOptions) {
+    const baseQuery = fetchBaseQuery(baseQueryOptions);
+    return async (args, api, extraOptions) => {
+        const result = await baseQuery(args, api, extraOptions);
+        // If there's an error, return it as-is
+        if (result.error) {
+            return result;
+        }
+        // If there's data, check if it matches our standard format
+        if (result.data) {
+            const response = result.data;
+            // Check if this is a wrapped response with success flag
+            if (typeof response === 'object' && response !== null && 'success' in response) {
+                // If success is false, treat it as an error
+                if (response.success === false && response.error) {
+                    return {
+                        error: {
+                            status: 'CUSTOM_ERROR',
+                            data: response.error,
+                        },
+                    };
+                }
+                // If success is true and there's data, unwrap it
+                if (response.success === true && 'data' in response) {
+                    return {
+                        ...result,
+                        data: response.data,
+                    };
+                }
+            }
+            // If it doesn't match our standard format, return as-is
+            // (e.g., direct responses from external APIs like Elasticsearch)
+            return result;
+        }
+        return result;
+    };
+}
+
 function onlyUnique(value, index, self) {
     return self.indexOf(value) === index;
 }
@@ -5395,7 +5464,8 @@ const runOnPlatform = (config) => {
  */
 // Helper function to get environment variable with fallback
 const getEnvVar$1 = (key, fallback = '') => {
-    return process.env[key] || fallback;
+    const value = process.env[key] || fallback;
+    return value;
 };
 // Core API endpoints
 const API_PREFIX$1 = getEnvVar$1('NEXT_PUBLIC_API_PREFIX');
@@ -5554,30 +5624,38 @@ apiConfig.APP_ES_CHALLENGES_INDEX;
 apiConfig.APP_ES_CHALLENGE_DAYS_INDEX;
 apiConfig.PLATFORM;
 
-const authDataBaseQuery = fetchBaseQuery({
-    baseUrl: API_AUTH_PREFIX,
-    prepareHeaders: async (headers) => {
-        headers.set('Content-Type', 'application/json');
-        try {
-            // add accessToken to headers from slice using selectAccessToken selector
-            const session = await awsAmplify.Auth.currentSession();
-            const idToken = session.getIdToken().getJwtToken(); // ID token
-            const accessToken = session.getAccessToken().getJwtToken(); // Access token
-            if (accessToken && idToken) {
-                headers.set('accesstoken', accessToken);
-                headers.set('idtoken', idToken);
-                // headers.set('refreshtoken', tokens.refreshToken);
+// Create a dynamic baseQuery that resolves URL at request time and unwraps standard responses
+const createAuthBaseQuery = () => {
+    const baseUrl = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_API_AUTH_PREFIX
+        ? process.env.NEXT_PUBLIC_API_AUTH_PREFIX
+        : (API_AUTH_PREFIX || '');
+    console.log('[authApi] Resolved baseUrl:', baseUrl);
+    return createUnwrappingBaseQuery({
+        baseUrl,
+        prepareHeaders: async (headers) => {
+            headers.set('Content-Type', 'application/json');
+            try {
+                // add accessToken to headers from slice using selectAccessToken selector
+                const session = await awsAmplify.Auth.currentSession();
+                const idToken = session.getIdToken().getJwtToken(); // ID token
+                const accessToken = session.getAccessToken().getJwtToken(); // Access token
+                if (accessToken && idToken) {
+                    headers.set('accesstoken', accessToken);
+                    headers.set('idtoken', idToken);
+                    // headers.set('refreshtoken', tokens.refreshToken);
+                }
+                return headers;
             }
-            return headers;
-        }
-        catch (error) {
-            // eslint-disable-next-line no-console
-            console.error('authDataBaseQuery: ', error);
-            return headers;
-        }
-    },
-    credentials: 'include',
-});
+            catch (error) {
+                // eslint-disable-next-line no-console
+                console.error('authDataBaseQuery: ', error);
+                return headers;
+            }
+        },
+        credentials: 'include',
+    });
+};
+const authDataBaseQuery = createAuthBaseQuery();
 /**
  * This function is used to retry a request if we get a 401 error.
  */
@@ -5703,9 +5781,10 @@ const authApi = createApi({
                         };
                 }
             },
+            // No need for transformResponse - createUnwrappingBaseQuery handles it
             transformResponse: (rawResult) => {
-                const { data } = rawResult;
-                return { route: 'success', message: data?.message };
+                // Additional custom transform after unwrapping
+                return { route: 'success', message: rawResult?.message };
             },
         }),
         verifyUserAttributes: builder.query({
@@ -5758,15 +5837,25 @@ const {
 useResetPasswordMutation, // Use this for mobile app.
 useResetPasswordAuthMutation, useRegisterMutation, useVerifyUserQuery, useLazyVerifyUserQuery, useGetUserInfoQuery, useLazyGetUserInfoQuery, useUpdateUserInfoMutation, useForgottenPasswordMutation, useVerifyUserAttributesQuery, useLazyVerifyUserAttributesQuery, useVerifyUserResendQuery, useLazyVerifyUserResendQuery, useUpdateUserMutation, } = authApi;
 
-const contentApi = createApi({
-    reducerPath: 'contentApi',
-    baseQuery: fetchBaseQuery({
-        baseUrl: APP_ES_INSTANCE,
+// Create dynamic baseQuery that resolves URL at request time
+const createContentBaseQuery = () => {
+    const baseUrl = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_ELASTICSEARCH_HOST
+        ? process.env.NEXT_PUBLIC_ELASTICSEARCH_HOST
+        : (APP_ES_INSTANCE || '');
+    const auth = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_APP_ES_AUTH
+        ? process.env.NEXT_PUBLIC_APP_ES_AUTH
+        : (APP_ES_AUTH || '');
+    return fetchBaseQuery({
+        baseUrl,
         prepareHeaders: (headers) => {
-            headers.set('Authorization', APP_ES_AUTH);
+            headers.set('Authorization', auth);
             return headers;
         },
-    }),
+    });
+};
+const contentApi = createApi({
+    reducerPath: 'contentApi',
+    baseQuery: createContentBaseQuery(),
     tagTypes: ['Data', 'Workout'],
     // keepUnusedDataFor: 300,
     endpoints: (builder) => ({
@@ -5807,10 +5896,14 @@ const contentApi = createApi({
 });
 const { useGetDataQuery, useLazyGetDataQuery, useGetDataByIdQuery, useLazyGetDataByIdQuery, } = contentApi;
 
-const paymentApi = createApi({
-    reducerPath: 'paymentApi',
-    baseQuery: fetchBaseQuery({
-        baseUrl: API_PAYMENTS_PREFIX,
+// Dynamic baseQuery that resolves URL at request time and unwraps standard responses
+const dynamicBaseQuery = async (args, api, extraOptions) => {
+    // Resolve base URL at request time, not module load time
+    const baseUrl = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_API_PAYMENTS_PREFIX
+        ? process.env.NEXT_PUBLIC_API_PAYMENTS_PREFIX
+        : (API_PAYMENTS_PREFIX || '');
+    const baseQuery = createUnwrappingBaseQuery({
+        baseUrl,
         prepareHeaders: async (headers) => {
             headers.set('Content-Type', 'application/json');
             // add accessToken to headers from slice using selectAccessToken selector
@@ -5825,7 +5918,12 @@ const paymentApi = createApi({
             return headers;
         },
         credentials: 'include',
-    }),
+    });
+    return baseQuery(args, api, extraOptions);
+};
+const paymentApi = createApi({
+    reducerPath: 'paymentApi',
+    baseQuery: dynamicBaseQuery,
     tagTypes: ['UserSubscription', 'Plans', 'TaxRates', 'PromoCodes'],
     // keepUnusedDataFor: 300,
     endpoints: (builder) => ({
@@ -5867,23 +5965,30 @@ const paymentApi = createApi({
 // Export hooks for usage in functional components.
 const { useCheckUserSubscriptionQuery, useLazyCheckUserSubscriptionQuery, useGetPaymentPlansQuery, useLazyGetPaymentPlansQuery, useGetTaxRatesQuery, useLazyGetTaxRatesQuery, useCheckPromoCodeQuery, useLazyCheckPromoCodeQuery, } = paymentApi;
 
-const dataBaseQuery = fetchBaseQuery({
-    baseUrl: API_ORDERS_PREFIX,
-    prepareHeaders: async (headers) => {
-        headers.set('Content-Type', 'application/json');
-        // add accessToken to headers from slice using selectAccessToken selector
-        const session = await awsAmplify.Auth.currentSession();
-        const idToken = session.getIdToken().getJwtToken(); // ID token
-        const accessToken = session.getAccessToken().getJwtToken(); // Access token
-        if (accessToken && idToken) {
-            headers.set('accesstoken', accessToken);
-            headers.set('idtoken', idToken);
-            // headers.set('refreshtoken', tokens.refreshToken);
-        }
-        return headers;
-    },
-    credentials: 'include',
-});
+// Create dynamic baseQuery that resolves URL at request time
+const createOrdersBaseQuery = () => {
+    const baseUrl = typeof process !== 'undefined' && process.env?.NEXT_PUBLIC_API_ORDERS_PREFIX
+        ? process.env.NEXT_PUBLIC_API_ORDERS_PREFIX
+        : (API_ORDERS_PREFIX || '');
+    return fetchBaseQuery({
+        baseUrl,
+        prepareHeaders: async (headers) => {
+            headers.set('Content-Type', 'application/json');
+            // add accessToken to headers from slice using selectAccessToken selector
+            const session = await awsAmplify.Auth.currentSession();
+            const idToken = session.getIdToken().getJwtToken(); // ID token
+            const accessToken = session.getAccessToken().getJwtToken(); // Access token
+            if (accessToken && idToken) {
+                headers.set('accesstoken', accessToken);
+                headers.set('idtoken', idToken);
+                // headers.set('refreshtoken', tokens.refreshToken);
+            }
+            return headers;
+        },
+        credentials: 'include',
+    });
+};
+const dataBaseQuery = createOrdersBaseQuery();
 /**
  * This function is used to retry a request if we get a 401 error.
  */
@@ -6091,6 +6196,7 @@ exports.applyTax = applyTax;
 exports.authApi = authApi;
 exports.cartSlice = cartSlice;
 exports.contentApi = contentApi;
+exports.createUnwrappingBaseQuery = createUnwrappingBaseQuery;
 exports.emptyCart = emptyCart;
 exports.formatAuthSession = formatAuthSession;
 exports.formatChallengeDays = formatChallengeDays;
@@ -6157,4 +6263,4 @@ exports.useUpdateUserMutation = useUpdateUserMutation;
 exports.useVerifyUserAttributesQuery = useVerifyUserAttributesQuery;
 exports.useVerifyUserQuery = useVerifyUserQuery;
 exports.useVerifyUserResendQuery = useVerifyUserResendQuery;
-//# sourceMappingURL=slice-Cy4kZKn1.js.map
+//# sourceMappingURL=slice-Jly4VFS9.js.map