refactoring

Author: LarryKlugerDS

lib/DSAuthCodeGrant.js

@@ -14,7 +14,6 @@
 'use strict';
 
 const moment = require('moment')
-    , docusign = require('docusign-esign')
     , dsConfig = require('../ds_configuration.js').config
     , passport = require('passport')
     , baseUriSuffix = '/restapi'
@@ -35,22 +34,8 @@ let DSAuthCodeGrant = function _DSAuthCodeGrant(req) {
   // For production use, you'd want to store the refresh token in non-volatile storage since it is 
   // good for 30 days. You'd probably want to encrypt it too.
   this._tokenExpiration = req.user && req.user.tokenExpirationTimestamp;  // when does the token expire?
-  this._accountId = req.session && req.session.accountId; // current account
-  this._accountName = req.session && req.session.accountName; // current account's name
-  this._basePath = req.session && req.session.basePath; // current base path. eg https://na2.docusign.net/restapi
-  this._dsApiClient = null; // the docusign sdk instance
-  this._dsConfig = null;
   this._debug = true;  // ### DEBUG ### setting
 
-  // INITIALIZE
-  this._dsApiClient = new docusign.ApiClient();
-  if (this._basePath) {
-    this._dsApiClient.setBasePath(this._basePath);
-  }
-  if (this._accessToken) {
-    this._dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + this._accessToken);
-  }
-
 } // end of DSAuthCodeGrant constructor function
 
 // Public constants
@@ -82,12 +67,11 @@ DSAuthCodeGrant.prototype.oauth_callback1 = (req, res, next) => {
     passport.authenticate('docusign', { failureRedirect: '/ds/login' })(req, res, next)
 }
 DSAuthCodeGrant.prototype.oauth_callback2 = function _oauth_callback2(req, res, next) {
-    //console.log(`Received access_token: ${req.user.accessToken.substring(0,15)}...`);
+    this._accessToken = req.user.accessToken;
     console.log(`Received access_token: |${req.user.accessToken}|`);
     console.log(`Expires at ${req.user.tokenExpirationTimestamp.format("dddd, MMMM Do YYYY, h:mm:ss a")}`);
     req.flash('info', 'You have authenticated with DocuSign.');
-    this._dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + req.user.accessToken);
-  
+
     // The DocuSign Passport strategy looks up the user's account information via OAuth::userInfo.
     // See https://developers.docusign.com/esign-rest-api/guides/authentication/user-info-endpoints
     // The data includes the user's information and information on the accounts the user has access too.
@@ -171,12 +155,7 @@ DSAuthCodeGrant.prototype.logoutCallback = function _logout (req, res) {
  * @function
  */
 DSAuthCodeGrant.prototype.internalLogout = function _internalLogout(req, res) {
-  this._accessToken = null;
-  this._refreshToken = null;
   this._tokenExpiration = null;
-  this._accountId = null;
-  this._accountName = null;
-  this._basePath = null;
   req.session.accountId = null;
   req.session.accountName = null;
   req.session.basePath = null;
@@ -202,20 +181,14 @@ DSAuthCodeGrant.prototype.getDefaultAccountInfo = function _getDefaultAccountInf
             throw new Error(this.Error_account_not_found)
         }
     } else {
-        account = accounts.find(a => a.is_default);        
+        account = accounts.find(a => a.is_default);
     }
 
     // Save the account information
