Merge pull request #60 from CyberSource/merger

Merged Authentication SDK into Client SDK

Author: snavinch

generator/cybersource-javascript-template/ApiClient.mustache

@@ -2,18 +2,18 @@
 (function(root, factory) {
   if (typeof define === 'function' && define.amd) {
     // AMD. Register as an anonymous module.
-    define(['superagent', 'superagent-proxy', 'querystring'], factory);
+    define(['superagent', 'superagent-proxy', 'querystring', 'Authentication/MerchantConfig', 'Authentication/Logger', 'Authentication/Constants', 'Authentication/Authorization', 'Authentication/PayloadDigest'], factory);
   } else if (typeof module === 'object' && module.exports) {
     // CommonJS-like environments that support module.exports, like Node.
-    module.exports = factory(require('superagent'), require('superagent-proxy'), require('querystring'));
+    module.exports = factory(require('superagent'), require('superagent-proxy'), require('querystring'), require('./authentication/core/MerchantConfig'), require('./authentication/logging/Logger'), require('./authentication/util/Constants'), require('./authentication/core/Authorization'), require('./authentication/payloadDigest/DigestGenerator'));
   } else {
     // Browser globals (root is window)
     if (!root.{{moduleName}}) {
       root.{{moduleName}} = {};
     }
-    root.{{moduleName}}.ApiClient = factory(root.superagent, root.superagent_proxy, root.querystring);
+    root.{{moduleName}}.ApiClient = factory(root.superagent, root.superagent_proxy, root.querystring, root.Authentication.MerchantConfig, root.Authentication.Logger, root.Authentication.Constants, root.Authentication.Authorization, root.Authentication.PayloadDigest);
   }
-}(this, function(superagent, superagent_proxy, querystring) {
+}(this, function(superagent, superagent_proxy, querystring, MerchantConfig, Logger, Constants, Authorization, PayloadDigest) {
   'use strict';
 
 {{#emitJSDoc}}  /**
@@ -354,18 +354,17 @@
 
     // Code added by Infosys dev team
 
-  var AuthenticationSDK = require('cybersource-rest-auth');
   /**
    * This method will set the merchantConfig object global
    * 
    * @param {Configuration} configObject merchantConfiguration properties.
    */
   exports.prototype.setConfiguration = function (configObject) {
 
-    this.merchantConfig = new AuthenticationSDK.MerchantConfig(configObject);
-    this.constants = AuthenticationSDK.Constants;
+    this.merchantConfig = new MerchantConfig(configObject);
+    this.constants = Constants;
     this.basePath = this.constants.HTTP_URL_PREFIX + this.merchantConfig.getRequestHost();
-    this.logger = AuthenticationSDK.Logger.getLogger(this.merchantConfig, 'ApiClient');
+    this.logger = Logger.getLogger(this.merchantConfig, 'ApiClient');
   }
 
   /**
@@ -384,7 +383,7 @@
     this.logger.info('Authentication Type : ' + this.merchantConfig.getAuthenticationType());
     this.logger.info(this.constants.REQUEST_TYPE + ' : ' + httpMethod.toUpperCase());
 
-    var token = AuthenticationSDK.Authorization.getToken(this.merchantConfig, this.logger);
+    var token = Authorization.getToken(this.merchantConfig, this.logger);
 
     var clientId = getClientId();
 
@@ -405,7 +404,7 @@
       if (httpMethod.toLowerCase() === this.constants.POST
         || httpMethod.toLowerCase() === this.constants.PATCH
         || httpMethod.toLowerCase() === this.constants.PUT) {
-        var digest = AuthenticationSDK.PayloadDigest.generateDigest(this.merchantConfig, this.logger);
+        var digest = PayloadDigest.generateDigest(this.merchantConfig, this.logger);
         digest = this.constants.SIGNATURE_ALGORITHAM + digest;
         this.logger.info(this.constants.DIGEST + " : " + digest);
         headerParams['digest'] = digest;

generator/cybersource-javascript-template/index.mustache

@@ -60,6 +60,11 @@
   };
 
   exports.TokenVerification = require('./utilities/flex/TokenVerification.js');
+  exports.Authorization = require('./authentication/core/Authorization.js'),
+  exports.MerchantConfig = require('./authentication/core/MerchantConfig.js'),
+  exports.Logger = require('./authentication/logging/Logger.js'),
+  exports.Constants = require('./authentication/util/Constants.js'),
+  exports.PayloadDigest = require('./authentication/payloadDigest/DigestGenerator.js')
 
   return exports;<={{ }}=>
 }));

package.json

@@ -2,6 +2,7 @@
   "name": "cybersource-rest-client",
   "version": "0.0.26",
   "description": "Node.js SDK for the CyberSource REST API",
+  "author": "[email protected]",
   "license": "CyberSource",
   "main": "src/index.js",
   "scripts": {
@@ -13,10 +14,25 @@
   "dependencies": {
     "superagent": "3.8.3",
     "superagent-proxy": "^2.0.0",
-    "cybersource-rest-auth": "0.0.10"
+    "app-root-path": "^2.1.0",
+    "chai": "^4.1.2",
+    "chai-as-promised": "^7.1.1",
+    "collections": "^5.1.2",
+    "jwt-simple": "^0.5.1",
+    "memory-cache": "^0.2.0",
+    "node-forge": "^0.10.0",
+    "promise": "^8.0.1",
+    "winston": "^3.3.3",
+    "winston-daily-rotate-file": "^4.5.1"
   },
+  "keywords": [
+    "nodeJS"
+  ],
   "devDependencies": {
-    "mocha": "~5.2.0",
+    "mocha": "^5.2.0",
+    "mocha-sonarqube-reporter": "^1.0.1",
+    "nyc": "^12.0.2",
+    "sonar-scanner": "^3.1.0",
     "@sinonjs/formatio": "3.0.0",
     "expect.js": "~0.3.1"
   }

src/authentication/core/Authorization.js

@@ -0,0 +1,29 @@
+'use strict';
+
+var Constants = require('../util/Constants');
+var HttpSingToken = require('../http/HTTPSigToken');
+var JWTSigToken = require('../jwt/JWTSigToken');
+var ApiException = require('../util/ApiException');
+
+/**
+ * This function calls for the generation of Signature message depending on the authentication type.
+ * 
+ */
+exports.getToken = function(merchantConfig, logger){
+
+    var authenticationType = merchantConfig.getAuthenticationType().toLowerCase();
+    var httpSigToken;
+    var jwtSingToken;
+
+    if(authenticationType === Constants.HTTP) {
+        httpSigToken = HttpSingToken.getToken(merchantConfig, logger);
+        return httpSigToken;
+    }
+    else if(authenticationType === Constants.JWT) {
+        jwtSingToken = JWTSigToken.getToken(merchantConfig, logger);
+        return jwtSingToken;
+    }
+    else{
+        ApiException.ApiException(Constants.AUTH_ERROR, logger);
+    }
+}