@tagadapay/plugin-sdk 2.7.21 → 2.7.24

package/dist/v2/react/hooks/usePostPurchasesQuery.js

@@ -6,12 +6,41 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { PostPurchasesResource } from '../../core/resources/postPurchases';
 import { useTagadaContext } from '../providers/TagadaProvider';
-import { getGlobalApiClient } from './useApiQuery';
+import { getGlobalApiClient, getGlobalApiClientOrNull } from './useApiQuery';
 export function usePostPurchasesQuery(options) {
     console.log('usePostPurchasesQuery');
     const { orderId, enabled = true, autoInitializeCheckout = false } = options;
     const queryClient = useQueryClient();
-    const { session } = useTagadaContext();
+    const { session, isSessionInitialized, apiService } = useTagadaContext();
+    // Track if token is available on API service
+    const [hasToken, setHasToken] = useState(() => apiService.getCurrentToken() !== null);
+    // Update token availability when session is initialized
+    useEffect(() => {
+        if (isSessionInitialized) {
+            const checkToken = () => {
+                const token = apiService.getCurrentToken();
+                const tokenAvailable = token !== null;
+                setHasToken(tokenAvailable);
+                // Also ensure API client has the token
+                const apiClient = getGlobalApiClientOrNull();
+                if (apiClient && token) {
+                    apiClient.updateToken(token);
+                }
+                return tokenAvailable;
+            };
+            // Check immediately
+            if (checkToken()) {
+                return; // Token is available, no need to poll
+            }
+            // Poll for token if not immediately available (handles async token setting)
+            const interval = setInterval(() => {
+                if (checkToken()) {
+                    clearInterval(interval);
+                }
+            }, 100); // Check every 100ms
+            return () => clearInterval(interval);
+        }
+    }, [isSessionInitialized, apiService]);
     // State for checkout sessions per offer
     const [checkoutSessions, setCheckoutSessions] = useState({});
     // Ref to track checkout sessions for synchronous access
@@ -138,14 +167,33 @@ export function usePostPurchasesQuery(options) {
     // Main post-purchase offers query
     const { data: offers = [], isLoading, error, refetch, } = useQuery({
         queryKey: ['post-purchase-offers', orderId],
-        queryFn: () => postPurchasesResource.getPostPurchaseOffers(orderId),
-        enabled: enabled && !!orderId,
+        queryFn: async () => {
+            // Double-check token is available before making the request
+            const token = apiService.getCurrentToken();
+            if (!token) {
+                throw new Error('No authentication token available. Please wait for session initialization.');
+            }
+            // Ensure API client has the token
+            const apiClient = getGlobalApiClientOrNull();
+            if (apiClient && token) {
+                apiClient.updateToken(token);
+            }
+            return postPurchasesResource.getPostPurchaseOffers(orderId);
+        },
+        enabled: enabled && !!orderId && isSessionInitialized && hasToken, // Wait for CMS token/session to be ready AND token to be set on API client
         staleTime: 30000, // 30 seconds
         refetchOnWindowFocus: false,
+        retry: (failureCount, error) => {
+            // Retry if token is not available yet (might be a timing issue)
+            if (error instanceof Error && error.message.includes('No authentication token')) {
+                return failureCount < 3; // Retry up to 3 times
+            }
+            return false; // Don't retry other errors
+        },
     });
     // Auto-initialize checkout sessions if enabled
     useEffect(() => {
-        if (autoInitializeCheckout && offers.length > 0 && session?.customerId) {
+        if (autoInitializeCheckout && offers.length > 0 && session?.customerId && isSessionInitialized) {
             // Initialize checkout sessions for all offers
             offers.forEach((offer) => {
                 // The initializeOfferCheckout function will check if already initialized or initializing
@@ -155,7 +203,7 @@ export function usePostPurchasesQuery(options) {
                 });
             });
         }
-    }, [autoInitializeCheckout, offers, session?.customerId, initializeOfferCheckout]);
+    }, [autoInitializeCheckout, offers, session?.customerId, isSessionInitialized, initializeOfferCheckout]);
     // Accept offer mutation
     const acceptMutation = useMutation({
         mutationFn: ({ offerId, items }) => {

package/dist/v2/react/hooks/useTranslation.js

@@ -51,10 +51,13 @@ import React, { useCallback, useMemo } from 'react';
  * ```
  */
 export const useTranslation = (options = {}) => {
-    const { defaultLanguage = 'en' } = options;
+    const { defaultLanguage } = options;
     // Get the current language from query params, browser, or fallback to default
     const locale = useMemo(() => {
         // Check for language query parameter
+        if (defaultLanguage) {
+            return defaultLanguage;
+        }
         if (typeof window !== 'undefined') {
             const urlParams = new URLSearchParams(window.location.search);
             const langFromQuery = urlParams.get('locale');
@@ -66,7 +69,7 @@ export const useTranslation = (options = {}) => {
             const browserLang = navigator.language.split('-')[0]; // e.g., 'en-US' -> 'en'
             return browserLang;
         }
-        return defaultLanguage;
+        return 'en';
     }, [defaultLanguage]);
     const t = useCallback((text, fallback, params, languageCode) => {
         // Helper function to interpolate params into the translated string
@@ -160,7 +163,7 @@ export const useTranslation = (options = {}) => {
         else if (fallback) {
             translatedText = fallback;
         }
-        else if (text[defaultLanguage]) {
+        else if (defaultLanguage && text[defaultLanguage]) {
             translatedText = text[defaultLanguage];
         }
         else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tagadapay/plugin-sdk",
-  "version": "2.7.21",
+  "version": "2.7.24",
   "description": "Modern React SDK for building Tagada Pay plugins",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",