b5-api-client 0.0.27 → 0.0.28

package/dist/P2PMarketplaceAPIClient.d.ts

@@ -1,8 +1,8 @@
+import { AxiosRequestConfig } from 'axios';
 import { CreateOrderRequest, CreateUserRequest, Order, OrderResponse, TakeOrderRequest, TestEventParams, UpdateOrderRequest, TransactionStatusResponse, RateUserRequest, OrderEventsResponse, PushNotificationsRegisterRequest, ConfigResponse, DashboardMetricsResponse, UsersResponse, GetOrdersParams, CreateDisputeRequest, DisputesResponse, OrderOffersResponse, TransactionRequest, KioscoinOperationResponse, UpdateUserSettingsRequest, NotificationsResponse, VerifyEmailRequest } from './types';
-export interface AuthTokenProvider {
-    getToken(): Promise<string | null>;
-    refreshToken(): Promise<string | null>;
-    onRefreshFailure?(error: unknown): void;
+import { AuthTokenProvider } from './auth/AuthTokenProvider';
+export interface RequestConfigWithRetry extends AxiosRequestConfig {
+    _retry?: boolean;
 }
 declare class P2PMarketplaceAPIClient {
     private readonly client;

package/dist/auth/AuthTokenProvider.d.ts

@@ -0,0 +1,5 @@
+export interface AuthTokenProvider {
+    getToken(): Promise<string | null>;
+    refreshToken(): Promise<string | null>;
+    onRefreshFailure?(error: unknown): void;
+}

package/dist/auth/AuthTokenProvider.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/auth/FirebaseLoginService.d.ts

@@ -8,14 +8,6 @@ export declare enum AuthProvider {
     FACEBOOK = "FACEBOOK",
     TWITTER = "TWITTER"
 }
-export declare class AuthState {
-    readonly isAuthenticated: boolean;
-    readonly user: UserData | null;
-    readonly provider: AuthProvider | null;
-    private constructor();
-    static authenticated(user: UserData, provider: AuthProvider): AuthState;
-    static unauthenticated(): AuthState;
-}
 export declare class UserData {
     readonly id: string;
     readonly email: string;
@@ -47,7 +39,7 @@ export interface FirebaseConfig {
     appId: string;
     measurementId?: string;
 }
-export declare class FirebaseUnifiedService implements LoginService {
+export declare class FirebaseService implements LoginService {
     private app;
     private messaging;
     private auth;
@@ -56,7 +48,7 @@ export declare class FirebaseUnifiedService implements LoginService {
     private readonly emailVerificationContinueUrl?;
     private client;
     private readonly initializationPromise;
-    constructor(client: P2PMarketplaceAPIClient, config?: FirebaseLoginServiceConfig);
+    constructor(backendClient: P2PMarketplaceAPIClient, firebaseLoginConfig?: FirebaseLoginServiceConfig);
     private initializeFirebase;
     private ensureAuthInstance;
     private buildAuthTokenProvider;

package/dist/auth/FirebaseLoginService.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FirebaseUnifiedService = exports.AuthResult = exports.UserData = exports.AuthState = exports.AuthProvider = void 0;
+exports.FirebaseService = exports.AuthResult = exports.UserData = exports.AuthProvider = void 0;
 const app_1 = require("firebase/app");
 const auth_1 = require("firebase/auth");
 const messaging_1 = require("firebase/messaging");
@@ -36,22 +36,6 @@ var AuthProvider;
     AuthProvider["FACEBOOK"] = "FACEBOOK";
     AuthProvider["TWITTER"] = "TWITTER";
 })(AuthProvider = exports.AuthProvider || (exports.AuthProvider = {}));
-// Immutable auth state class
-class AuthState {
-    constructor(isAuthenticated, user, provider) {
-        this.isAuthenticated = isAuthenticated;
-        this.user = user;
-        this.provider = provider;
-    }
-    static authenticated(user, provider) {
-        return new AuthState(true, user, provider);
-    }
-    static unauthenticated() {
-        return new AuthState(false, null, null);
-    }
-}
-exports.AuthState = AuthState;
-// Enhanced UserData class with additional safety
 class UserData {
     constructor(id, email, username, isEmailVerified, idToken, isAdmin) {
         this.id = id;
@@ -87,24 +71,27 @@ class AuthResult {
     }
 }
 exports.AuthResult = AuthResult;
-class FirebaseUnifiedService {
-    constructor(client, config) {
-        var _a, _b, _c, _d, _e;
+class FirebaseService {
+    constructor(backendClient, firebaseLoginConfig) {
+        var _a, _b, _c, _d;
         this.app = null;
         this.messaging = null;
         this.auth = null;
-        this.client = client;
-        const fallbackVerificationPage = (_a = config === null || config === void 0 ? void 0 : config.emailVerificationUrl) !== null && _a !== void 0 ? _a : DEFAULT_EMAIL_VERIFICATION_PAGE;
+        this.client = backendClient;
+        const fallbackVerificationPage = (_a = firebaseLoginConfig === null || firebaseLoginConfig === void 0 ? void 0 : firebaseLoginConfig.emailVerificationUrl) !== null && _a !== void 0 ? _a : DEFAULT_EMAIL_VERIFICATION_PAGE;
         this.emailVerificationUrl = trimTrailingSlash(fallbackVerificationPage);
-        this.emailVerificationContinueUrl = config === null || config === void 0 ? void 0 : config.emailVerificationContinueUrl;
-        const configuredActionSettings = config === null || config === void 0 ? void 0 : config.actionCodeSettings;
-        const defaultActionUrl = (_d = (_c = (_b = configuredActionSettings === null || configuredActionSettings === void 0 ? void 0 : configuredActionSettings.url) !== null && _b !== void 0 ? _b : process.env.REACT_APP_EMAIL_LINK_URL) !== null && _c !== void 0 ? _c : process.env.NEXT_PUBLIC_EMAIL_LINK_URL) !== null && _d !== void 0 ? _d : "http://localhost:3000/auth/verify-email";
+        this.emailVerificationContinueUrl = firebaseLoginConfig === null || firebaseLoginConfig === void 0 ? void 0 : firebaseLoginConfig.emailVerificationContinueUrl;
+        const configuredActionSettings = firebaseLoginConfig === null || firebaseLoginConfig === void 0 ? void 0 : firebaseLoginConfig.actionCodeSettings;
+        const defaultActionUrl = (_c = (_b = configuredActionSettings === null || configuredActionSettings === void 0 ? void 0 : configuredActionSettings.url) !== null && _b !== void 0 ? _b : process.env.REACT_APP_EMAIL_LINK_URL) !== null && _c !== void 0 ? _c : process.env.NEXT_PUBLIC_EMAIL_LINK_URL;
         this.actionCodeSettings = {
-            url: defaultActionUrl,
-            handleCodeInApp: (_e = configuredActionSettings === null || configuredActionSettings === void 0 ? void 0 : configuredActionSettings.handleCodeInApp) !== null && _e !== void 0 ? _e : true,
+            url: defaultActionUrl !== null && defaultActionUrl !== void 0 ? defaultActionUrl : "http://localhost:3000/auth/verify-email",
+            handleCodeInApp: (_d = configuredActionSettings === null || configuredActionSettings === void 0 ? void 0 : configuredActionSettings.handleCodeInApp) !== null && _d !== void 0 ? _d : true,
         };
-        this.initializationPromise = this.initializeFirebase();
+        // Set the auth token provider first (before initialization)
+        // It will gracefully return null until auth is ready
         this.client.setAuthTokenProvider(this.buildAuthTokenProvider());
+        // Start initialization (this will fetch config, which needs to work without auth)
+        this.initializationPromise = this.initializeFirebase();
     }
     initializeFirebase() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -135,14 +122,19 @@ class FirebaseUnifiedService {
     buildAuthTokenProvider() {
         return {
             getToken: () => __awaiter(this, void 0, void 0, function* () {
-                const auth = yield this.ensureAuthInstance();
-                const currentUser = auth === null || auth === void 0 ? void 0 : auth.currentUser;
+                // Check if auth is available without waiting for initialization
+                // This prevents circular dependency during initial config fetch
+                if (!this.auth) {
+                    return null;
+                }
+                const currentUser = this.auth.currentUser;
                 if (!currentUser) {
                     return null;
                 }
                 return currentUser.getIdToken();
             }),
             refreshToken: () => __awaiter(this, void 0, void 0, function* () {
+                // For token refresh, we need to ensure auth is initialized
                 const auth = yield this.ensureAuthInstance();
                 const currentUser = auth === null || auth === void 0 ? void 0 : auth.currentUser;
                 if (!currentUser) {
@@ -293,7 +285,8 @@ class FirebaseUnifiedService {
                         username: syncedBackendUser.username || '',
                         email: userCredential.user.email || '',
                         idToken,
-                        isAdmin: syncedBackendUser.admin || false
+                        isAdmin: syncedBackendUser.admin || false,
+                        isEmailVerified: userCredential.user.emailVerified
                     });
                     return authResult;
                 }
@@ -588,4 +581,4 @@ class FirebaseUnifiedService {
         });
     }
 }
-exports.FirebaseUnifiedService = FirebaseUnifiedService;
+exports.FirebaseService = FirebaseService;

package/dist/auth/LoginService.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createLoginService = void 0;
+const FirebaseLoginService_1 = require("./FirebaseLoginService");
 function createLoginService(config) {
     const { provider, apiClient } = config;
     if (provider === 'firebase') {
-        const { FirebaseUnifiedService } = require('../FirebaseLoginService');
-        return new FirebaseUnifiedService(apiClient, config.firebase);
+        return new FirebaseLoginService_1.FirebaseService(apiClient, config.firebase);
     }
     throw new Error(`Unsupported login provider: ${provider}`);
 }

package/dist/auth/UserContext.d.ts

@@ -4,6 +4,7 @@ export interface User {
     email: string;
     idToken: string;
     isAdmin: boolean;
+    isEmailVerified: boolean;
 }
 export interface UserContext {
     user: User | null;

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { default as P2PMarketplaceAPIClient } from './P2PMarketplaceAPIClient';
 export { generateSecretAndHash } from './cryptoUtils';
 export * from './types';
-export { FirebaseUnifiedService } from './auth/FirebaseLoginService';
+export { FirebaseService, AuthProvider, UserData, AuthResult } from './auth/FirebaseLoginService';
 export { createLoginService } from './auth/LoginService';
 export { userContext } from './auth/UserContext';

package/dist/index.js

@@ -17,14 +17,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.userContext = exports.createLoginService = exports.FirebaseUnifiedService = exports.generateSecretAndHash = exports.P2PMarketplaceAPIClient = void 0;
+exports.userContext = exports.createLoginService = exports.AuthResult = exports.UserData = exports.AuthProvider = exports.FirebaseService = exports.generateSecretAndHash = exports.P2PMarketplaceAPIClient = void 0;
 var P2PMarketplaceAPIClient_1 = require("./P2PMarketplaceAPIClient");
 Object.defineProperty(exports, "P2PMarketplaceAPIClient", { enumerable: true, get: function () { return __importDefault(P2PMarketplaceAPIClient_1).default; } });
 var cryptoUtils_1 = require("./cryptoUtils");
 Object.defineProperty(exports, "generateSecretAndHash", { enumerable: true, get: function () { return cryptoUtils_1.generateSecretAndHash; } });
 __exportStar(require("./types"), exports);
 var FirebaseLoginService_1 = require("./auth/FirebaseLoginService");
-Object.defineProperty(exports, "FirebaseUnifiedService", { enumerable: true, get: function () { return FirebaseLoginService_1.FirebaseUnifiedService; } });
+Object.defineProperty(exports, "FirebaseService", { enumerable: true, get: function () { return FirebaseLoginService_1.FirebaseService; } });
+Object.defineProperty(exports, "AuthProvider", { enumerable: true, get: function () { return FirebaseLoginService_1.AuthProvider; } });
+Object.defineProperty(exports, "UserData", { enumerable: true, get: function () { return FirebaseLoginService_1.UserData; } });
+Object.defineProperty(exports, "AuthResult", { enumerable: true, get: function () { return FirebaseLoginService_1.AuthResult; } });
 var LoginService_1 = require("./auth/LoginService");
 Object.defineProperty(exports, "createLoginService", { enumerable: true, get: function () { return LoginService_1.createLoginService; } });
 var UserContext_1 = require("./auth/UserContext");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "b5-api-client",
-  "version": "0.0.27",
+  "version": "0.0.28",
   "description": "Escrow Backend API client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/P2PMarketplaceAPIClient.ts

@@ -1,17 +1,12 @@
-import axios, { AxiosError, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-import { CreateOrderRequest, CreateUserRequest, Order, OrderResponse, TakeOrderRequest, TestEventParams, UpdateOrderRequest, TransactionStatusResponse, RateUserRequest, OrderEventsResponse, PushNotificationsRegisterRequest, ConfigResponse, DashboardMetricsResponse, KioscoinUser, UsersResponse, PaymentMethod, GetOrdersParams, CreateDisputeRequest, DisputesResponse, OrderOffersResponse, TransactionRequest, KioscoinOperationResponse, UpdateUserSettingsRequest, NotificationsResponse, VerifyEmailRequest } from './types';
+import axios, { AxiosError, AxiosInstance, AxiosRequestConfig } from 'axios';
+import { CreateOrderRequest, CreateUserRequest, Order, OrderResponse, TakeOrderRequest, TestEventParams, UpdateOrderRequest, TransactionStatusResponse, RateUserRequest, OrderEventsResponse, PushNotificationsRegisterRequest, ConfigResponse, DashboardMetricsResponse, UsersResponse, GetOrdersParams, CreateDisputeRequest, DisputesResponse, OrderOffersResponse, TransactionRequest, KioscoinOperationResponse, UpdateUserSettingsRequest, NotificationsResponse, VerifyEmailRequest } from './types';
+import { AuthTokenProvider } from './auth/AuthTokenProvider';
 import { isPlainObject, camelCase, snakeCase, transform } from 'lodash';
 
-interface RequestConfigWithRetry extends AxiosRequestConfig {
+export interface RequestConfigWithRetry extends AxiosRequestConfig {
     _retry?: boolean;
 }
 
-export interface AuthTokenProvider {
-    getToken(): Promise<string | null>;
-    refreshToken(): Promise<string | null>;
-    onRefreshFailure?(error: unknown): void;
-}
-
 class P2PMarketplaceAPIClient {
     private readonly client: AxiosInstance;
     private readonly defaultHeaders: Record<string, string>;

package/src/auth/AuthTokenProvider.ts

@@ -0,0 +1,5 @@
+export interface AuthTokenProvider {
+    getToken(): Promise<string | null>;
+    refreshToken(): Promise<string | null>;
+    onRefreshFailure?(error: unknown): void;
+}

package/src/auth/FirebaseLoginService.ts

@@ -19,7 +19,8 @@ import {
 } from "firebase/auth";
 import { getMessaging, getToken, onMessage } from "firebase/messaging";
 import { CreateUserRequest, KioscoinUser, UpdateUserSettingsRequest } from "../types";
-import P2PMarketplaceAPIClient, { AuthTokenProvider } from "../P2PMarketplaceAPIClient";
+import P2PMarketplaceAPIClient from "../P2PMarketplaceAPIClient";
+import { AuthTokenProvider } from "./AuthTokenProvider";
 import { FirebaseLoginServiceConfig, LoginService } from "./LoginService";
 import { userContext } from './UserContext';
 
@@ -56,24 +57,6 @@ export enum AuthProvider {
     TWITTER = 'TWITTER'
 }
 
-// Immutable auth state class
-export class AuthState {
-    private constructor(
-        public readonly isAuthenticated: boolean,
-        public readonly user: UserData | null,
-        public readonly provider: AuthProvider | null
-    ) { }
-
-    static authenticated(user: UserData, provider: AuthProvider): AuthState {
-        return new AuthState(true, user, provider);
-    }
-
-    static unauthenticated(): AuthState {
-        return new AuthState(false, null, null);
-    }
-}
-
-// Enhanced UserData class with additional safety
 export class UserData {
     private constructor(
         public readonly id: string,
@@ -144,7 +127,7 @@ export interface FirebaseConfig {
     measurementId?: string;
 }
 
-export class FirebaseUnifiedService implements LoginService {
+export class FirebaseService implements LoginService {
     private app: ReturnType<typeof initializeApp> | null = null;
     private messaging: ReturnType<typeof getMessaging> | null = null;
     private auth: Auth | null = null;
@@ -154,24 +137,28 @@ export class FirebaseUnifiedService implements LoginService {
     private client: P2PMarketplaceAPIClient;
     private readonly initializationPromise: Promise<void>;
 
-    constructor(client: P2PMarketplaceAPIClient, config?: FirebaseLoginServiceConfig) {
-        this.client = client;
-        const fallbackVerificationPage = config?.emailVerificationUrl ?? DEFAULT_EMAIL_VERIFICATION_PAGE;
+    constructor(backendClient: P2PMarketplaceAPIClient, firebaseLoginConfig?: FirebaseLoginServiceConfig) {
+        this.client = backendClient;
+        const fallbackVerificationPage = firebaseLoginConfig?.emailVerificationUrl ?? DEFAULT_EMAIL_VERIFICATION_PAGE;
         this.emailVerificationUrl = trimTrailingSlash(fallbackVerificationPage);
-        this.emailVerificationContinueUrl = config?.emailVerificationContinueUrl;
-        const configuredActionSettings = config?.actionCodeSettings;
+        this.emailVerificationContinueUrl = firebaseLoginConfig?.emailVerificationContinueUrl;
+        const configuredActionSettings = firebaseLoginConfig?.actionCodeSettings;
         const defaultActionUrl =
             configuredActionSettings?.url ??
             process.env.REACT_APP_EMAIL_LINK_URL ??
-            process.env.NEXT_PUBLIC_EMAIL_LINK_URL ??
-            "http://localhost:3000/auth/verify-email";
+            process.env.NEXT_PUBLIC_EMAIL_LINK_URL
 
         this.actionCodeSettings = {
-            url: defaultActionUrl,
+            url: defaultActionUrl ?? "http://localhost:3000/auth/verify-email",
             handleCodeInApp: configuredActionSettings?.handleCodeInApp ?? true,
         };
-        this.initializationPromise = this.initializeFirebase();
+
+        // Set the auth token provider first (before initialization)
+        // It will gracefully return null until auth is ready
         this.client.setAuthTokenProvider(this.buildAuthTokenProvider());
+
+        // Start initialization (this will fetch config, which needs to work without auth)
+        this.initializationPromise = this.initializeFirebase();
     }
 
     private async initializeFirebase() {
@@ -200,14 +187,19 @@ export class FirebaseUnifiedService implements LoginService {
     private buildAuthTokenProvider(): AuthTokenProvider {
         return {
             getToken: async () => {
-                const auth = await this.ensureAuthInstance();
-                const currentUser = auth?.currentUser;
+                // Check if auth is available without waiting for initialization
+                // This prevents circular dependency during initial config fetch
+                if (!this.auth) {
+                    return null;
+                }
+                const currentUser = this.auth.currentUser;
                 if (!currentUser) {
                     return null;
                 }
                 return currentUser.getIdToken();
             },
             refreshToken: async () => {
+                // For token refresh, we need to ensure auth is initialized
                 const auth = await this.ensureAuthInstance();
                 const currentUser = auth?.currentUser;
                 if (!currentUser) {
@@ -372,7 +364,8 @@ export class FirebaseUnifiedService implements LoginService {
                     username: syncedBackendUser.username || '',
                     email: userCredential.user.email || '',
                     idToken,
-                    isAdmin: syncedBackendUser.admin || false
+                    isAdmin: syncedBackendUser.admin || false,
+                    isEmailVerified: userCredential.user.emailVerified
                 });
                 return authResult;
             } else {

package/src/auth/LoginService.ts

@@ -1,5 +1,5 @@
 import P2PMarketplaceAPIClient from "../P2PMarketplaceAPIClient";
-import { AuthResult } from "./FirebaseLoginService";
+import { AuthResult, FirebaseService } from "./FirebaseLoginService";
 
 export type LoginProvider = 'firebase' | 'custom';
 
@@ -28,8 +28,7 @@ export interface FirebaseLoginServiceConfig {
 export function createLoginService(config: LoginServiceConfig): LoginService {
     const { provider, apiClient } = config;
     if (provider === 'firebase') {
-        const { FirebaseUnifiedService } = require('../FirebaseLoginService');
-        return new FirebaseUnifiedService(apiClient, config.firebase);
+        return new FirebaseService(apiClient, config.firebase);
     }
     throw new Error(`Unsupported login provider: ${provider}`);
 }

package/src/auth/UserContext.ts

@@ -5,6 +5,7 @@ export interface User {
     email: string;
     idToken: string;
     isAdmin: boolean;
+    isEmailVerified: boolean;
 }
 
 // Define the UserContext interface

package/src/index.ts

@@ -1,6 +1,6 @@
 export { default as P2PMarketplaceAPIClient } from './P2PMarketplaceAPIClient';
 export { generateSecretAndHash } from './cryptoUtils'
 export * from './types';
-export { FirebaseUnifiedService } from './auth/FirebaseLoginService';
+export { FirebaseService, AuthProvider, UserData, AuthResult } from './auth/FirebaseLoginService';
 export { createLoginService } from './auth/LoginService';
 export { userContext } from './auth/UserContext';

package/src/types.ts

@@ -1,3 +1,5 @@
+import { AxiosRequestConfig } from "axios";
+
 export type OrderType = 'SELL' | 'BUY';
 
 export type OrderStatus =