@techstuff-dev/foundation-api-utils 2.7.0 → 2.8.0

package/dist/cjs/index.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var slice = require('./chunks/slice-BZ9cHcE8.js');
+var slice = require('./chunks/slice-Bu9L_cVR.js');
 var slice$1 = require('./chunks/slice-CkWobkWw.js');
 var useAuth = require('./chunks/useAuth-BVyDLl6H.js');
 var jwtDecode = require('jwt-decode');

package/dist/cjs/store/index.native.js

@@ -2,8 +2,8 @@
 
 var toolkit = require('@reduxjs/toolkit');
 var storage = require('@react-native-async-storage/async-storage');
-var slice = require('../chunks/slice-BZ9cHcE8.js');
-var shared = require('../chunks/shared-BB1LJXHU.js');
+var slice = require('../chunks/slice-Bu9L_cVR.js');
+var shared = require('../chunks/shared-l1zCzYJr.js');
 require('../chunks/slice-CkWobkWw.js');
 require('react-redux');
 require('react');

package/dist/cjs/store/index.web.js

@@ -1,8 +1,8 @@
 'use strict';
 
 var toolkit = require('@reduxjs/toolkit');
-var slice = require('../chunks/slice-BZ9cHcE8.js');
-var shared = require('../chunks/shared-BB1LJXHU.js');
+var slice = require('../chunks/slice-Bu9L_cVR.js');
+var shared = require('../chunks/shared-l1zCzYJr.js');
 require('../chunks/slice-CkWobkWw.js');
 require('react-redux');
 require('react');

package/dist/esm/chunks/{shared-DOQegy7B.js → shared-ChUGjIwE.js}

@@ -1,5 +1,5 @@
 import { combineSlices } from '@reduxjs/toolkit';
-import { P as cartSlice, a as authApi, c as contentApi, p as paymentApi, b as productsApi, o as ordersApi } from './slice-cLf9vXqc.js';
+import { P as cartSlice, a as authApi, c as contentApi, p as paymentApi, b as productsApi, o as ordersApi } from './slice-Z8Lc9U1-.js';
 import { a as authSlice } from './slice-ChJ8ZvmP.js';
 
 // This file exists just so TypeScript has a module at ./store for IDEs/build.
@@ -9,4 +9,4 @@ import { a as authSlice } from './slice-ChJ8ZvmP.js';
 const rootReducer = combineSlices(cartSlice, authSlice, authApi, contentApi, paymentApi, productsApi, ordersApi);
 
 export { rootReducer as r };
-//# sourceMappingURL=shared-DOQegy7B.js.map
+//# sourceMappingURL=shared-ChUGjIwE.js.map

package/dist/esm/chunks/{shared-DOQegy7B.js.map → shared-ChUGjIwE.js.map}

