Version 4.10.1-v2-20.3.01 release (#230)

Co-authored-by: DevCenter-DocuSign <[email protected]>

Author: dbbrahmbhatt

CHANGELOG.md

@@ -1,6 +1,12 @@
 # DocuSign Node Client Changelog
 
 See [DocuSign Support Center](https://support.docusign.com/en/releasenotes/) for Product Release Notes.
+## [v4.10.1] - eSignature API v2-20.3.01
+### Fixed 
+- DCM-3866, Added support for updateBrandResourcesByContentType function to take in file to upload.
+- DCM-3369, Updated ApiClient to use an empty JSON object if the body is null.
+- DCM-4614, Fixed out of memory issue when deserializing large files.
+
 ## [v4.10.0] - eSignature API v2-20.3.00
 ### Changed
 - Added support for version v2-20.3.00 of the DocuSign eSignature API.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "docusign-esign",
-  "version": "4.10.0",
+  "version": "4.10.1",
   "description": "DocuSign Node.js API client.",
   "license": "MIT",
   "main": "src/index.js",

src/ApiClient.js

@@ -445,13 +445,22 @@
     // Rely on SuperAgent for parsing response body.
     // See http://visionmedia.github.io/superagent/#parsing-response-bodies
     var data = response.body || (response.res && response.res.data);
-    if (data == null || !Object.keys(data).length) {
+    if (data == null || (typeof data === 'object' && typeof data.length === 'undefined' && !Object.keys(data).length)) {
       // SuperAgent does not always produce a body; use the unparsed response as a fallback
       data = response.text;
     }
     return exports.convertToType(data, returnType);
   };
 
+  exports.prototype.hasBufferFormParam = function(formParams) {
+    if (!formParams) {
+      return false;
+    }
+    return Object.keys(formParams).some(function(key) {
+      return formParams[key] instanceof Buffer;
+    });
+  };
+
   /**
    * (Optional)Callback function to receive the result of the <operationId> operation. If none specified a Promise will be returned.
    * @callback module:ApiClient~callApiCallback
@@ -484,7 +493,8 @@
     var _this = this;
     var url = this.buildUrl(path, pathParams);
     var request = superagent(httpMethod, url);
-
+    var _formParams = this.normalizeParams(formParams);
+    var body = bodyParam || {};
     // apply authentications
     this.applyAuthToRequest(request, authNames);
 
@@ -513,19 +523,32 @@
     if (contentType === 'application/x-www-form-urlencoded') {
       request.send(this.normalizeParams(formParams));
     } else if (contentType == 'multipart/form-data') {
-      var _formParams = this.normalizeParams(formParams);
-      for (var key in _formParams) {
-        if (_formParams.hasOwnProperty(key)) {
-          if (this.isFileParam(_formParams[key])) {
-            // file field
-            request.attach(key, _formParams[key]);
-          } else {
-            request.field(key, _formParams[key]);
+      if (this.hasBufferFormParam(_formParams)) {
+        var formAttachmentKey = Object.keys(formParams).find(function(key) {
+          return _this.isFileParam(_formParams[key]);
+        });
+        request.set({
+          'Content-Disposition': 'form-data; name="file"; filename="file.xml"'
+        });
+        request.set({
+          'Content-Type': 'application/octet-stream'
+        });
+        request.send(removeNulls(formParams[formAttachmentKey]));
+      } else {
+        var _formParams = this.normalizeParams(formParams);
+        for (var key in _formParams) {
+          if (_formParams.hasOwnProperty(key)) {
+            if (this.isFileParam(_formParams[key])) {
+              // file field
+              request.attach(key, _formParams[key]);
+            } else {
+              request.field(key, _formParams[key]);
+            }
           }
         }
       }
-    } else if (bodyParam) {
-      request.send(removeNulls(bodyParam));
+    } else if (body) {
+      request.send(removeNulls(body));
     }
 
     var accept = this.jsonPreferredMime(accepts);
@@ -556,7 +579,6 @@
       })
     }
 
-
     var data = null;
     if (!callback) {
       return new Promise(function(resolve, reject){
@@ -791,7 +813,6 @@
           });
         });
       } catch (err) {
-        console.log(err)
         throw(err)
       }
     } else {
@@ -911,4 +932,4 @@
 }));
 
 module.exports.OAuth = require('./OAuth');
-module.exports.RestApi = require('./RestApi');
+module.exports.RestApi = require('./RestApi');

src/api/AccountsApi.js

@@ -182,7 +182,7 @@ A 201 code is returned if the call succeeded.  While the call may have succeed,
 An error is returned if `brandId` property for a brand profile is already set for the account. To upload a new version of an existing brand profile, you must delete the profile and then upload the newer version.
 
 When brand profile files are being uploaded, they must be combined into one zip file and the `Content-Type` must be `application/zip`.
-     * @param {String} accountId The external account number (int) or account ID Guid.
+     * @param {String} accountId The external account number (int) or account id GUID.
      * @param {Object} optsOrCallback Optional parameters, if you are passing no optional parameters, you can either pass a null or omit this parameter entirely.
      * @param {module:model/Brand} optsOrCallback.brand 
      * @param {module:api/AccountsApi~createBrandCallback} callback The callback function, accepting three arguments: error, data, response
@@ -2624,13 +2624,14 @@ Users with account administration privileges can retrieve shared access informat
 
     /**
      * Uploads a branding resource file.
-     * @param {String} accountId The external account number (int) or account ID Guid.
+     * @param {String} accountId The external account number (int) or account id GUID.
      * @param {String} brandId The unique identifier of a brand.
      * @param {String} resourceContentType 
+     * @param {Object} fileXml Brand resource XML file.
      * @param {module:api/AccountsApi~updateBrandResourcesByContentTypeCallback} callback The callback function, accepting three arguments: error, data, response
      * data is of type: {@link module:model/BrandResources}
      */
-    this.updateBrandResourcesByContentType = function(accountId, brandId, resourceContentType, callback) {
+    this.updateBrandResourcesByContentType = function(accountId, brandId, resourceContentType, fileXml, callback) {
       var postBody = null;
 
       // verify the required parameter 'accountId' is set
@@ -2648,6 +2649,11 @@ Users with account administration privileges can retrieve shared access informat
         throw new Error("Missing the required parameter 'resourceContentType' when calling updateBrandResourcesByContentType");
       }
 
+      // verify the required parameter 'fileXml' is set
+      if (fileXml === undefined || fileXml === null) {
+        throw new Error("Missing the required parameter 'fileXml' when calling updateBrandResourcesByContentType");
+      }
+
       if (typeof callback !== 'function' &&  arguments.length && typeof arguments[arguments.length-1] === 'function'){
         if (typeof optsOrCallback !== 'undefined') {
           optsOrCallback = callback;
@@ -2665,10 +2671,11 @@ Users with account administration privileges can retrieve shared access informat
       var headerParams = {
       };
       var formParams = {
+        'file.xml': fileXml
       };
 
       var authNames = ['docusignAccessCode'];
-      var contentTypes = [];
+      var contentTypes = ['multipart/form-data'];
       var accepts = ['application/json'];
       var returnType = BrandResources;
 

test/SdkUnitTests.js

@@ -11,7 +11,7 @@ var assert = require('assert');
 var path = require('path');
 var superagent = require('superagent');
 var csvStringify = require('csv-stringify');
-
+var brandXmlPath = 'docs/brand.xml';
 var Buffer = global.Buffer.from ? global.Buffer : require('safe-buffer').Buffer;
 var fs = require('fs');
 
@@ -28,6 +28,7 @@ var basePath = restApi.BasePath.DEMO;
 var oAuthBasePath = oAuth.BasePath.DEMO;
 
 var SignTest1File = 'docs/SignTest1.pdf';
+var LargeTestDocument1 = 'docs/LargeTestDocument1.pdf';
 var brandLogoPath = 'img/docusign-lgo.png';
 var accountId = '';
 var envelopeId = '';
@@ -678,7 +679,7 @@ describe('SDK Unit Tests:', function (done) {
     try {
       var fs = require('fs');
       // read file from a local directory
-      fileBytes = fs.readFileSync(path.resolve(__dirname, SignTest1File));
+      fileBytes = fs.readFileSync(path.resolve(__dirname, LargeTestDocument1));
     } catch (ex) {
       // handle error
       console.log('Exception: ' + ex);
@@ -1132,4 +1133,113 @@ describe('SDK Unit Tests:', function (done) {
         }
       });
   });
+
+  it('it updateBrandResourcesByContentType', function (done) {
+    var accountsApi = new docusign.AccountsApi(apiClient);
+    accountsApi.listBrands(accountId, { includeLogos: true })
+      .then(function (brandsData) {
+        var currentBrand = brandsData.brands[0];
+        var brandXmlBuffer = fs.readFileSync(path.resolve(__dirname, brandXmlPath));
+        accountsApi.updateBrandResourcesByContentType(accountId, currentBrand.brandId, 'email', brandXmlBuffer)
+          .then(function (data) {
+            assert.notEqual(data.createdByUserInfo, undefined);
+            assert.notEqual(data.resourcesContentUri, undefined);
+            return done();
+          })
+          .catch(function (error) {
+            return done(error);
+          });
+      })
+      .catch(function (error) {
+        return done(error);
+      });
+  });
+
+  it('resend envelope with envelope update', function (done) {
+    var fileBytes = null;
+    try {
+      var fs = require('fs');
+      // read file from a local directory
+      fileBytes = fs.readFileSync(path.resolve(__dirname, SignTest1File));
+    } catch (ex) {
+      // handle error
+      console.log('Exception: ' + ex);
+    }
+
+    // create an envelope to be signed
+    var envDef = new docusign.EnvelopeDefinition();
+    envDef.emailSubject = 'Please Sign my Node SDK Envelope';
+    envDef.emailBlurb = 'Hello, Please sign my Node SDK Envelope.';
+
+    // add a document to the envelope
+    var doc = new docusign.Document();
+    var base64Doc = Buffer.from(fileBytes).toString('base64');
+    doc.documentBase64 = base64Doc;
+    doc.name = 'TestFile.pdf';
+    doc.documentId = '1';
+
+    var docs = [];
+    docs.push(doc);
+    envDef.documents = docs;
+
+    // Add a recipient to sign the document
+    var signer = new docusign.Signer();
+    signer.email = userName;
+    var name = 'Pat Developer';
+    signer.name = name;
+    signer.recipientId = '1';
+
+    // this value represents the client's unique identifier for the signer
+    var clientUserId = '2939';
+    signer.clientUserId = clientUserId;
+
+    // create a signHere tab somewhere on the document for the signer to sign
+    // default unit of measurement is pixels, can be mms, cms, inches also
+    var signHere = new docusign.SignHere();
+    signHere.documentId = '1';
+    signHere.pageNumber = '1';
+    signHere.recipientId = '1';
+    signHere.xPosition = '100';
+    signHere.yPosition = '100';
+
+    // can have multiple tabs, so need to add to envelope as a single element list
+    var signHereTabs = [];
+    signHereTabs.push(signHere);
+    var tabs = new docusign.Tabs();
+    tabs.signHereTabs = signHereTabs;
+    signer.tabs = tabs;
+
+    // Above causes issue
+    envDef.recipients = new docusign.Recipients();
+    envDef.recipients.signers = [];
+    envDef.recipients.signers.push(signer);
+
+    // send the envelope (otherwise it will be "created" in the Draft folder
+    envDef.status = 'sent';
+
+    var envelopesApi = new docusign.EnvelopesApi(apiClient);
+
+    envelopesApi.createEnvelope(accountId, { envelopeDefinition: envDef })
+      .then(function (envelopeSummary) {
+        if (envelopeSummary) {
+          envelopesApi.update(accountId, envelopeSummary.envelopeId, { resendEnvelope: true })
+            .then(function (envelopeUpdateSummary) {
+              if (envelopeUpdateSummary) {
+                console.log('envelopeUpdateSummary: ' + JSON.stringify(envelopeUpdateSummary));
+                done();
+              }
+            })
+            .catch(function (error) {
+              if (error) {
+                return done(error);
+              }
+            });
+        }
+      })
+      .catch(function (error) {
+        if (error) {
+          return done(error);
+        }
+      });
+  });
 });