b5-api-client 0.0.32 → 0.0.34

package/dist/P2PMarketplaceAPIClient.js

@@ -58,7 +58,11 @@ class P2PMarketplaceAPIClient {
             }
             return response;
         }, (error) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
+            // Transform error response data to camelCase for consistency
+            if ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data) {
+                error.response.data = toCamelCase(error.response.data);
+            }
             const { response, config } = error;
             if (!this.authTokenProvider || (response === null || response === void 0 ? void 0 : response.status) !== 401 || !config) {
                 return Promise.reject(error);
@@ -73,12 +77,12 @@ class P2PMarketplaceAPIClient {
                 if (!newToken) {
                     return Promise.reject(error);
                 }
-                originalRequest.headers = (_a = originalRequest.headers) !== null && _a !== void 0 ? _a : {};
+                originalRequest.headers = (_b = originalRequest.headers) !== null && _b !== void 0 ? _b : {};
                 originalRequest.headers['Authorization'] = `Bearer ${newToken}`;
                 return this.client(originalRequest);
             }
             catch (refreshError) {
-                if ((_b = this.authTokenProvider) === null || _b === void 0 ? void 0 : _b.onRefreshFailure) {
+                if ((_c = this.authTokenProvider) === null || _c === void 0 ? void 0 : _c.onRefreshFailure) {
                     this.authTokenProvider.onRefreshFailure(refreshError);
                 }
                 return Promise.reject(error);
@@ -122,27 +126,15 @@ class P2PMarketplaceAPIClient {
     get(url, headers) {
         return __awaiter(this, void 0, void 0, function* () {
             const config = this.createConfig(headers);
-            try {
-                const response = yield this.client.get(url, config);
-                return response.data;
-            }
-            catch (error) {
-                console.error(`GET request to ${url} failed:`, error);
-                throw error;
-            }
+            const response = yield this.client.get(url, config);
+            return response.data;
         });
     }
     post(url, data, headers) {
         return __awaiter(this, void 0, void 0, function* () {
             const config = this.createConfig(headers);
-            try {
-                const response = yield this.client.post(url, data, config);
-                return response.data;
-            }
-            catch (error) {
-                console.error(`POST request to ${url} failed:`, error);
-                throw error;
-            }
+            const response = yield this.client.post(url, data, config);
+            return response.data;
         });
     }
     getOrders(props, headers) {
@@ -287,13 +279,7 @@ class P2PMarketplaceAPIClient {
                 isAdmin: true
             };
             const url = "api/orders/release";
-            try {
-                return yield this.post(url, body, headers);
-            }
-            catch (error) {
-                console.error("Error releasing funds:", error);
-                throw new Error("Failed to release funds");
-            }
+            return yield this.post(url, body, headers);
         });
     }
     getTransactionStatus(txHash, headers) {
@@ -316,13 +302,7 @@ class P2PMarketplaceAPIClient {
         return __awaiter(this, void 0, void 0, function* () {
             const url = `/api/orders/${orderId}`;
             const config = this.createConfig(headers);
-            try {
-                yield this.client.delete(url, config);
-            }
-            catch (error) {
-                console.error(`DELETE request to ${url} failed:`, error);
-                throw error;
-            }
+            yield this.client.delete(url, config);
         });
     }
     // OpsLog
@@ -367,14 +347,8 @@ class P2PMarketplaceAPIClient {
         return __awaiter(this, void 0, void 0, function* () {
             const url = '/api/session';
             const config = this.createConfig(headers);
-            try {
-                const response = yield this.client.delete(url, config);
-                return response.data;
-            }
-            catch (error) {
-                console.error(`DELETE request to ${url} failed:`, error);
-                throw error;
-            }
+            const response = yield this.client.delete(url, config);
+            return response.data;
         });
     }
 }

package/dist/auth/FirebaseLoginService.d.ts

@@ -76,4 +76,5 @@ export declare class FirebaseService implements LoginService {
     private _createSuccessAuthResult;
     private getUserFromBackend;
     private createUserInBackend;
+    private getOrCreateUserInBackend;
 }

package/dist/auth/FirebaseLoginService.js

@@ -342,11 +342,9 @@ class FirebaseService {
                 const userCredential = yield (0, auth_1.signInWithPopup)(auth, provider);
                 const user = userCredential.user;
                 const idToken = yield user.getIdToken();
-                // Get or create user in your Kotlin backend
-                const backendUser = yield this.getUserFromBackend(user.uid, idToken);
+                const backendUser = yield this.getOrCreateUserInBackend(user, idToken);
                 if (backendUser) {
                     const syncedBackendUser = yield this.ensureBackendVerification(user, backendUser, idToken);
-                    // Use the new helper method
                     return this._createSuccessAuthResult(user, syncedBackendUser, AuthProvider.GOOGLE, idToken);
                 }
                 else {
@@ -580,5 +578,19 @@ class FirebaseService {
             }
         });
     }
+    getOrCreateUserInBackend(user, idToken) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            // Try to get existing user from backend
+            const existingUser = yield this.getUserFromBackend(user.uid, idToken);
+            if (existingUser) {
+                return existingUser;
+            }
+            // User doesn't exist, create them (first-time social sign-in)
+            const username = ((_a = user.email) === null || _a === void 0 ? void 0 : _a.split('@')[0])
+                || `user_${user.uid.substring(0, 8)}`;
+            return this.createUserInBackend(user.uid, username, idToken);
+        });
+    }
 }
 exports.FirebaseService = FirebaseService;