@@ -1 +1 @@
-{"version":3,"file":"shared-DOQegy7B.js","sources":["../../../lib/store/shared.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAAA;AACA;AAUA;AAEA;MACa,WAAW,GAAG,aAAa,CACtC,SAAS,EACT,SAAS,EACT,OAAO,EACP,UAAU,EACV,UAAU,EACV,WAAW,EACX,SAAS;;;;"}
+{"version":3,"file":"shared-ChUGjIwE.js","sources":["../../../lib/store/shared.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;AAAA;AACA;AAUA;AAEA;MACa,WAAW,GAAG,aAAa,CACtC,SAAS,EACT,SAAS,EACT,OAAO,EACP,UAAU,EACV,UAAU,EACV,WAAW,EACX,SAAS;;;;"}

package/dist/esm/chunks/{slice-cLf9vXqc.js → slice-Z8Lc9U1-.js}

@@ -5194,7 +5194,19 @@ const APP_ES_SCHEDULE_INDEX$1 = getEnvVar$1('NEXT_PUBLIC_APP_ES_SCHEDULE_INDEX')
 const APP_ES_CHALLENGES_INDEX$1 = getEnvVar$1('NEXT_PUBLIC_APP_ES_CHALLENGES_INDEX');
 const APP_ES_CHALLENGE_DAYS_INDEX$1 = getEnvVar$1('NEXT_PUBLIC_APP_ES_CHALLENGE_DAYS_INDEX');
 // Platform identifier
-const PLATFORM$1 = 'web';
+const PLATFORM$2 = 'web';
+/**
+ * Return the Cognito app client ID the web app is configured to use.
+ * Prefers the passwordless client when set (passwordless sessions present a
+ * refresh token minted by that client); falls back to the regular client.
+ * Used by the shared refresh-token flow so Cognito can match the refresh
+ * token's original app client.
+ */
+function getCognitoAppClientId$2() {
+    return (getEnvVar$1('NEXT_PUBLIC_AWS_COGNITO_PASSWORDLESS_CLIENT_ID') ||
+        getEnvVar$1('NEXT_PUBLIC_AWS_COGNITO_CLIENT_ID') ||
+        undefined);
+}
 
 var webConfig = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -5217,7 +5229,8 @@ var webConfig = /*#__PURE__*/Object.freeze({
   APP_ES_SETTINGS_INDEX: APP_ES_SETTINGS_INDEX$1,
   APP_ES_VIDEOS_INDEX: APP_ES_VIDEOS_INDEX$1,
   APP_ES_WORKOUTS_INDEX: APP_ES_WORKOUTS_INDEX$1,
-  PLATFORM: PLATFORM$1
+  PLATFORM: PLATFORM$2,
+  getCognitoAppClientId: getCognitoAppClientId$2
 });
 
 /**
@@ -5261,7 +5274,16 @@ const APP_ES_SCHEDULE_INDEX = getEnvVar('APP_ES_SCHEDULE_INDEX');
 const APP_ES_CHALLENGES_INDEX = getEnvVar('APP_ES_CHALLENGES_INDEX');
 const APP_ES_CHALLENGE_DAYS_INDEX = getEnvVar('APP_ES_CHALLENGE_DAYS_INDEX');
 // Platform identifier
-const PLATFORM = 'native';
+const PLATFORM$1 = 'native';
+/**
+ * Return the Cognito app client ID the app is configured to use.
+ * On native the env var is `AWS_COGNITO_CLIENT_ID` (react-native-config).
+ * Used by the shared refresh-token flow so Cognito can match the refresh
+ * token's original app client.
+ */
+function getCognitoAppClientId$1() {
+    return getEnvVar('AWS_COGNITO_CLIENT_ID') || undefined;
+}
 
 var nativeConfig = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -5284,7 +5306,8 @@ var nativeConfig = /*#__PURE__*/Object.freeze({
   APP_ES_SETTINGS_INDEX: APP_ES_SETTINGS_INDEX,
   APP_ES_VIDEOS_INDEX: APP_ES_VIDEOS_INDEX,
   APP_ES_WORKOUTS_INDEX: APP_ES_WORKOUTS_INDEX,
-  PLATFORM: PLATFORM
+  PLATFORM: PLATFORM$1,
+  getCognitoAppClientId: getCognitoAppClientId$1
 });
 
 /**
@@ -5326,7 +5349,16 @@ apiConfig.APP_ES_WORKOUTS_INDEX;
 apiConfig.APP_ES_SCHEDULE_INDEX;
 apiConfig.APP_ES_CHALLENGES_INDEX;
 apiConfig.APP_ES_CHALLENGE_DAYS_INDEX;
-apiConfig.PLATFORM;
+const PLATFORM = apiConfig.PLATFORM;
+/**
+ * Platform-specific accessor for the currently-configured Cognito app client ID.
+ * Delegates to native or web config so the refresh-token flow can forward the
+ * clientId to the backend (Cognito refresh tokens are bound to their minting
+ * app client).
+ */
+function getCognitoAppClientId() {
+    return apiConfig.getCognitoAppClientId?.();
+}
 
 /**
  * Mutex to prevent multiple concurrent refresh attempts.
@@ -5382,11 +5414,21 @@ async function attemptTokenRefresh(api) {
         ? `${process.env.NEXT_PUBLIC_API_PREFIX}/auth/refresh-token`
         : `${API_AUTH_PREFIX || ''}/user/refreshtoken`;
     try {
+        // Cognito refresh tokens are bound to the app client that minted them.
+        // We read the client ID from the platform-specific env wrapper and pass it
+        // to the backend so Cognito InitiateAuth is invoked with the matching
+        // ClientId. Without this, pools with multiple app clients (e.g. separate
+        // "Mobile App Client" and "ms-auth server" clients) fail refresh with
+        // "Refresh Token has different Client".
+        const clientId = getCognitoAppClientId();
         const response = await fetch(refreshUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             credentials: 'include',
-            body: JSON.stringify({ refreshtoken: refreshToken }),
+            body: JSON.stringify({
+                refreshtoken: refreshToken,
+                ...(clientId ? { clientId } : {}),
+            }),
         });
         if (!response.ok) {
             const errorBody = await response.text().catch(() => 'unable to read body');
@@ -5505,6 +5547,24 @@ function getAuthHeaders(getState) {
     return { accessToken, idToken };
 }
 
+/**
+ * Build a per-platform URL for user-scoped data endpoints.
+ *
+ * Native apps call the backend API Gateway directly and must use the canonical
+ * path shape: `/data/user/{sub}/{endpoint}`.
+ *
+ * Web apps route library requests through their own Next.js `/api/user/*`
+ * proxy layer, which then forwards to the same canonical backend path. That
+ * proxy expects the legacy `/user/{endpoint}?sub=X` shape.
+ */
+const userDataPath = (sub, endpoint, query) => {
+    if (PLATFORM === 'native') {
+        const suffix = query ? `?${query}` : '';
+        return `/data/user/${sub}/${endpoint}${suffix}`;
+    }
+    const suffix = query ? `&${query}` : '';
+    return `/user/${endpoint}?sub=${sub}${suffix}`;
+};
 // 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
@@ -5670,14 +5730,14 @@ const authApi = createApi({
         // Dashboard data endpoints
         getStreak: builder.query({
             query: (sub) => ({
-                url: `/user/streak?sub=${sub}`,
+                url: userDataPath(sub, 'streak'),
                 method: 'GET',
             }),
             providesTags: ['Streak'],
         }),
         getWeeklyProgress: builder.query({
             query: (sub) => ({
-                url: `/user/weekly-progress?sub=${sub}`,
+                url: userDataPath(sub, 'weekly-progress'),
                 method: 'GET',
             }),
             providesTags: ['WeeklyProgress'],
@@ -5692,35 +5752,35 @@ const authApi = createApi({
         }),
         getWatchProgress: builder.query({
             query: ({ sub, limit = 1 }) => ({
-                url: `/user/watch-progress?sub=${sub}&limit=${limit}`,
+                url: userDataPath(sub, 'watch-progress', `limit=${limit}`),
                 method: 'GET',
             }),
             providesTags: ['WatchProgress'],
         }),
         getRecommendations: builder.query({
             query: ({ sub, limit = 8 }) => ({
-                url: `/user/recommendations?sub=${sub}&limit=${limit}`,
+                url: userDataPath(sub, 'recommendations', `limit=${limit}`),
                 method: 'GET',
             }),
             providesTags: ['Recommendations'],
         }),
         getActivityStats: builder.query({
             query: ({ sub, period = 'this-month' }) => ({
-                url: `/user/activity-stats?sub=${sub}&period=${period}`,
+                url: userDataPath(sub, 'activity-stats', `period=${period}`),
                 method: 'GET',
             }),
             providesTags: ['ActivityStats'],
         }),
         getActiveChallenges: builder.query({
             query: (sub) => ({
-                url: `/user/active-challenges?sub=${sub}`,
+                url: userDataPath(sub, 'active-challenges'),
                 method: 'GET',
             }),
             providesTags: ['UserData'],
         }),
         getChallengeProgress: builder.query({
             query: ({ sub, challengeId }) => ({
-                url: `/user/challenge-progress/${challengeId}?sub=${sub}`,
+                url: userDataPath(sub, `challenge-progress/${challengeId}`),
                 method: 'GET',
             }),
             providesTags: ['UserData'],
@@ -5728,7 +5788,8 @@ const authApi = createApi({
         // Activity logging — invalidates dashboard caches
         logActivity: builder.mutation({
             query: (data) => ({
-                url: '/activity',
+                // Native hits the backend directly at /data/activity; web proxies via /activity → /data/activity
+                url: PLATFORM === 'native' ? '/data/activity' : '/activity',
                 method: 'POST',
                 body: data,
             }),
@@ -6202,4 +6263,4 @@ const selectCartItemsIds = createSelector$1([selectMediaInCart], (items) => {
 cartSlice.reducer;
 
 export { selectCartNetTotal as $, useLazyGetWatchProgressQuery as A, useGetRecommendationsQuery as B, useLazyGetRecommendationsQuery as C, useGetActivityStatsQuery as D, useLazyGetActivityStatsQuery as E, useLogActivityMutation as F, useGetActiveChallengesQuery as G, useGetChallengeProgressQuery as H, useGetProductsQuery as I, useLazyGetProductsQuery as J, usePurchaseProductMutation as K, useFetchOrdersQuery as L, useLazyFetchOrdersQuery as M, useGetOrdersQuery as N, useGetOrderQuery as O, cartSlice as P, setTaxRate as Q, resetTaxRate as R, setPromoCode as S, removePromoCode as T, addToCart as U, updateCart as V, removeFromCart as W, emptyCart as X, toggleCart as Y, selectMediaInCart as Z, selectCartTotal as _, authApi as a, selectCartTaxRate as a0, selectCartTaxAmount as a1, selectCartCount as a2, selectCartStatus as a3, selectPromoCode as a4, selectCartItems as a5, selectCartItemsIds as a6, isWeb as a7, isReactNative as a8, getPlatform as a9, runOnPlatform as aa, onlyUnique as ab, applyCoupon as ac, applyTax as ad, createUnwrappingBaseQuery as ae, withReauth as af, productsApi as b, contentApi as c, useResetPasswordAuthMutation as d, useRegisterMutation as e, useVerifyUserQuery as f, useLazyVerifyUserQuery as g, useGetUserInfoQuery as h, useLazyGetUserInfoQuery as i, useUpdateUserInfoMutation as j, useForgottenPasswordMutation as k, useVerifyUserAttributesQuery as l, useLazyVerifyUserAttributesQuery as m, useVerifyUserResendQuery as n, ordersApi as o, paymentApi as p, useLazyVerifyUserResendQuery as q, useUpdateUserMutation as r, useGetStreakQuery as s, toCamelCaseObject as t, useResetPasswordMutation as u, useLazyGetStreakQuery as v, useGetWeeklyProgressQuery as w, useLazyGetWeeklyProgressQuery as x, useSetWeeklyGoalMutation as y, useGetWatchProgressQuery as z };
-//# sourceMappingURL=slice-cLf9vXqc.js.map
+//# sourceMappingURL=slice-Z8Lc9U1-.js.map