quickpos 1.0.914 → 1.0.916

package/lib/paytr.js

@@ -1,26 +1,39 @@
 const crypto = require('crypto');
-const jsSHA = require('jssha');
 const axios = require('axios');
 
 class PayTR {
   constructor(config) {
     this.config = config || {};
+    
     const requiredFields = ['merchantId', 'merchantKey', 'merchantSalt'];
     for (let field of requiredFields) {
-      if (!config[field]) throw new Error(`Missing required field: ${field}`);
+      if (!this.config[field]) throw new Error(`Missing required field: ${field}`);
     }
 
-    this.merchantId = config.merchantId;
-    this.merchantKey = config.merchantKey;
-    this.merchantSalt = config.merchantSalt;
-    this.debug_on = String(config?.debug_on) || '0';
+    this.merchantId = this.config.merchantId;
+    this.merchantKey = this.config.merchantKey;
+    this.merchantSalt = this.config.merchantSalt;
+    this.testMode = this.config.testMode ? '1' : '0';
+    this.debugOn = this.config.debugOn ? '1' : '0';
+
+    this.iframe = {
+      createToken: this.createIframeToken.bind(this)
+    };
+
+    this.direct = {
+      createPayment: this.createDirectPayment.bind(this)
+    };
+
+    this.link = {
+      createPayment: this.createLinkPayment.bind(this)
+    };
   }
 
-  async createPayment(paymentDetails) {
+  async createLinkPayment(paymentDetails) {
     try {
-      let requiredData = ['name', 'amount', 'currency', 'maxInstallment', 'expiry_date'];
-      for (let data of requiredData) {
-        if (!paymentDetails[data]) throw new Error(`Missing required data: ${data}`);
+      const requiredFields = ['name', 'amount', 'currency', 'maxInstallment', 'expiry_date'];
+      for (let field of requiredFields) {
+        if (!paymentDetails[field]) throw new Error(`Missing required data: ${field}`);
       }
       
       const price = Math.round(paymentDetails.amount * 100).toString();
@@ -42,14 +55,16 @@ class PayTR {
         lang: lang,
         min_count: minCount,
         paytr_token: paytrToken,
-        expiry_date: paymentDetails?.expiry_date,
+        expiry_date: paymentDetails.expiry_date,
         get_qr: '1',
-        max_count: Number(paymentDetails?.max_count) || '1',
-        debug_on: this.debug_on
+        max_count: Number(paymentDetails.max_count) || '1',
+        debug_on: this.debugOn
       };
 
-      let optionalData = ['email', 'callback_link', 'callback_id'];
-      for (let data of optionalData) { formData[data] = paymentDetails[data]; }
+      const optionalData = ['email', 'callback_link', 'callback_id'];
+      for (let data of optionalData) { 
+        if(paymentDetails[data]) formData[data] = paymentDetails[data]; 
+      }
 
       const response = await axios({
         method: 'POST',
@@ -77,42 +92,179 @@ class PayTR {
       }
     } catch (error) {
       if (error.response) {
-        // The request was made and the server responded with a status code
-        // that falls out of the range of 2xx
         throw new Error(`PayTR API error: ${error.response.data.reason || error.response.statusText}`);
-      } else if (error.request) {
-        // The request was made but no response was received
-        throw new Error('No response received from PayTR API');
+      }
+      throw error;
+    }
+  }
+
+  async createDirectPayment(params) {
+    try {
+      const userBasket = JSON.stringify(params.userBasket);
+      const userIp = params.userIp;
+      const merchantOid = params.merchantOid;
+      const email = params.email;
+      const paymentAmount = params.paymentAmount.toString();
+      const currency = params.currency || 'TL';
+      const installmentCount = params.installmentCount || '0';
+      const paymentType = 'card';
+      const non3D = params.non3D ? params.non3D : '0'; 
+
+      const rawString = `${this.merchantId}${userIp}${merchantOid}${email}${paymentAmount}${paymentType}${installmentCount}${currency}${this.testMode}${non3D}`;
+      const paytrToken = this.generateToken(rawString);
+
+      const formData = new URLSearchParams();
+      formData.append('merchant_id', this.merchantId);
+      formData.append('user_ip', userIp);
+      formData.append('merchant_oid', merchantOid);
+      formData.append('email', email);
+      formData.append('payment_amount', paymentAmount);
+      formData.append('paytr_token', paytrToken);
+      formData.append('user_basket', userBasket);
+      formData.append('debug_on', this.debugOn);
+      formData.append('test_mode', this.testMode);
+      formData.append('payment_type', paymentType);
+      formData.append('installment_count', installmentCount);
+      formData.append('currency', currency);
+      formData.append('non_3d', non3D);
+      formData.append('cc_owner', params.cardOwner);
+      formData.append('card_number', params.cardNumber);
+      formData.append('expiry_month', params.cardExpireMonth);
+      formData.append('expiry_year', params.cardExpireYear);
+      formData.append('cvc', params.cardCvc);
+      formData.append('user_name', params.userName);
+      formData.append('user_address', params.userAddress);
+      formData.append('user_phone', params.userPhone);
+      formData.append('merchant_ok_url', params.merchantOkUrl);
+      formData.append('merchant_fail_url', params.merchantFailUrl);
+
+      const response = await axios({
+        method: 'POST',
+        url: 'https://www.paytr.com/odeme/api/direct',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        data: formData
+      });
+
+      const result = response.data;
+
+      if (result.status === 'success') {
+        return result; 
       } else {
-        // Something happened in setting up the request that triggered an Error
-        throw new Error(`Error in PayTR payment creation: ${error.message}`);
+        throw new Error(result.reason || 'PayTR Direct API Hatası');
       }
+    } catch (error) {
+       if (error.response) throw new Error(`PayTR API Error: ${error.response.data.reason || error.response.statusText}`);
+      throw error;
     }
   }
 
-  async handleCallback(callbackData) {
+  async createIframeToken(params) {
     try {
-      const token = callbackData.callback_id + callbackData.merchant_oid + this.merchantSalt + callbackData.status + callbackData.total_amount;
+      const userBasket = JSON.stringify(params.userBasket);
+      const userIp = params.userIp;
+      const merchantOid = params.merchantOid;
+      const email = params.email;
+      const paymentAmount = params.paymentAmount.toString();
+      const currency = params.currency || 'TL';
+      const noInstallment = params.noInstallment ? '1' : '0';
+      const maxInstallment = params.maxInstallment || '0';
+      const paymentType = params.paymentType || 'card';
 
-      let paytrToken = this.hashCheck(token, callbackData.hash);
-      if (!paytrToken) {
-        throw new Error("PAYTR notification failed: bad hash");
+      let rawString;
+      
+      // DÜZELTME BURADA YAPILDI:
+      if (paymentType === 'eft') {
+        // Python örneğindeki EFT Hash yapısı:
+        // merchant_id + user_ip + merchant_oid + email + payment_amount + payment_type + test_mode
+        rawString = `${this.merchantId}${userIp}${merchantOid}${email}${paymentAmount}${paymentType}${this.testMode}`;
+      } else {
+        // Standart Kredi Kartı Hash yapısı:
+        // merchant_id + user_ip + merchant_oid + email + payment_amount + user_basket + no_installment + max_installment + currency + test_mode
+        rawString = `${this.merchantId}${userIp}${merchantOid}${email}${paymentAmount}${userBasket}${noInstallment}${maxInstallment}${currency}${this.testMode}`;
       }
 
-      if (callbackData.status === 'success') {
-        return {
-          status: 'success',
-          orderId: callbackData.callback_id,
-          merchant_oid: callbackData.merchant_oid,
-          amount: parseFloat(callbackData.total_amount) / 100,
-          currency: callbackData.currency,
-          paymentType: callbackData.payment_type
-        };
+      // generateToken fonksiyonu sonuna merchantSalt ekleyip şifreler
+      const paytrToken = this.generateToken(rawString);
+
+      const formData = new URLSearchParams();
+      formData.append('merchant_id', this.merchantId);
+      formData.append('user_ip', userIp);
+      formData.append('merchant_oid', merchantOid);
+      formData.append('email', email);
+      formData.append('payment_amount', paymentAmount);
+      formData.append('paytr_token', paytrToken);
+      formData.append('debug_on', this.debugOn);
+      formData.append('test_mode', this.testMode);
+      formData.append('payment_type', paymentType);
+      
+      // timeout_limit parametresi (Python kodunda vardı, ekleyelim)
+      formData.append('timeout_limit', params.timeoutLimit || '30');
+
+      // EFT değilse diğer parametreleri de ekleyelim
+      if (paymentType !== 'eft') {
+        formData.append('user_basket', userBasket);
+        formData.append('no_installment', noInstallment);
+        formData.append('max_installment', maxInstallment);
+        formData.append('user_name', params.userName);
+        formData.append('user_address', params.userAddress);
+        formData.append('user_phone', params.userPhone);
+        formData.append('merchant_ok_url', params.merchantOkUrl);
+        formData.append('merchant_fail_url', params.merchantFailUrl);
+        formData.append('currency', currency);
+        if (params.lang) formData.append('lang', params.lang);
       } else {
-        throw new Error("Payment failed");
+        // EFT ise banka parametresi varsa ekle
+        if (params.bank) formData.append('bank', params.bank);
       }
+
+      const response = await axios({
+        method: 'POST',
+        url: 'https://www.paytr.com/odeme/api/get-token',
+        headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+        data: formData
+      });
+
+      const result = response.data;
+      if (result.status === 'success') {
+        return { status: 'success', token: result.token };
+      } else {
+        // Hata detayını daha net görelim
+        throw new Error(result.reason || 'PayTR Token alma hatası');
+      }
+
     } catch (error) {
-      throw new Error(`Error in PayTR callback handling: ${error.message}`);
+      if (error.response) throw new Error(`PayTR API Error: ${error.response.data.reason || error.response.statusText}`);
+      throw error;
+    }
+  }
+
+  handleCallback(callbackData) {
+    const { merchant_oid, status, total_amount, hash } = callbackData;
+    
+    if (!hash) throw new Error('Hash param missing');
+
+    const token = `${merchant_oid}${this.merchantSalt}${status}${total_amount}`;
+    
+    const generatedHash = crypto
+      .createHmac('sha256', this.merchantKey)
+      .update(token)
+      .digest('base64');
+
+    if (generatedHash !== hash) {
+      throw new Error("PAYTR notification failed: bad hash");
+    }
+
+    if (status === 'success') {
+      return {
+        status: 'success',
+        orderId: callbackData.callback_id || merchant_oid,
+        merchant_oid: merchant_oid,
+        amount: parseFloat(total_amount) / 100,
+        currency: callbackData.currency,
+        paymentType: callbackData.payment_type
+      };
+    } else {
+      throw new Error("Payment failed");
     }
   }
 
@@ -121,14 +273,6 @@ class PayTR {
       .update(data + this.merchantSalt)
       .digest('base64');
   }
-
-  hashCheck(data, key) {
-    let shaObj = new jsSHA("SHA-256", "TEXT");
-    shaObj.setHMACKey(this.merchantKey, "TEXT");
-    shaObj.update(data);
-    if (shaObj.getHMAC("B64") === key) return true;
-    else return false;
-  }
 }
 
 module.exports = PayTR;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "quickpos",
-  "version": "1.0.914",
+  "version": "1.0.916",
   "main": "app.js",
   "scripts": {
     "test": "node test.js"

package/lib/paytr_eft.js

@@ -1,156 +0,0 @@
-const crypto = require('crypto');
-const axios = require('axios');
-
-class PayTR {
-  /**
-   * PayTR Kurucu Metodu
-   * @param {Object} config - Yapılandırma ayarları
-   * @param {string} config.merchantId - Mağaza No
-   * @param {string} config.merchantKey - Mağaza Parola
-   * @param {string} config.merchantSalt - Mağaza Gizli Anahtar
-   * @param {boolean} [config.testMode=false] - Test modu (true/false)
-   * @param {boolean} [config.debugOn=false] - Hata ayıklama modu
-   */
-  constructor(config) {
-    this.config = config || {};
-    
-    // Zorunlu alan kontrolü
-    const requiredFields = ['merchantId', 'merchantKey', 'merchantSalt'];
-    for (let field of requiredFields) {
-      if (!this.config[field]) throw new Error(`Missing required field: ${field}`);
-    }
-
-    this.merchantId = this.config.merchantId;
-    this.merchantKey = this.config.merchantKey;
-    this.merchantSalt = this.config.merchantSalt;
-    this.testMode = this.config.testMode ? '1' : '0';
-    this.debugOn = this.config.debugOn ? '1' : '0';
-
-    // iframe namespace'i tanımlama (örnekteki kullanıma uygun olması için)
-    this.iframe = {
-      createToken: this.createIframeToken.bind(this)
-    };
-  }
-
-  /**
-   * iFrame Token Oluşturma (EFT ve Kredi Kartı için)
-   * @param {Object} params - Ödeme parametreleri
-   */
-  async createIframeToken(params) {
-    try {
-      const userBasket = JSON.stringify(params.userBasket);
-      const userIp = params.userIp;
-      const merchantOid = params.merchantOid;
-      const email = params.email;
-      const paymentAmount = params.paymentAmount.toString(); // Kuruş cinsinden (Örn: 10.00 TL -> 1000)
-      const currency = params.currency || 'TL';
-      const noInstallment = params.noInstallment ? '1' : '0';
-      const maxInstallment = params.maxInstallment || '0';
-      const paymentType = params.paymentType || 'card'; // 'eft' veya 'card'
-
-      // PayTR Token Oluşturma Sırası (Dökümantasyona Göre)
-      // merchant_id + user_ip + merchant_oid + email + payment_amount + user_basket + no_installment + max_installment + currency + test_mode
-      const rawString = `${this.merchantId}${userIp}${merchantOid}${email}${paymentAmount}${userBasket}${noInstallment}${maxInstallment}${currency}${this.testMode}`;
-      
-      const paytrToken = this.generateToken(rawString);
-
-      // API'ye gönderilecek veri
-      const formData = new URLSearchParams();
-      formData.append('merchant_id', this.merchantId);
-      formData.append('user_ip', userIp);
-      formData.append('merchant_oid', merchantOid);
-      formData.append('email', email);
-      formData.append('payment_amount', paymentAmount);
-      formData.append('paytr_token', paytrToken);
-      formData.append('user_basket', userBasket);
-      formData.append('debug_on', this.debugOn);
-      formData.append('no_installment', noInstallment);
-      formData.append('max_installment', maxInstallment);
-      formData.append('user_name', params.userName);
-      formData.append('user_address', params.userAddress);
-      formData.append('user_phone', params.userPhone);
-      formData.append('merchant_ok_url', params.merchantOkUrl);
-      formData.append('merchant_fail_url', params.merchantFailUrl);
-      formData.append('timeout_limit', params.timeoutLimit || '30');
-      formData.append('currency', currency);
-      formData.append('test_mode', this.testMode);
-      formData.append('payment_type', paymentType); // 'eft' gönderimi için kritik
-
-      // Opsiyonel banka seçimi (Sadece payment_type='eft' ise işe yarar)
-      if (params.bank) {
-        formData.append('bank', params.bank);
-      }
-      
-      // Opsiyonel: Lang
-      if (params.lang) {
-        formData.append('lang', params.lang);
-      }
-
-      const response = await axios({
-        method: 'POST',
-        url: 'https://www.paytr.com/odeme/api/get-token',
-        headers: {
-          'Content-Type': 'application/x-www-form-urlencoded'
-        },
-        data: formData
-      });
-
-      const result = response.data;
-
-      if (result.status === 'success') {
-        return {
-          status: 'success',
-          token: result.token
-        };
-      } else {
-        throw new Error(result.reason || 'PayTR Token alma hatası');
-      }
-
-    } catch (error) {
-      if (error.response) {
-        throw new Error(`PayTR API Error: ${error.response.data.reason || error.response.statusText}`);
-      }
-      throw error;
-    }
-  }
-
-  /**
-   * Callback (Bildirim) Doğrulama
-   * PayTR'den gelen POST isteğinin hash'ini doğrular.
-   * @param {Object} reqBody - Express/Http request body
-   */
-  validateCallback(reqBody) {
-    const { merchant_oid, status, total_amount, hash } = reqBody;
-    
-    // Hash Oluşturma Sırası:
-    // merchant_oid + merchant_salt + status + total_amount
-    const rawString = `${merchant_oid}${this.merchantSalt}${status}${total_amount}`;
-    const generatedHash = this.generateToken(rawString);
-
-    if (hash === generatedHash) {
-      return {
-        success: true,
-        merchantOid: merchant_oid,
-        status: status,
-        totalAmount: total_amount
-      };
-    } else {
-      return {
-        success: false,
-        error: 'Hash mismatch'
-      };
-    }
-  }
-
-  /**
-   * Helper: HMAC-SHA256 Token Üretici
-   */
-  generateToken(data) {
-    return crypto
-      .createHmac('sha256', this.merchantKey)
-      .update(data + this.merchantSalt)
-      .digest('base64');
-  }
-}
-
-module.exports = PayTR;