-    this._accountId = account.account_id;
-    this._accountName = account.account_name;
-    this._basePath = account.base_uri + baseUriSuffix;
-
-    req.session.accountId = this._accountId;
-    req.session.accountName = this._accountName;
-    req.session.basePath = this._basePath;
-
-    this._dsApiClient.setBasePath(this._basePath);
-    console.log(`Using account ${this._accountId}: ${this._accountName}`);
+    req.session.accountId = account.account_id;
+    req.session.accountName = account.account_name;
+    req.session.basePath = account.base_uri + baseUriSuffix;
+    console.log(`Using account ${account.account_id}: ${account.account_name}`);
 }
 
 /**
@@ -255,41 +228,6 @@ DSAuthCodeGrant.prototype.setEg = function _setEg(req, eg) {
   req.session.eg = eg
 }
 
-/**
- * Getter for the object's <tt>dsApiClient</tt>
- * @function
- * @returns {DSApiClient} dsApiClient
- */
-DSAuthCodeGrant.prototype.getDSApi = function(){return this._dsApiClient};
-
-/**
- * Getter for the object's <tt>accessToken</tt>
- * First check its validity via checkToken
- * @function
- * @returns {BearerToken} accessToken
- */
-DSAuthCodeGrant.prototype.getAccessToken = function(){return this._accessToken};
-
-/**
- * Getter for the <tt>accountId</tt>
- * @function
- * @returns {string} accountId
- */
-DSAuthCodeGrant.prototype.getAccountId   = function(){return this._accountId};
-
-/**
- * Getter for the <tt>accountName</tt>
- * @function
- * @returns {string} accountName
- */
-DSAuthCodeGrant.prototype.getAccountName = function(){return this._accountName};
-
-/**
- * Getter for the <tt>baseUri</tt>
- * @function
- * @returns {string} baseUri
-*/
-DSAuthCodeGrant.prototype.getBasePath    = function(){return this._basePath};
 
 /**
  * If in debug mode, prints message to the console

lib/examples/eg003ListEnvelopes.js

@@ -62,7 +62,7 @@ eg003ListEnvelopes.createController = async (req, res) => {
     if (results) {
         res.render('pages/example_done', {
             title: "List envelopes results",
-            h1: "List envelopes results",
+            h1: "Envelopes updated",
             message: `Results from the Envelopes::listStatusChanges method:`,
             json: JSON.stringify(results)
         });

lib/examples/eg005EnvelopeRecipients.js

@@ -49,12 +49,11 @@ eg005EnvelopeRecipients.createController = async (req, res) => {
     }
 
     // Step 2. Call the worker method
-    let accountId = req.dsAuthCodeGrant.getAccountId()
-      , dsAPIclient = req.dsAuthCodeGrant.getDSApi()
-      , args = {
-          dsAPIclient: dsAPIclient,
-          accountId: accountId,
-          envelopeId: req.session.envelopeId
+    let args = {
+            accessToken: req.user.accessToken,
+            basePath: req.session.basePath,
+            accountId: req.session.accountId,
+            envelopeId: req.session.envelopeId
         }
       , results = null
       ;

lib/examples/eg006EnvelopeDocs.js

@@ -107,13 +107,14 @@ eg006EnvelopeDocs.createController = async (req, res) => {
  */
 // ***DS.worker.start ***DS.snippet.1.start
 eg006EnvelopeDocs.worker = async (args) => {
-    let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
-      , results = null
-      ;
+    let dsApiClient = new docusign.ApiClient();
+    dsApiClient.setBasePath(args.basePath);
+    dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
+    let envelopesApi = new docusign.EnvelopesApi(dsApiClient);
 
     // Step 1. EnvelopeDocuments::list.
     // Exceptions will be caught by the calling function
-    results = await envelopesApi.listDocuments(args.accountId, args.envelopeId, null);
+    let results = await envelopesApi.listDocuments(args.accountId, args.envelopeId, null);
     return results;
 }
 // ***DS.worker.end ***DS.snippet.1.end

lib/examples/eg010SendBinaryDocs.js

@@ -54,11 +54,10 @@ eg010SendBinaryDocs.createController = async (req, res) => {
             signerName: signerName, 
             ccEmail: ccEmail, 
             ccName: ccName }
-      , accountId = req.dsAuthCodeGrant.getAccountId()
       , args = {
-            basePath: basePath = req.dsAuthCodeGrant.getBasePath(),
-            accessToken: req.dsAuthCodeGrant.getAccessToken(),
-            accountId: accountId,
+            accessToken: req.user.accessToken,
+            basePath: req.session.basePath,
+            accountId: req.session.accountId,
             envelopeArgs: envelopeArgs,
             demoDocsPath: demoDocsPath, 
             doc2File: doc2File,

lib/examples/eg012EmbeddedConsole.js

@@ -90,7 +90,7 @@ eg012EmbeddedConsole.worker = async (args) => {
     let dsApiClient = new docusign.ApiClient();
     dsApiClient.setBasePath(args.basePath);
     dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
-    let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient);
+    let envelopesApi = new docusign.EnvelopesApi(dsApiClient);
 
     // Step 1. create the NDSE view
     let viewRequest = makeConsoleViewRequest(args);

lib/examples/eg014CollectPayment.js

@@ -103,16 +103,17 @@ eg014CollectPayment.createController = async (req, res) => {
  */
 // ***DS.worker.start ***DS.snippet.1.start
 eg014CollectPayment.worker = async (args) => {
-    let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
-      , results = null
-      ;
+    let dsApiClient = new docusign.ApiClient();
+    dsApiClient.setBasePath(args.basePath);
+    dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
+    let envelopesApi = new docusign.EnvelopesApi(dsApiClient);
 
     // Step 1. Make the envelope request body
     let envelope = makeEnvelope(args.envelopeArgs)
 
     // Step 2. call Envelopes::create API method
     // Exceptions will be caught by the calling function
-    results = await envelopesApi.createEnvelope(
+    let results = await envelopesApi.createEnvelope(
         args.accountId, {envelopeDefinition: envelope});
     let envelopeId = results.envelopeId;
     return ({envelopeId: envelopeId})

views/pages/examples/eg003ListEnvelopes.ejs

@@ -1,7 +1,7 @@
 <% include ../../partials/head %>
 
-<h4>3. List envelopes in the user's account</h4>
-<p>List the envelopes created in the last 30 days.</p>
+<h4>3. List updated envelopes in the user's account</h4>
+<p>List the envelopes whose status has changed in the last 30 days.</p>
 <p>This example demonstrates how to query DocuSign about envelopes sent by the current user.</p>
 
 <% if (showDoc) { %>