package/dist/errors.d.ts

@@ -0,0 +1,39 @@
+/**
+ * Validation error codes returned by the backend API.
+ * These correspond to the ValidationError enum in the Kotlin backend.
+ */
+export type ValidationError = 'USER_HAS_ACTIVE_ORDERS_AS_CREATOR' | 'USER_HAS_TOO_MANY_PENDING_ORDERS' | 'ORDER_AMOUNT_TOO_LOW' | 'ORDER_AMOUNT_TOO_HIGH' | 'USER_HAS_ACTIVE_ORDERS' | 'ORDER_NOT_FOUND' | 'ORDER_CANCELLATION_NOT_ALLOWED' | 'INVALID_REQUEST';
+/**
+ * Structure of the error response from the backend API.
+ */
+export interface ApiErrorResponse {
+    message: string;
+    code?: number;
+    error?: ValidationError;
+}
+/**
+ * Type guard to check if an error response has a validation error.
+ */
+export declare function hasValidationError(error: ApiErrorResponse): error is ApiErrorResponse & {
+    error: ValidationError;
+};
+/**
+ * Parses an error (typically from an axios request) into a typed ApiErrorResponse.
+ * This is a non-breaking helper that works with existing error handling code.
+ *
+ * @param error - The error to parse (usually from a catch block)
+ * @returns ApiErrorResponse with extracted message, code, and error type
+ *
+ * @example
+ * ```typescript
+ * try {
+ *     await client.createOrder(order, headers);
+ * } catch (err) {
+ *     const apiError = parseApiError(err);
+ *     if (apiError.error === 'ORDER_AMOUNT_TOO_LOW') {
+ *         // Show specific message for this error
+ *     }
+ * }
+ * ```
+ */
+export declare function parseApiError(error: unknown): ApiErrorResponse;

package/dist/errors.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseApiError = exports.hasValidationError = void 0;
+/**
+ * Type guard to check if an error response has a validation error.
+ */
+function hasValidationError(error) {
+    return error.error !== undefined;
+}
+exports.hasValidationError = hasValidationError;
+/**
+ * Parses an error (typically from an axios request) into a typed ApiErrorResponse.
+ * This is a non-breaking helper that works with existing error handling code.
+ *
+ * @param error - The error to parse (usually from a catch block)
+ * @returns ApiErrorResponse with extracted message, code, and error type
+ *
+ * @example
+ * ```typescript
+ * try {
+ *     await client.createOrder(order, headers);
+ * } catch (err) {
+ *     const apiError = parseApiError(err);
+ *     if (apiError.error === 'ORDER_AMOUNT_TOO_LOW') {
+ *         // Show specific message for this error
+ *     }
+ * }
+ * ```
+ */
+function parseApiError(error) {
+    var _a;
+    // Handle axios errors with response data
+    if (isAxiosError(error) && ((_a = error.response) === null || _a === void 0 ? void 0 : _a.data)) {
+        const data = error.response.data;
+        return {
+            message: data.message || error.message,
+            code: data.code,
+            error: data.error
+        };
+    }
+    // Handle standard Error objects
+    if (error instanceof Error) {
+        return { message: error.message };
+    }
+    // Handle string errors
+    if (typeof error === 'string') {
+        return { message: error };
+    }
+    // Fallback for unknown error types
+    return { message: 'An unexpected error occurred' };
+}
+exports.parseApiError = parseApiError;
+/**
+ * Type guard to check if an error is an AxiosError.
+ */
+function isAxiosError(error) {
+    return (error !== null &&
+        typeof error === 'object' &&
+        'isAxiosError' in error &&
+        error.isAxiosError === true);
+}

