Skip to content

Commit be39713

Browse files
LarryKlugerDSLarryKlugerDS
committed
refactor to create dsAPIClient in worker functions
1 parent 5dcfeac commit be39713

13 files changed

+103
-104
lines changed

‎lib/examples/eg001EmbeddedSigning.js‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,10 @@ eg001EmbeddedSigning.createController = async (req, res) => {
5656
dsReturnUrl: dsReturnUrl,
5757
dsPingUrl: dsPingUrl
5858
}
59-
, accountId = req.dsAuthCodeGrant.getAccountId()
60-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
6159
, args = {
62-
dsAPIclient: dsAPIclient,
63-
accountId: accountId,
60+
accessToken: req.user.accessToken,
61+
basePath: req.session.basePath,
62+
accountId: req.session.accountId,
6463
envelopeArgs: envelopeArgs
6564
}
6665
, results = null
@@ -92,17 +91,15 @@ eg001EmbeddedSigning.createController = async (req, res) => {
9291
/**
9392
* This function does the work of creating the envelope and the
9493
* embedded Signing Ceremony
95-
* @param {object} args An object with the following elements: <br/>
96-
* <tt>dsAPIclient</tt>: The DocuSign API Client object, already set with an access token and base url <br/>
97-
* <tt>accountId</tt>: Current account Id <br/>
98-
* <tt>envelopeArgs</tt>: envelopeArgs, an object with elements
99-
* <tt>signerEmail</tt>, <tt>signerName</tt>, <tt>signerClientId</tt>
94+
* @param {object} args
10095
*/
10196
// ***DS.worker.start ***DS.snippet.1.start
10297
eg001EmbeddedSigning.worker = async (args) => {
103-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
104-
, results = null
105-
;
98+
let dsApiClient = new docusign.ApiClient();
99+
dsApiClient.setBasePath(args.basePath);
100+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
101+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient)
102+
, results = null;
106103

107104
// Step 1. Make the envelope request body
108105
let envelope = makeEnvelope(args.envelopeArgs)

‎lib/examples/eg002SigningViaEmail.js‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,10 @@ eg002SigningViaEmail.createController = async (req, res) => {
5757
ccEmail: ccEmail,
5858
ccName: ccName,
5959
status: "sent" }
60-
, accountId = req.dsAuthCodeGrant.getAccountId()
61-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
6260
, args = {
63-
dsAPIclient: dsAPIclient,
64-
accountId: accountId,
61+
accessToken: req.user.accessToken,
62+
basePath: req.session.basePath,
63+
accountId: req.session.accountId,
6564
envelopeArgs: envelopeArgs
6665
}
6766
, results = null
@@ -102,9 +101,11 @@ eg002SigningViaEmail.createController = async (req, res) => {
102101
*/
103102
// ***DS.worker.start ***DS.snippet.1.start
104103
eg002SigningViaEmail.worker = async (args) => {
105-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
106-
, results = null
107-
;
104+
let dsApiClient = new docusign.ApiClient();
105+
dsApiClient.setBasePath(args.basePath);
106+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
107+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient)
108+
, results = null;
108109

109110
// Step 1. Make the envelope request body
110111
let envelope = makeEnvelope(args.envelopeArgs)

‎lib/examples/eg003ListEnvelopes.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,10 @@ eg003ListEnvelopes.createController = async (req, res) => {
3838
}
3939

4040
// Step 2. Call the worker method
41-
let accountId = req.dsAuthCodeGrant.getAccountId()
42-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
43-
, args = {
44-
dsAPIclient: dsAPIclient,
45-
accountId: accountId,
41+
let args = {
42+
accessToken: req.user.accessToken,
43+
basePath: req.session.basePath,
44+
accountId: req.session.accountId,
4645
}
4746
, results = null
4847
;
@@ -78,9 +77,11 @@ eg003ListEnvelopes.createController = async (req, res) => {
7877
*/
7978
// ***DS.worker.start ***DS.snippet.1.start
8079
eg003ListEnvelopes.worker = async (args) => {
81-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
82-
, results = null
83-
;
80+
let dsApiClient = new docusign.ApiClient();
81+
dsApiClient.setBasePath(args.basePath);
82+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
83+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient)
84+
, results = null;
8485

8586
// Step 1. List the envelopes
8687
// The Envelopes::listStatusChanges method has many options

‎lib/examples/eg004EnvelopeInfo.js‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,11 @@ eg004EnvelopeInfo.createController = async (req, res) => {
4949
}
5050

5151
// Step 2. Call the worker method
52-
let accountId = req.dsAuthCodeGrant.getAccountId()
53-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
54-
, args = {
55-
dsAPIclient: dsAPIclient,
56-
accountId: accountId,
57-
envelopeId: req.session.envelopeId
52+
let args = {
53+
accessToken: req.user.accessToken,
54+
basePath: req.session.basePath,
55+
accountId: req.session.accountId,
56+
envelopeId: req.session.envelopeId
5857
}
5958
, results = null
6059
;
@@ -84,16 +83,15 @@ eg004EnvelopeInfo.createController = async (req, res) => {
8483

8584
/**
8685
* This function does the work of getting the envelope information
87-
* @param {object} args An object with the following elements: <br/>
88-
* <tt>dsAPIclient</tt>: The DocuSign API Client object, already set with an access token and base url <br/>
89-
* <tt>accountId</tt>: Current account Id <br/>
90-
* <tt>envelopeId</tt>: envelope Id <br/>
86+
* @param {object} args
9187
*/
9288
// ***DS.worker.start ***DS.snippet.1.start
9389
eg004EnvelopeInfo.worker = async (args) => {
94-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
95-
, results = null
96-
;
90+
let dsApiClient = new docusign.ApiClient();
91+
dsApiClient.setBasePath(args.basePath);
92+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
93+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient)
94+
, results = null;
9795

9896
// Step 1. Call Envelopes::get
9997
// Exceptions will be caught by the calling function

‎lib/examples/eg005EnvelopeRecipients.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,10 @@ eg005EnvelopeRecipients.createController = async (req, res) => {
9191
*/
9292
// ***DS.worker.start ***DS.snippet.1.start
9393
eg005EnvelopeRecipients.worker = async (args) => {
94-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
94+
let dsApiClient = new docusign.ApiClient();
95+
dsApiClient.setBasePath(args.basePath);
96+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
97+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient)
9598
, results = null
9699
;
97100

‎lib/examples/eg006EnvelopeDocs.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,15 +49,13 @@ eg006EnvelopeDocs.createController = async (req, res) => {
4949
}
5050

5151
// Step 2. Call the worker method
52-
let accountId = req.dsAuthCodeGrant.getAccountId()
53-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
54-
, args = {
55-
dsAPIclient: dsAPIclient,
56-
accountId: accountId,
57-
envelopeId: req.session.envelopeId
52+
let args = {
53+
accessToken: req.user.accessToken,
54+
basePath: req.session.basePath,
55+
accountId: req.session.accountId,
56+
envelopeId: req.session.envelopeId
5857
}
59-
, results = null
60-
;
58+
, results = null;
6159

6260
try {
6361
results = await eg006EnvelopeDocs.worker (args)

‎lib/examples/eg007EnvelopeGetDoc.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,12 @@ eg007EnvelopeGetDoc.createController = async (req, res) => {
5151
}
5252

5353
// Step 2. Call the worker method
54-
let accountId = req.dsAuthCodeGrant.getAccountId()
55-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
56-
// Additional data validation might also be appropriate
57-
, documentId = validator.escape(req.body.docSelect)
54+
let // Additional data validation might also be appropriate
55+
documentId = validator.escape(req.body.docSelect)
5856
, args = {
59-
dsAPIclient: dsAPIclient,
60-
accountId: accountId,
57+
accessToken: req.user.accessToken,
58+
basePath: req.session.basePath,
59+
accountId: req.session.accountId,
6160
documentId: documentId,
6261
envelopeDocuments: envelopeDocuments
6362
}
@@ -99,9 +98,11 @@ eg007EnvelopeGetDoc.createController = async (req, res) => {
9998
*/
10099
// ***DS.worker.start ***DS.snippet.1.start
101100
eg007EnvelopeGetDoc.worker = async (args) => {
102-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
103-
, results = null
104-
;
101+
let dsApiClient = new docusign.ApiClient();
102+
dsApiClient.setBasePath(args.basePath);
103+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
104+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient)
105+
, results = null;
105106

106107
// Step 1. EnvelopeDocuments::get.
107108
// Exceptions will be caught by the calling function

‎lib/examples/eg008CreateTemplate.js‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,13 @@ eg008CreateTemplate.createController = async (req, res) => {
4141
}
4242

4343
// Step 2. Call the worker method
44-
let accountId = req.dsAuthCodeGrant.getAccountId()
45-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
46-
, args = {
47-
dsAPIclient: dsAPIclient,
48-
accountId: accountId,
44+
let args = {
45+
accessToken: req.user.accessToken,
46+
basePath: req.session.basePath,
47+
accountId: req.session.accountId,
4948
templateName: templateName
5049
}
51-
, results = null
52-
;
50+
, results = null;
5351

5452
try {
5553
results = await eg008CreateTemplate.worker (args)
@@ -88,7 +86,10 @@ eg008CreateTemplate.createController = async (req, res) => {
8886
*/
8987
// ***DS.worker.start ***DS.snippet.1.start
9088
eg008CreateTemplate.worker = async (args) => {
91-
let templatesApi = new docusign.TemplatesApi(args.dsAPIclient)
89+
let dsApiClient = new docusign.ApiClient();
90+
dsApiClient.setBasePath(args.basePath);
91+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
92+
let templatesApi = new docusign.TemplatesApi(dsApiClient)
9293
, results = null
9394
, templateId = null // the template that exists or will be created.
9495
, resultsTemplateName = null

‎lib/examples/eg009UseTemplate.js‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,10 @@ eg009UseTemplate.createController = async (req, res) => {
6363
signerName: signerName,
6464
ccEmail: ccEmail,
6565
ccName: ccName }
66-
, accountId = req.dsAuthCodeGrant.getAccountId()
67-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
6866
, args = {
69-
dsAPIclient: dsAPIclient,
70-
accountId: accountId,
67+
accessToken: req.user.accessToken,
68+
basePath: req.session.basePath,
69+
accountId: req.session.accountId,
7170
envelopeArgs: envelopeArgs
7271
}
7372
, results = null
@@ -108,16 +107,17 @@ eg009UseTemplate.createController = async (req, res) => {
108107
*/
109108
// ***DS.worker.start ***DS.snippet.1.start
110109
eg009UseTemplate.worker = async (args) => {
111-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
112-
, results = null
113-
;
110+
let dsApiClient = new docusign.ApiClient();
111+
dsApiClient.setBasePath(args.basePath);
112+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
113+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient);
114114

115115
// Step 1. Make the envelope request body
116116
let envelope = makeEnvelope(args.envelopeArgs)
117117

118118
// Step 2. call Envelopes::create API method
119119
// Exceptions will be caught by the calling function
120-
results = await envelopesApi.createEnvelope(
120+
let results = await envelopesApi.createEnvelope(
121121
args.accountId, {envelopeDefinition: envelope});
122122

123123
return results;

‎lib/examples/eg011EmbeddedSending.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,10 @@ eg011EmbeddedSending.createController = async (req, res) => {
5858
ccName: ccName,
5959
dsReturnUrl: dsReturnUrl,
6060
}
61-
, accountId = req.dsAuthCodeGrant.getAccountId()
62-
, dsAPIclient = req.dsAuthCodeGrant.getDSApi()
6361
, args = {
64-
dsAPIclient: dsAPIclient,
65-
accountId: accountId,
62+
accessToken: req.user.accessToken,
63+
basePath: req.session.basePath,
64+
accountId: req.session.accountId,
6665
startingView: startingView,
6766
envelopeArgs: envelopeArgs
6867
}
@@ -103,14 +102,15 @@ eg011EmbeddedSending.createController = async (req, res) => {
103102
*/
104103
// ***DS.worker.start ***DS.snippet.1.start
105104
eg011EmbeddedSending.worker = async (args) => {
106-
let envelopesApi = new docusign.EnvelopesApi(args.dsAPIclient)
107-
, results = null
108-
;
105+
let dsApiClient = new docusign.ApiClient();
106+
dsApiClient.setBasePath(args.basePath);
107+
dsApiClient.addDefaultHeader('Authorization', 'Bearer ' + args.accessToken);
108+
let envelopesApi = new docusign.EnvelopesApi(dsApiClient);
109109

110110
// Step 1. Make the envelope with "created" (draft) status
111111
args.envelopeArgs.status = "created"; // We want a draft envelope
112-
results = await eg002.worker(args);
113-
let envelopeId = results.envelopeId;
112+
let results = await eg002.worker(args)
113+
, envelopeId = results.envelopeId;
114114

115115
// Step 2. create the sender view
116116
let viewRequest = makeSenderViewRequest(args.envelopeArgs);

0 commit comments

Comments
 (0)