Merge pull request #4 from 2Checkout/CC-211

remove sandbox and depreciated functions

Author: andrei-popa88

.gitignore

@@ -4,3 +4,4 @@
 *.swp
 *.out
 *.idea/*
+node_modules/

README.md

@@ -24,9 +24,7 @@ var tco = new Twocheckout({
     apiPass: "APIpass1817037",                              // Admin API Password, required for Admin API bindings
     sellerId: "1817037",                                    // Seller ID, required for all non Admin API bindings 
     privateKey: "3508079E-5383-44D4-BF69-DC619C0D9811",     // Payment API private key, required for checkout.authorize binding
-    secretWord: "tango",                                    // Secret Word, required for response and notification checks
-    demo: true,                                             // Set to true if testing response with demo sales
-    sandbox: false                                          // Uses 2Checkout sandbox URL for all bindings
+    secretWord: "tango"                                    // Secret Word, required for response and notification checks
 });
 ```
 

lib/2checkout.js

@@ -1,13 +1,11 @@
-var sales = require("./2checkout/sales"),
-    products = require("./2checkout/products"),
-    productOptions = require("./2checkout/productOptions"),
-    coupons = require("./2checkout/coupons"),
-    account = require("./2checkout/account"),
-    payments = require("./2checkout/payments"),
-    response = require("./2checkout/response"),
-    notification = require("./2checkout/notification"),
-    checkout = require("./2checkout/checkout");
-    TwocheckoutError = require("./2checkout/error");
+var sales = require('./2checkout/sales'),
+    products = require('./2checkout/products'),
+    account = require('./2checkout/account'),
+    payments = require('./2checkout/payments'),
+    response = require('./2checkout/response'),
+    notification = require('./2checkout/notification'),
+    checkout = require('./2checkout/checkout');
+TwocheckoutError = require('./2checkout/error');
 
 var Twocheckout = module.exports = function (options) {
     // Setup Options
@@ -29,17 +27,11 @@ var Twocheckout = module.exports = function (options) {
     if (typeof options.demo !== 'undefined') {
         this.demo = options.demo;
     }
-    if (typeof options.sandbox !== 'undefined' && options.sandbox === true) {
-        this.domain = 'https://sandbox.2checkout.com';
-    } else {
-        this.domain = 'https://www.2checkout.com';
-    }
+    this.domain = 'https://www.2checkout.com';
 
     // Setup Methods
     this.sales = new sales(this);
     this.products = new products(this);
-    this.productOptions = new productOptions(this);
-    this.coupons = new coupons(this);
     this.account = new account(this);
     this.payments = new payments(this);
     this.response = new response(this);

lib/2checkout/coupons.js

@@ -48,18 +48,10 @@ sales.prototype.comment = function (args, callback) {
     return utils.execute(this.options, callback);
 };
 
-sales.prototype.reauth = function (args, callback) {
-    this.options.type = "admin";
-    this.options.path = "/api/sales/reauth";
-    this.options.method = "POST";
-    this.options.payload = args;
-    return utils.execute(this.options, callback);
-};
-
 sales.prototype.stop = function (args, callback) {
     this.options.type = "admin";
     this.options.path = "/api/sales/stop_lineitem_recurring";
     this.options.method = "POST";
     this.options.payload = args;
     return utils.execute(this.options, callback);
-};
+};

lib/2checkout/productOptions.js

@@ -1,60 +1,47 @@
-var request = require('request');
-var TwocheckoutError = require("./error");
-
+var TwocheckoutError = require('./error');
+const got = require('got');
 exports.execute = function (args, callback) {
-    options = {
-        uri: args.domain + args.path,
+    var options = {
         method: args.method,
-        headers: { "Accept" : "application/json" },
-        timeout: 30000
+        responseType: 'json',
+        prefixUrl: 'https://www.2checkout.com',
     };
 
     if (args.type === "admin") {
-        options.auth = {
-            user: args.apiUser,
-            pass: args.apiPass,
-            sendImmediately: true
-        };
+        options.username = args.apiUser;
+        options.password = args.apiPass;
 
         if(args.method === "POST") {
             options.form = args.payload;
         } else {
-            options.qs = args.payload;
+            options.searchParams = args.payload;
         }
     } else {
         args.payload.privateKey = args.privateKey;
         args.payload.sellerId = args.sellerId;
         options.body = JSON.stringify(args.payload);
     }
 
-    request(options, function (error, response, body) {
-        var parsedResponse;
-        if (error) {
-            callback(new TwocheckoutError('500', 'Unable to connect to 2Checkout API'));
-        } else {
-
-            try {
-                parsedResponse = JSON.parse(body);
-            } catch (e) {
-                callback(new TwocheckoutError('500', 'Error parsing JSON response from 2Checkout API.'));
-                return;
-            }
-
-            if (args.type === "admin") {
-                if (parsedResponse.errors) {
-                    callback(new TwocheckoutError(parsedResponse.errors[0].code, parsedResponse.errors[0].message));
-                    return;
+    let path = (args.path.charAt(0) === '/') ? args.path.substr(1) : args.path;
+    (async () => {
+        try {
+            const response = await got(path, options);
+            callback(null, response.body);
+        } catch (error) {
+            const parsedResponse = typeof error.response !== 'undefined' ? error.response.body : null;
+            if (parsedResponse) {
+                if (args.type === "admin") {
+                    if (parsedResponse.errors) {
+                        callback(new TwocheckoutError(parsedResponse.errors[0].code, parsedResponse.errors[0].message));
+                    }
+                } else {
+                    if (parsedResponse.exception) {
+                        callback(new TwocheckoutError(parsedResponse.exception.errorCode, parsedResponse.exception.errorMsg));
+                    }
                 }
             } else {
-                if (parsedResponse.exception) {
-                    callback(new TwocheckoutError(parsedResponse.exception.errorCode, parsedResponse.exception.errorMsg));
-                    return;
-                }
+                callback(new TwocheckoutError('500', 'Error parsing JSON response from 2Checkout API.'));
             }
-
-            callback(null, parsedResponse);
-
         }
-
-    });
+    })();
 };

lib/2checkout/sales.js

@@ -1,20 +1,19 @@
 {
     "name": "2checkout-node",
-    "version": "1.0.0",
+    "version": "2.0.0",
     "description": "A node.js wrapper for the 2Checkout Payment API.",
-    "author": "Craig Christenson <christensoncraig@gmail.com>",
     "main": "lib/2checkout.js",
     "repository": {
         "type": "git",
         "url": "http://github.com/2Checkout/2checkout-node.git"
     },
     "engines": {
-        "node": ">= v0.8.0"
+        "node": ">=10.19.0"
     },
     "devDependencies": {
-        "mocha": "~1.13.0"
+        "mocha": "^1.13.0"
     },
     "dependencies": {
-        "request": "2.x.x"
+        "got": "11.*"
     }
 }

lib/2checkout/utils.js

@@ -6,12 +6,12 @@ describe('checkout', function(){
         it('should return a success or unauthorized response', function(done){
             tco.checkout.authorize(authorize, function (error, data) {
                 if (error) {
-                    assert.equal("Error: Unauthorized", error);
+                    return assert.equal("Unauthorized", error.message);
                 } else {
-                    assert.equal("APPROVED", data.response.responseCode);
+                    return assert.equal("APPROVED", data.response.responseCode);
                 }
                 done();
             });
         });
     });
-});
+});