@phygitallabs/tapquest-core 4.5.0 → 4.6.0

package/src/modules/auth/store/authStore.ts

@@ -129,7 +129,7 @@ const initialState: AuthState = {
 };
 
 // Create the auth store
-export const useAuthStore :any = create<AuthStore>()(
+export const useAuthStore = create<AuthStore>()(
   devtools(
     persist(
       subscribeWithSelector(
@@ -203,14 +203,14 @@ export const useAuthStore :any = create<AuthStore>()(
                 return response;
               } catch (error: any) {
                 // Check if error has code 7 (email not verified)
-                if (error?.response?.data?.code === 7) {
-                  // Return a special response for email verification needed
-                  return {
-                    data: undefined,
-                    message: "Email verification required",
-                    code: 7,
-                  };
-                }
+                // if (error?.response?.data?.code === 7) {
+                //   // Return a special response for email verification needed
+                //   return {
+                //     data: undefined,
+                //     message: "Email verification required",
+                //     code: 7,
+                //   };
+                // }
 
                 const errorMessage =
                   error instanceof Error ? error.message : "Login failed";
@@ -309,19 +309,18 @@ export const useAuthStore :any = create<AuthStore>()(
                   state.isSignedIn = false;
                   state.error = null;
                 });
+
+                const refreshToken = tokenStorage.getRefreshToken();
                 const isTokenExpired = tokenStorage.isTokenExpired();
-                if (isTokenExpired) {
+
+                if (isTokenExpired || !refreshToken) {
                   tokenStorage.clearTokens();
-                  localStorage.clear();
                   return;
                 }
-                const refreshToken = tokenStorage.getRefreshToken();
-                if (refreshToken) {
-                  await authService.logout({ refreshToken });
-                }
 
-                // Clear tokenStorage first
-                localStorage.clear();
+                await authService.logout({
+                  refreshToken,
+                });
                 tokenStorage.clearTokens();
 
                 // Execute default cleanup functions
@@ -485,6 +484,14 @@ export const useAuthStore :any = create<AuthStore>()(
                 refreshToken:
                   refreshToken ?? tokenStorage.getRefreshToken() ?? "",
               });
+
+              if(refreshTokenResponse.data?.idToken && refreshTokenResponse.data?.refreshToken){
+                tokenStorage.setTokens({
+                    idToken: refreshTokenResponse.data?.idToken,
+                    refreshToken: refreshTokenResponse.data?.refreshToken,
+                  });
+              }
+
               return refreshTokenResponse;
             },
 
@@ -561,12 +568,12 @@ export const useAuthStore :any = create<AuthStore>()(
 );
 
 export const useAuth = () => {
-  const user = useAuthStore((state: any) => state.user);
-  const isSignedIn = useAuthStore((state: any) => state.isSignedIn);
-  const isInitialized = useAuthStore((state: any) => state.isInitialized);
-  const isLoading = useAuthStore((state: any) => state.isLoading);
-  const error = useAuthStore((state: any) => state.error);
-  const actions = useAuthStore((state: any) => state.actions);
+  const user = useAuthStore((state) => state.user);
+  const isSignedIn = useAuthStore((state) => state.isSignedIn);
+  const isInitialized = useAuthStore((state) => state.isInitialized);
+  const isLoading = useAuthStore((state) => state.isLoading);
+  const error = useAuthStore((state) => state.error);
+  const actions = useAuthStore((state) => state.actions);
 
   return {
     user,
@@ -577,4 +584,3 @@ export const useAuth = () => {
     ...actions,
   };
 };
-

package/src/modules/auth/utils/user.ts

@@ -1,6 +1,6 @@
 import { UserData, UserRole, UserType } from "../types/user-data";
 import { UserModel } from "@phygitallabs/api-core";
-import { jwtDecode } from "jwt-decode";
+import jwtDecode from "jwt-decode";
 
 export const transformProtoUserData = (user: UserModel, accessToken: string): UserData => {
   const userData = { ...user } as UserData;
@@ -17,5 +17,15 @@ export const transformProtoUserData = (user: UserModel, accessToken: string): Us
   userData.roles = tokenDecoded?.roles || [UserRole.USER];
   userData.account_type = tokenDecoded?.account_type || UserType.C;
   userData.picture = user.picture || "";
+
   return userData;
 };
+
+export const decodeJWTToken = (token: string): any => {
+  try {
+    return jwtDecode(token);
+  } catch (error) {
+    console.warn("Failed to decode token in decodeJWTToken:", error);
+    return null;
+  }
+};

package/src/modules/data-tracking/hooks/index.ts

@@ -47,7 +47,8 @@ function useDataTracking() {
     const { setUserId, setMetadata } = useSessionReplay();
 
     const trackEvent = (eventName: string, eventData: Record<string, any>, useTools?: ("gtm" | "ga" | "posthog")[]) => {
-
+        console.log("trackEvent ", eventName, eventData);
+        
         useTools = useTools || ["gtm"];
 
         if (useTools.includes("gtm") && typeof window !== "undefined") {

package/src/modules/generate-certificate/hooks/index.ts

@@ -5,6 +5,7 @@ import {
   useCreateCertificate,
   useCreateCertificateAnonymous,
   useCreateCertificateWithMask,
+  useAddFrame,
 } from "@phygitallabs/generate-certificate";
 
 export {
@@ -14,4 +15,5 @@ export {
   useCreateCertificate,
   useCreateCertificateAnonymous,
   useCreateCertificateWithMask,
+  useAddFrame,
 };

package/src/modules/reward/hooks/useRewardService.ts

@@ -3,11 +3,11 @@ export {
   useManyUserRewards,
   useGetUserRewards,
   useClaimUserReward,
-  useListRewardModels,
   useGetRewardModel,
   useCreateRewardModel,
   useUpdateRewardModel,
   useDeleteRewardModel,
+  useListRewardModels,
   useCreateModelGroupReward,
   useClearUserRewardCache,
   useV1ListRewards

package/src/modules/reward/types/requests.ts

@@ -1,5 +1,5 @@
 // Define request types locally since they're not exported from reward package
-import { PaginationRequest, GetManyResponse } from "@phygitallabs/api-core/src/types/pagination";
+import { PaginationRequest, GetManyResponse } from "@phygitallabs/api-core";
 import { EntityRewardModel, UserReward } from "./reward";
 
 // User Rewards API Requests

package/src/providers/ServicesProvider.tsx

@@ -10,10 +10,19 @@ import { APIConfig, ServiceConfig } from "../types/service";
 
 import { checkDeviceUid } from "../modules/auth/helpers";
 
+import { useAuth } from "../modules/auth/store/authStore";
+
+import { httpMaxRetries, retryAttemptsRefreshToken } from "../modules/auth/constants";
+import { getFromLS, setToLS } from "@phygitallabs/helpers";
+import { tokenStorage } from "@phygitallabs/authentication";
+
+import axios from "axios";
+
 interface ServicesProviderProps {
     children: React.ReactNode;
     queryClient: QueryClient;
     apiConfig: APIConfig;
+    firebaseConfig?: any;
 }
 
 export const ServicesProvider: React.FC<ServicesProviderProps> = ({
@@ -24,6 +33,7 @@ export const ServicesProvider: React.FC<ServicesProviderProps> = ({
         version: "v1"
     },
 }) => {
+    const { signOut, refreshToken } = useAuth();
     const { environment, version } = apiConfig;
     const [commonServiceConfig, setCommonServiceConfig] = useState<ServiceConfig | null>(null);
 
@@ -35,7 +45,33 @@ export const ServicesProvider: React.FC<ServicesProviderProps> = ({
 
                 const responseInterceptors = ({
                     onFulfilled: (response: any) => response,
-                    onRejected:  async (error: any) => Promise.reject(error),
+                    onRejected: async (error: any) => {
+                        const originalRequest = error.config;
+                        const token = tokenStorage.getAuthToken();
+
+                        if (error.response?.status === 401 && !originalRequest._retry) {
+                            const retryAttempts = parseInt(getFromLS(retryAttemptsRefreshToken) || "0", 10);
+                            if (retryAttempts >= httpMaxRetries) {
+                                await signOut();
+                                setToLS(retryAttemptsRefreshToken, 0);
+                                return Promise.reject(error);
+                            }
+
+                            setToLS(retryAttemptsRefreshToken, `${retryAttempts + 1}`);
+                            originalRequest._retry = true;
+                            if (token) {
+                                try {
+                                    const result = await refreshToken();
+                                    if (result?.data?.idToken) {
+                                        originalRequest.headers.Authorization = `Bearer ${result?.data?.idToken}`;
+                                        return axios(originalRequest);
+                                    }
+                                } catch (refreshError) {
+                                    console.log("Failed to refresh token:", refreshError);
+                                }
+                            }
+                        }
+                    }
                 })
 
                 const requestInterceptors = ({
@@ -97,4 +133,4 @@ export const ServicesProvider: React.FC<ServicesProviderProps> = ({
             </RewardServiceProvider>
         </PGLCoreServiceProvider>
     );
-};
+};

package/tsup.config.ts

@@ -10,6 +10,16 @@ export default defineConfig((options: Options) => ({
   outExtension: ({ format }) => ({ js: format === "cjs" ? ".cjs" : ".js" }),
   dts: true,
   clean: true,
+  external: [
+    "react",
+    "@phygitallabs/achievement",
+    "@phygitallabs/api-core",
+    "@phygitallabs/authentication",
+    "@phygitallabs/generate-certificate",
+    "@phygitallabs/helpers",
+    "@phygitallabs/notification-api",
+    "@phygitallabs/reward",
+  ],
   sourcemap: true,
   minify: true,
   treeshake: true,

package/src/store/hooks.ts

@@ -1,6 +0,0 @@
-import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
-import type { TapquestCoreRootState, TapquestCoreAppDispatch } from './index';
-
-// Typed hooks for internal use within tapquest-core
-export const useAppDispatch = () => useDispatch<TapquestCoreAppDispatch>();
-export const useAppSelector: TypedUseSelectorHook<TapquestCoreRootState> = useSelector;

package/src/store/index.ts

@@ -1,45 +0,0 @@
-import { configureStore } from "@reduxjs/toolkit";
-import storage from "redux-persist/lib/storage";
-import { persistReducer, persistStore, PersistConfig } from "redux-persist";
-import { authSlice } from "../modules/auth/store/authSlice";
-
-// Auth persist config
-const authPersistConfig: PersistConfig<any> = {
-  key: "tapquest-auth",
-  storage,
-  whitelist: ["user", "isSignedIn"], // Only persist user and sign-in status
-};
-
-// Create persisted auth reducer
-const persistedAuthReducer = persistReducer(authPersistConfig, authSlice.reducer);
-
-// Configure the tapquest-core store
-export const store = configureStore({
-  reducer: {
-    auth: persistedAuthReducer,
-  },
-  middleware: (getDefaultMiddleware) =>
-    getDefaultMiddleware({
-      serializableCheck: {
-        // Ignore redux-persist actions
-        ignoredActions: [
-          'persist/FLUSH',
-          'persist/REHYDRATE',
-          'persist/PAUSE',
-          'persist/PERSIST',
-          'persist/PURGE',
-          'persist/REGISTER',
-        ],
-      },
-    }),
-});
-
-// Create persistor
-export const persistor = persistStore(store);
-
-// Export types
-export type TapquestCoreRootState = ReturnType<typeof store.getState>;
-export type TapquestCoreAppDispatch = typeof store.dispatch;
-
-// Export store instance for internal use
-export { store as tapquestCoreStore };