@phygitallabs/tapquest-core 2.13.1 → 3.3.0

package/src/modules/achivementWithReward/hooks/achivementPlusRewardModel.ts

@@ -1,6 +1,6 @@
 import { Achievement, useManyAchievements } from "@phygitallabs/achievement";
 import { EntityRewardModel } from "@phygitallabs/reward";
-import { useCreateModelGroupReward } from "@phygitallabs/reward/src/hooks/useGroupReward";
+import { useCreateModelGroupReward } from "@phygitallabs/reward";
 import { useEffect, useMemo } from "react";
 
 interface UseAchivementPlusRewardModelParams {

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

@@ -315,7 +315,10 @@ export const useAuthStore :any = create<AuthStore>()(
                   localStorage.clear();
                   return;
                 }
-                await authService.logout();
+                const refreshToken = tokenStorage.getRefreshToken();
+                if (refreshToken) {
+                  await authService.logout({ refreshToken });
+                }
 
                 // Clear tokenStorage first
                 localStorage.clear();

package/src/providers/ServicesProvider.tsx

@@ -14,7 +14,6 @@ interface ServicesProviderProps {
     children: React.ReactNode;
     queryClient: QueryClient;
     apiConfig: APIConfig;
-    firebaseConfig?: any;
 }
 
 export const ServicesProvider: React.FC<ServicesProviderProps> = ({

package/tsup.config.ts

@@ -1,11 +1,12 @@
 import { defineConfig } from "tsup";
 
 export default defineConfig({
-  entry: ["index.ts"],
+  entry: ["src/index.ts"],
   format: ["esm"],
   outExtension: () => ({ js: '.mjs' }),
   dts: true,
   splitting: false,
   sourcemap: true,
+  minify: true,
   clean: true,
 });

package/src/constants/firebase.ts

@@ -1,36 +0,0 @@
-import { EnvironmentType } from "../types/common";
-
-const FIREBASE_ENV = {
-    dev:{
-        "apiKey": "AIzaSyBFReJURBrU3hyiVvHHhMKcruiyy3mkEks",
-        "authDomain": "phy-nomion-staging.firebaseapp.com",
-        "projectId": "phy-nomion-staging",
-        "storageBucket": "phy-nomion-staging.appspot.com",
-        "messagingSenderId": "445937266499",
-        "appId": "1:445937266499:web:9ce9b49c13dcecd9b889f6",
-        "measurementId": "G-GWYSS45K15"
-    },
-    staging:{
-        "apiKey": "AIzaSyAXrJB8n4eZyq43kb9pUSelz9vfkJLHRK8",
-        "authDomain": "phygital-388705.firebaseapp.com",
-        "projectId": "phygital-388705",
-        "storageBucket": "assets-fygito",
-        "messagingSenderId": "174350081236",
-        "appId": "1:174350081236:web:da29144bf47cf775a5af41",
-        "measurementId": "G-JVHVWXMDC9"
-    },
-    production:{
-        "apiKey": "AIzaSyAXrJB8n4eZyq43kb9pUSelz9vfkJLHRK8",
-        "authDomain": "phygital-388705.firebaseapp.com",
-        "projectId": "phygital-388705",
-        "storageBucket": "assets-fygito",
-        "messagingSenderId": "174350081236",
-        "appId": "1:174350081236:web:da29144bf47cf775a5af41",
-        "measurementId": "G-JVHVWXMDC9"
-    },
-}
-
-export const firebaseConfig = (env: EnvironmentType) => {
-    return FIREBASE_ENV[env];
-  };
-  

package/src/modules/auth/services/FirebaseAuthService.ts

@@ -1,290 +0,0 @@
-// Client-side only imports
-let firebaseApp: any;
-let firebaseAuth: any;
-
-// Dynamic imports for client-side only
-const getFirebaseModules = async () => {
-  if (typeof window === 'undefined') {
-    throw new Error('Firebase can only be used in client environment');
-  }
-
-  if (!firebaseApp || !firebaseAuth) {
-    const [
-      { initializeApp, getApps },
-      {
-        getAuth,
-        signInWithEmailAndPassword,
-        createUserWithEmailAndPassword,
-        signInWithPopup,
-        GoogleAuthProvider,
-        signOut,
-        sendPasswordResetEmail,
-        sendEmailVerification,
-        updatePassword,
-        onAuthStateChanged,
-      }
-    ] = await Promise.all([
-      import("firebase/app"),
-      import("firebase/auth")
-    ]);
-
-    firebaseApp = { initializeApp, getApps };
-    firebaseAuth = {
-      getAuth,
-      signInWithEmailAndPassword,
-      createUserWithEmailAndPassword,
-      signInWithPopup,
-      GoogleAuthProvider,
-      signOut,
-      sendPasswordResetEmail,
-      sendEmailVerification,
-      updatePassword,
-      onAuthStateChanged,
-    };
-  }
-
-  return { firebaseApp, firebaseAuth };
-};
-
-import { AuthService, FirebaseConfig, AuthResponse, UserData, SignInProvider } from "../types";
-import { accessTokenKey, refreshTokenKey } from "../constants";
-
-export class FirebaseAuthService implements AuthService {
-  private app: any;
-  private auth: any;
-  private googleProvider: any;
-  private config: FirebaseConfig;
-  private initialized = false;
-
-  constructor(config: FirebaseConfig) {
-    this.config = config;
-    // Initialization will be done lazily in client environment
-  }
-
-  private async ensureInitialized() {
-    if (this.initialized) return;
-
-    const { firebaseApp, firebaseAuth } = await getFirebaseModules();
-
-    // Initialize Firebase app if not already initialized
-    if (!firebaseApp.getApps().length) {
-      this.app = firebaseApp.initializeApp(this.config);
-    } else {
-      this.app = firebaseApp.getApps()[0];
-    }
-
-    this.auth = firebaseAuth.getAuth(this.app);
-    this.googleProvider = new firebaseAuth.GoogleAuthProvider();
-    this.initialized = true;
-  }
-
-  private transformUserData(user: any): UserData {
-    return {
-      id: user.uid,
-      uid: user.uid,
-      userName: user.displayName || "",
-      displayName: user.displayName || "",
-      email: user.email || "",
-      refreshToken: user.refreshToken,
-      accessToken: (user as any).accessToken || "",
-      exp: (user as any).stsTokenManager?.expirationTime || 0,
-      emailVerified: user.emailVerified,
-      avatar: user.photoURL || "/images/default-avatar.jpg",
-      signInProvider: this.getSignInProvider(user),
-      role: undefined,
-      scanStatus: false,
-    };
-  }
-
-  private getSignInProvider(user: any): SignInProvider {
-    const providers = user.providerData.map((p: any) => p.providerId);
-    if (providers.includes("google.com")) return "google.com";
-    return "password";
-  }
-
-  private translateErrorCode(errorCode: string): string {
-    switch (errorCode) {
-      case "auth/invalid-email":
-        return "Email không hợp lệ";
-      case "auth/user-disabled":
-        return "Tài khoản đã bị khóa";
-      case "auth/wrong-password":
-        return "Tài khoản/mật khẩu không đúng";
-      case "auth/user-not-found":
-        return "Tài khoản/mật khẩu không đúng";
-      case "auth/weak-password":
-        return "Weak password! Please use stronger password.";
-      case "auth/email-already-in-use":
-        return "Email đã được sử dụng";
-      case "auth/account-exists-with-different-credential":
-        return "Tài khoản email đã được sử dụng bởi một phương thức đăng nhập khác";
-      case "auth/email-not-verified":
-        return "Email chưa được xác thực";
-      default:
-        return "Đã có lỗi xảy ra";
-    }
-  }
-
-  async signInWithEmailAndPassword(email: string, password: string): Promise<AuthResponse> {
-    try {
-      await this.ensureInitialized();
-      const { firebaseAuth } = await getFirebaseModules();
-      const signInResponse = await firebaseAuth.signInWithEmailAndPassword(this.auth, email, password);
-      const { user } = signInResponse;
-      const data = this.transformUserData(user);
-
-      const { emailVerified } = data;
-      if (!emailVerified) {
-        await this.signOut();
-        localStorage.removeItem("phygital-user-info");
-        localStorage.removeItem(accessTokenKey);
-        localStorage.removeItem(refreshTokenKey);
-        throw new Error("Email is not verified");
-      }
-
-      return {
-        errorCode: "",
-        data,
-      };
-    } catch (err: any) {
-      const errorCode = this.translateErrorCode(err.code);
-      return {
-        errorCode,
-        data: null,
-      };
-    }
-  }
-
-  async signInWithGoogle(): Promise<AuthResponse> {
-    try {
-      await this.ensureInitialized();
-      const { firebaseAuth } = await getFirebaseModules();
-      const signInResponse = await firebaseAuth.signInWithPopup(this.auth, this.googleProvider);
-      const { user } = signInResponse;
-      const data = this.transformUserData(user);
-
-      const { emailVerified } = data;
-      if (!emailVerified) {
-        await this.signOut();
-        throw new Error("Email is not verified");
-      }
-
-      return {
-        errorCode: "",
-        data,
-      };
-    } catch (err: any) {
-      const errorCode = this.translateErrorCode(err.code);
-      return {
-        errorCode,
-        data: null,
-      };
-    }
-  }
-
-  async signUp(email: string, password: string): Promise<AuthResponse> {
-    try {
-      await this.ensureInitialized();
-      const { firebaseAuth } = await getFirebaseModules();
-      const signUpResponse = await firebaseAuth.createUserWithEmailAndPassword(this.auth, email, password);
-      const { user } = signUpResponse;
-      const data = this.transformUserData(user);
-
-      return {
-        errorCode: "",
-        data,
-      };
-    } catch (err: any) {
-      const errorCode = this.translateErrorCode(err.code);
-      return {
-        errorCode,
-        data: null,
-      };
-    }
-  }
-
-  async signOut(): Promise<void> {
-    try {
-      await this.ensureInitialized();
-      const { firebaseAuth } = await getFirebaseModules();
-      await firebaseAuth.signOut(this.auth);
-      // Tracking is now handled through callbacks in the consuming app
-    } catch (err) {
-      console.log("Firebase signOut error:", err);
-    }
-  }
-
-  async sendPasswordResetEmail(email: string): Promise<void> {
-    await this.ensureInitialized();
-    const { firebaseAuth } = await getFirebaseModules();
-    const actionCodeSettings = {
-      url: window.location.origin,
-      handleCodeInApp: true,
-    };
-    await firebaseAuth.sendPasswordResetEmail(this.auth, email, actionCodeSettings);
-  }
-
-  async sendEmailVerification(): Promise<void> {
-    await this.ensureInitialized();
-    const { firebaseAuth } = await getFirebaseModules();
-    if (!this.auth.currentUser) {
-      throw new Error("No current user");
-    }
-    const actionCodeSettings = {
-      url: window.location.origin,
-      handleCodeInApp: true,
-    };
-    await firebaseAuth.sendEmailVerification(this.auth.currentUser, actionCodeSettings);
-  }
-
-  async changePassword(newPassword: string): Promise<void> {
-    await this.ensureInitialized();
-    const { firebaseAuth } = await getFirebaseModules();
-    const user = this.auth.currentUser;
-    if (!user) {
-      throw new Error("No current user");
-    }
-    return firebaseAuth.updatePassword(user, newPassword);
-  }
-
-  onAuthStateChanged(callback: (user: UserData | null) => void): () => void {
-    // For client-side only usage, ensure initialization before setting up auth state listener
-    if (typeof window === 'undefined') {
-      return () => { }; // Return empty unsubscriber for server-side
-    }
-
-    // Set up the listener asynchronously
-    let unsubscriber: (() => void) | null = null;
-
-    this.ensureInitialized().then(async () => {
-      const { firebaseAuth } = await getFirebaseModules();
-      unsubscriber = firebaseAuth.onAuthStateChanged(this.auth, (user: any) => {
-        if (user && user.emailVerified) {
-          const userData = this.transformUserData(user);
-          callback(userData);
-        } else {
-          callback(null);
-        }
-      });
-    });
-
-    // Return unsubscriber function
-    return () => {
-      if (unsubscriber) {
-        unsubscriber();
-      }
-    };
-  }
-
-  getCurrentUser(): UserData | null {
-    if (typeof window === 'undefined' || !this.initialized) {
-      return null; // Return null for server-side or before initialization
-    }
-
-    const user = this.auth.currentUser;
-    if (user && user.emailVerified) {
-      return this.transformUserData(user);
-    }
-    return null;
-  }
-}

package/src/modules/auth/services/authServiceFactory.ts

@@ -1,22 +0,0 @@
-import { FirebaseAuthService } from "./FirebaseAuthService";
-
-interface AuthServiceConfig {
-  firebaseConfig: any;
-}
-
-let authServiceInstance: FirebaseAuthService | null = null;
-
-export const createAuthService = (config: AuthServiceConfig): FirebaseAuthService => {
-  if (!authServiceInstance) {
-    authServiceInstance = new FirebaseAuthService(config.firebaseConfig);
-  }
-  return authServiceInstance;
-};
-
-export const getAuthService = (): FirebaseAuthService | null => {
-  return authServiceInstance;
-};
-
-export const resetAuthService = (): void => {
-  authServiceInstance = null;
-};

package/src/modules/auth/services/index.ts

@@ -1,3 +0,0 @@
-// Export Firebase auth service separately to avoid loading Firebase modules during SSR
-export { FirebaseAuthService } from './FirebaseAuthService';
-export { createAuthService, getAuthService, resetAuthService } from './authServiceFactory';