package/dist/index.d.ts

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

package/dist/index.js

@@ -23,6 +23,7 @@ Object.defineProperty(exports, "P2PMarketplaceAPIClient", { enumerable: true, ge
 var cryptoUtils_1 = require("./cryptoUtils");
 Object.defineProperty(exports, "generateSecretAndHash", { enumerable: true, get: function () { return cryptoUtils_1.generateSecretAndHash; } });
 __exportStar(require("./types"), exports);
+__exportStar(require("./errors"), exports);
 var FirebaseLoginService_1 = require("./auth/FirebaseLoginService");
 Object.defineProperty(exports, "FirebaseService", { enumerable: true, get: function () { return FirebaseLoginService_1.FirebaseService; } });
 Object.defineProperty(exports, "AuthProvider", { enumerable: true, get: function () { return FirebaseLoginService_1.AuthProvider; } });

package/package.json

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

package/src/P2PMarketplaceAPIClient.ts

@@ -59,6 +59,11 @@ class P2PMarketplaceAPIClient {
             }
             return response;
         }, async (error: AxiosError) => {
+            // Transform error response data to camelCase for consistency
+            if (error.response?.data) {
+                error.response.data = toCamelCase(error.response.data);
+            }
+
             const { response, config } = error;
             if (!this.authTokenProvider || response?.status !== 401 || !config) {
                 return Promise.reject(error);
@@ -128,24 +133,14 @@ class P2PMarketplaceAPIClient {
 
     async get<T>(url: string, headers?: Record<string, string>): Promise<T> {
         const config = this.createConfig(headers);
-        try {
-            const response = await this.client.get<T>(url, config);
-            return response.data;
-        } catch (error) {
-            console.error(`GET request to ${url} failed:`, error);
-            throw error;
-        }
+        const response = await this.client.get<T>(url, config);
+        return response.data;
     }
 
     async post<T>(url: string, data: any, headers?: Record<string, string>): Promise<T> {
         const config = this.createConfig(headers);
-        try {
-            const response = await this.client.post<T>(url, data, config);
-            return response.data;
-        } catch (error) {
-            console.error(`POST request to ${url} failed:`, error);
-            throw error;
-        }
+        const response = await this.client.post<T>(url, data, config);
+        return response.data;
     }
 
     public async getOrders(props: GetOrdersParams, headers?: Record<string, string>): Promise<OrderResponse> {
@@ -273,12 +268,7 @@ class P2PMarketplaceAPIClient {
         };
 
         const url = "api/orders/release"
-        try {
-            return await this.post<string>(url, body, headers);
-        } catch (error) {
-            console.error("Error releasing funds:", error);
-            throw new Error("Failed to release funds");
-        }
+        return await this.post<string>(url, body, headers);
     }
 
     public async getTransactionStatus(txHash: string, headers?: Record<string, string>): Promise<TransactionStatusResponse> {
@@ -298,12 +288,7 @@ class P2PMarketplaceAPIClient {
     public async cancelOrder(orderId: string, headers?: Record<string, string>): Promise<void> {
         const url = `/api/orders/${orderId}`;
         const config = this.createConfig(headers);
-        try {
-            await this.client.delete(url, config);
-        } catch (error) {
-            console.error(`DELETE request to ${url} failed:`, error);
-            throw error;
-        }
+        await this.client.delete(url, config);
     }
 
     // OpsLog
@@ -346,13 +331,8 @@ class P2PMarketplaceAPIClient {
     public async clearSession(headers?: Record<string, string>): Promise<{ success: boolean }> {
         const url = '/api/session';
         const config = this.createConfig(headers);
-        try {
-            const response = await this.client.delete<{ success: boolean }>(url, config);
-            return response.data;
-        } catch (error) {
-            console.error(`DELETE request to ${url} failed:`, error);
-            throw error;
-        }
+        const response = await this.client.delete<{ success: boolean }>(url, config);
+        return response.data;
     }
 
 }

package/src/auth/FirebaseLoginService.ts

@@ -420,11 +420,9 @@ export class FirebaseService implements LoginService {
             const user = userCredential.user;
             const idToken = await user.getIdToken();
 
-            // Get or create user in your Kotlin backend
-            const backendUser = await this.getUserFromBackend(user.uid, idToken);
+            const backendUser = await this.getOrCreateUserInBackend(user, idToken);
             if (backendUser) {
                 const syncedBackendUser = await this.ensureBackendVerification(user, backendUser, idToken);
-                // Use the new helper method
                 return this._createSuccessAuthResult(user, syncedBackendUser, AuthProvider.GOOGLE, idToken);
             } else {
                 return AuthResult.failure('Failed to get or create user in backend');
@@ -663,4 +661,21 @@ export class FirebaseService implements LoginService {
             return null;
         }
     }
+
+    private async getOrCreateUserInBackend(
+        user: User,
+        idToken: string
+    ): Promise<KioscoinUser | null> {
+        // Try to get existing user from backend
+        const existingUser = await this.getUserFromBackend(user.uid, idToken);
+        if (existingUser) {
+            return existingUser;
+        }
+
+        // User doesn't exist, create them (first-time social sign-in)
+        const username = user.email?.split('@')[0]
+            || `user_${user.uid.substring(0, 8)}`;
+
+        return this.createUserInBackend(user.uid, username, idToken);
+    }
 }

package/src/errors.ts

@@ -0,0 +1,91 @@
+import { AxiosError } from 'axios';
+
+/**
+ * Validation error codes returned by the backend API.
+ * These correspond to the ValidationError enum in the Kotlin backend.
+ */
+export type ValidationError =
+    // Order creation errors
+    | 'USER_HAS_ACTIVE_ORDERS_AS_CREATOR'
+    | 'USER_HAS_TOO_MANY_PENDING_ORDERS'
+    | 'ORDER_AMOUNT_TOO_LOW'
+    | 'ORDER_AMOUNT_TOO_HIGH'
+    // Order taking errors
+    | 'USER_HAS_ACTIVE_ORDERS'
+    // Order cancellation errors
+    | 'ORDER_NOT_FOUND'
+    | 'ORDER_CANCELLATION_NOT_ALLOWED'
+    // Generic
+    | 'INVALID_REQUEST';
+
+/**
+ * Structure of the error response from the backend API.
+ */
+export interface ApiErrorResponse {
+    message: string;
+    code?: number;
+    error?: ValidationError;
+}
+
+/**
+ * Type guard to check if an error response has a validation error.
+ */
+export function hasValidationError(error: ApiErrorResponse): error is ApiErrorResponse & { error: ValidationError } {
+    return error.error !== undefined;
+}
+
+/**
+ * Parses an error (typically from an axios request) into a typed ApiErrorResponse.
+ * This is a non-breaking helper that works with existing error handling code.
+ * 
+ * @param error - The error to parse (usually from a catch block)
+ * @returns ApiErrorResponse with extracted message, code, and error type
+ * 
+ * @example
+ * ```typescript
+ * try {
+ *     await client.createOrder(order, headers);
+ * } catch (err) {
+ *     const apiError = parseApiError(err);
+ *     if (apiError.error === 'ORDER_AMOUNT_TOO_LOW') {
+ *         // Show specific message for this error
+ *     }
+ * }
+ * ```
+ */
+export function parseApiError(error: unknown): ApiErrorResponse {
+    // Handle axios errors with response data
+    if (isAxiosError(error) && error.response?.data) {
+        const data = error.response.data as ApiErrorResponse;
+        return {
+            message: data.message || error.message,
+            code: data.code,
+            error: data.error
+        };
+    }
+
+    // Handle standard Error objects
+    if (error instanceof Error) {
+        return { message: error.message };
+    }
+
+    // Handle string errors
+    if (typeof error === 'string') {
+        return { message: error };
+    }
+
+    // Fallback for unknown error types
+    return { message: 'An unexpected error occurred' };
+}
+
+/**
+ * Type guard to check if an error is an AxiosError.
+ */
+function isAxiosError(error: unknown): error is AxiosError {
+    return (
+        error !== null &&
+        typeof error === 'object' &&
+        'isAxiosError' in error &&
+        (error as AxiosError).isAxiosError === true
+    );
+}

package/src/index.ts

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