Merge pull request #224 from docusign/feature/delete-restore-envelope

Separate moveEnvelope into different methods

Author: balaji1103

lib/eSignature/controllers/eg045DeleteRestoreEnvelope.js

@@ -5,7 +5,7 @@
  */
 
 const path = require('path');
-const { moveEnvelope, getFolders } = require('../examples/deleteRestoreEnvelope');
+const { deleteEnvelope, moveEnvelopeToFolder, getFolders } = require('../examples/deleteRestoreEnvelope');
 const { getExampleByNumber } = require('../../manifestService');
 const dsConfig = require('../../../config/index.js').config;
 const { API_TYPES, formatString } = require('../../utils.js');
@@ -43,12 +43,12 @@ eg045DeleteRestoreEnvelope.deleteController = async (req, res) => {
         basePath: req.session.basePath,
         accountId: req.session.accountId,
         envelopeId: req.body.envelopeId,
-        folderId: deleteFolderId,
+        deleteFolderId: deleteFolderId,
     };
     let results = null;
 
     try {
-        results = await moveEnvelope(args);
+        results = await deleteEnvelope(args);
     } catch (error) {
         const errorBody = error?.body || error?.response?.body;
         // we can pull the DocuSign error code and message from the response body
@@ -116,7 +116,7 @@ eg045DeleteRestoreEnvelope.restoreController = async (req, res) => {
 
         }
 
-        results = await moveEnvelope({ ...args, folderId });
+        results = await moveEnvelopeToFolder({ ...args, folderId });
     } catch (error) {
         const errorBody = error?.body || error?.response?.body;
         // we can pull the DocuSign error code and message from the response body

lib/eSignature/examples/deleteRestoreEnvelope.js

@@ -9,7 +9,7 @@ const docusign = require('docusign-esign');
 /**
  * Moves the envelope to a specified folder
  */
-const moveEnvelope = async (args) => {
+const deleteEnvelope = async (args) => {
   //ds-snippet-start:eSign45Step2
   const dsApiClient = new docusign.ApiClient();
   dsApiClient.setBasePath(args.basePath);
@@ -18,20 +18,32 @@ const moveEnvelope = async (args) => {
   //ds-snippet-end:eSign45Step2
 
   //ds-snippet-start:eSign45Step3
-  const fromFolderId = args.fromFolderId;
   const foldersRequest = docusign.FoldersRequest.constructFromObject({
     envelopeIds: [args.envelopeId],
-
-    // add fromFolderId parameter if its value is provided
-    ...(fromFolderId && { fromFolderId }),
   });
   //ds-snippet-end:eSign45Step3
 
   //ds-snippet-start:eSign45Step4
-  return await foldersApi.moveEnvelopes(args.accountId, args.folderId, { foldersRequest });
+  return await foldersApi.moveEnvelopes(args.accountId, args.deleteFolderId, { foldersRequest });
   //ds-snippet-end:eSign45Step4
 };
 
+const moveEnvelopeToFolder = async (args) => {
+  const dsApiClient = new docusign.ApiClient();
+  dsApiClient.setBasePath(args.basePath);
+  dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
+  const foldersApi = new docusign.FoldersApi(dsApiClient);
+
+  //ds-snippet-start:eSign45Step6
+  const foldersRequest = docusign.FoldersRequest.constructFromObject({
+    envelopeIds: [args.envelopeId],
+    fromFolderId: args.fromFolderId,
+  });
+
+  return await foldersApi.moveEnvelopes(args.accountId, args.folderId, { foldersRequest });
+  //ds-snippet-end:eSign45Step6
+};
+
 /**
  * Retrieves the list of folders
  */
@@ -46,4 +58,4 @@ const getFolders = async (args) => {
   //ds-snippet-end:eSign45Step5
 };
 
-module.exports = { moveEnvelope, getFolders };
+module.exports = { deleteEnvelope, moveEnvelopeToFolder, getFolders };