@duvdu-v1/duvdu 1.1.266 → 1.1.268

package/build/services/paymob.service.d.ts

@@ -192,7 +192,11 @@ export declare class PaymobService {
     handleWebhookQuery(queryParams: Record<string, string>): WebhookResult<WebhookQueryTransactionData>;
     getTransactionStatus(transactionId: number): Promise<TransactionStatusResult>;
     /**
-     * Get order details including metadata
+     * Authenticate with Paymob to get Bearer token
+     */
+    private authenticate;
+    /**
+     * Get order details including metadata using the correct Paymob API
      */
     getOrderDetails(orderId: number): Promise<OrderDetailsResult>;
     /**

package/build/services/paymob.service.js

@@ -117,15 +117,17 @@ class PaymobService {
      * @returns The payment URL and related data
      */
     createPaymentUrlWithUserData(amount, userId, contractId, userData, serviceType) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             // Create metadata with custom data
-            const extras = {
+            const customData = {
                 contractId,
                 userId,
                 service_type: serviceType,
                 booking_id: 'BOOK_' + Date.now(),
                 timestamp: new Date().toISOString(),
             };
+            const extras = customData;
             const billingData = {
                 first_name: userData.firstName,
                 last_name: userData.lastName,
@@ -146,8 +148,39 @@ class PaymobService {
                     quantity: 1,
                 },
             ];
-            const result = yield this.createPaymentIntention(amount, billingData, items, 'EGP', extras);
-            return { paymentUrl: result.paymentUrl };
+            // For Flash Integration, we need to create a modified intention request
+            // that includes merchant_order_id
+            const intentionData = {
+                amount,
+                currency: 'EGP',
+                payment_methods: [this.integrationId, 'card'],
+                items,
+                billing_data: billingData,
+                customer: {
+                    first_name: billingData.first_name,
+                    last_name: billingData.last_name,
+                    email: billingData.email,
+                    extras: extras || {},
+                },
+                extras: extras || {},
+                merchant_order_id: JSON.stringify(customData), // Store custom data here
+            };
+            try {
+                const response = yield axios_1.default.post(`${this.baseUrl}/v1/intention/`, intentionData, {
+                    headers: {
+                        'Authorization': `Token ${this.secretKey}`,
+                        'Content-Type': 'application/json',
+                    },
+                });
+                // Create the payment URL for Flash Checkout
+                const paymentUrl = `${this.baseUrl}/unifiedcheckout/?publicKey=${this.publicKey}&clientSecret=${response.data.client_secret}`;
+                return { paymentUrl };
+            }
+            catch (error) {
+                const axiosError = error;
+                console.log('PayMob intention error:', (_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.data);
+                throw new Error(`Failed to create Paymob payment intention: ${axiosError.message}`);
+            }
         });
     }
     verifyPayment(hmac, data) {
@@ -293,28 +326,74 @@ class PaymobService {
         });
     }
     /**
-     * Get order details including metadata
+     * Authenticate with Paymob to get Bearer token
+     */
+    authenticate() {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const response = yield axios_1.default.post(`${this.baseUrl}/api/auth/tokens`, {
+                    api_key: this.secretKey,
+                }, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                    },
+                });
+                return response.data.token;
+            }
+            catch (error) {
+                const axiosError = error;
+                console.error('Authentication error:', (_a = axiosError.response) === null || _a === void 0 ? void 0 : _a.data);
+                throw new Error(`Failed to authenticate with Paymob: ${axiosError.message}`);
+            }
+        });
+    }
+    /**
+     * Get order details including metadata using the correct Paymob API
      */
     getOrderDetails(orderId) {
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const response = yield axios_1.default.get(`${this.baseUrl}/api/ecommerce/orders/${orderId}`, {
+                // Step 1: Authenticate to get Bearer token
+                const authToken = yield this.authenticate();
+                // Step 2: Get transaction details using the order inquiry endpoint
+                const response = yield axios_1.default.post(`${this.baseUrl}/api/ecommerce/orders/transaction_inquiry`, {
+                    order_id: orderId.toString(),
+                }, {
                     headers: {
                         'Content-Type': 'application/json',
-                        'Authorization': `Token ${this.secretKey}`,
+                        'Authorization': `Bearer ${authToken}`,
                     },
                 });
+                // The response might contain transaction data, we need to extract order info
+                const transactionData = response.data;
                 return {
-                    id: response.data.id,
-                    amount_cents: response.data.amount_cents,
-                    currency: response.data.currency,
-                    items: response.data.items || [],
-                    created_at: response.data.created_at,
-                    merchant_order_id: response.data.merchant_order_id,
+                    id: orderId,
+                    amount_cents: transactionData.amount_cents || 0,
+                    currency: transactionData.currency || 'EGP',
+                    items: ((_a = transactionData.order) === null || _a === void 0 ? void 0 : _a.items) || [],
+                    created_at: transactionData.created_at || new Date().toISOString(),
+                    merchant_order_id: ((_b = transactionData.order) === null || _b === void 0 ? void 0 : _b.merchant_order_id) || '',
                 };
             }
             catch (error) {
                 const axiosError = error;
+                console.error('Order details error response:', (_c = axiosError.response) === null || _c === void 0 ? void 0 : _c.data);
+                console.error('Order details error status:', (_d = axiosError.response) === null || _d === void 0 ? void 0 : _d.status);
+                // If still failing, provide a fallback that returns minimal data
+                if (((_e = axiosError.response) === null || _e === void 0 ? void 0 : _e.status) === 401 || ((_f = axiosError.response) === null || _f === void 0 ? void 0 : _f.status) === 403) {
+                    console.log('Authentication failed, using fallback approach...');
+                    // Return a minimal response that won't break the webhook
+                    return {
+                        id: orderId,
+                        amount_cents: 0,
+                        currency: 'EGP',
+                        items: [],
+                        created_at: new Date().toISOString(),
+                        merchant_order_id: '', // Empty merchant_order_id will trigger fallback logic
+                    };
+                }
                 throw new Error(`Failed to get order details: ${axiosError.message}`);
             }
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duvdu-v1/duvdu",
-  "version": "1.1.266",
+  "version": "1.1.268",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",
   "files": [