add client api in example usage

shadim · shadim · commit 97a110247b31 · 2018-11-26T03:15:36.000-08:00
diff --git a/eg-03-csharp-auth-code-grant-core/Common/IRequestItemsService.cs b/eg-03-csharp-auth-code-grant-core/Common/IRequestItemsService.cs
@@ -5,9 +5,8 @@ namespace eg_03_csharp_auth_code_grant_core
 {
     public interface IRequestItemsService
     {
-        ApiClient DefaultApiClient { get; }
-
-        Configuration DefaultConfiguration { get; }
+        //ApiClient DefaultApiClient { get; }
+        
         string EgName { get; set; }
 
         Session Session { get; set; }
diff --git a/eg-03-csharp-auth-code-grant-core/Common/RequestItemService.cs b/eg-03-csharp-auth-code-grant-core/Common/RequestItemService.cs
@@ -11,8 +11,7 @@ public class RequestItemsService : IRequestItemsService
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IMemoryCache _cache;
         private readonly string _id;
-        private string API_CLIENT_KEY = "{0}_ApiClient";
-        private string CONFIG_KEY = "{0}_DocusignConfig";
+        private string API_CLIENT_KEY = "{0}_ApiClient";        
         private string BASE_URI = "https://demo.docusign.net/restapi";
         private string _accessToken;        
 
@@ -30,38 +29,22 @@ public RequestItemsService(IHttpContextAccessor httpContextAccessor, IMemoryCach
             }
         }
 
-        public ApiClient DefaultApiClient
-        {
-            get
-            {
-                var key = string.Format(API_CLIENT_KEY, _id);
-                ApiClient apiClient = _cache.Get<ApiClient>("apiClient");
-                if (apiClient == null)
-                {
-                    apiClient = new ApiClient(BASE_URI);
-                    _cache.Set(key, apiClient);
-                }
-
-                return apiClient;
-            }
-        }
+        //public ApiClient DefaultApiClient
+        //{
+        //    get
+        //    {
+        //        var key = string.Format(API_CLIENT_KEY, _id);
+        //        ApiClient apiClient = _cache.Get<ApiClient>("apiClient");
+        //        if (apiClient == null)
+        //        {
+        //            apiClient = new ApiClient(BASE_URI);
+        //            _cache.Set(key, apiClient);
+        //        }
 
-        public Configuration DefaultConfiguration
-        {
-            get
-            {
-                var key = string.Format(CONFIG_KEY, _id);
-                var docuSignConfig = _cache.Get<Configuration>(key);
+        //        return apiClient;
+        //    }
+        //}
 
-                if (docuSignConfig == null)
-                {
-                    docuSignConfig = new Configuration(new ApiClient(BASE_URI));
-                    _cache.Set(key, docuSignConfig);
-                }
-                docuSignConfig.AddDefaultHeader("Authorization", "Bearer " + _accessToken);
-                return docuSignConfig;
-            }
-        }
         private string GetKey(string key)
         {
             return string.Format("{0}_{1}", _id, key);
@@ -70,7 +53,7 @@ public string EgName {
             get => _cache.Get<string>(GetKey("EgName"));
             set => _cache.Set(GetKey("EgName"), value);
         }
-
+       
         public Session Session {
             get => _cache.Get<Session>(GetKey("Session"));
             set => _cache.Set(GetKey("Session"), value);
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg001EmbeddedSigningController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg001EmbeddedSigningController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Common;
 using eg_03_csharp_auth_code_grant_core.Controllers;
@@ -33,9 +34,11 @@ public IActionResult Create(string signerEmail, string signerName)
             // Step 1. Create the envelope definition
             EnvelopeDefinition envelope = MakeEnvelope(signerEmail, signerName);
 
-            // Step 2. Call DocuSign to create the envelope
-            //EnvelopesApi envelopesApi = new EnvelopesApi((Configuration)HttpContext.Items["docuSignConfig"]);
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            // Step 2. Call DocuSign to create the envelope                   
+            var config = new Configuration(new ApiClient(session.BasePath+ "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer "+ user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
+
             EnvelopeSummary results = envelopesApi.CreateEnvelope(session.AccountId, envelope);
 
             string envelopeId = results.EnvelopeId;
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg002SigningViaEmailController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg002SigningViaEmailController.cs
@@ -8,6 +8,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.IO;
 using System.Text;
+using DocuSign.eSign.Client;
 
 namespace eg_03_csharp_auth_code_grant_core.Controllers
 {
@@ -24,9 +25,13 @@ public Eg002SigningViaEmailController(DSConfiguration config, IRequestItemsServi
 
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
-        {            
+        {
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
             EnvelopeDefinition env = MakeEnvelope(signerEmail, signerName, ccEmail, ccName);
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             EnvelopeSummary results = envelopesApi.CreateEnvelope(RequestItemsService.Session.AccountId, env);
             RequestItemsService.EnvelopeId = results.EnvelopeId;
             ViewBag.h1 = "Envelope sent";
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg003ListEnvelopesController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg003ListEnvelopesController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -25,7 +26,11 @@ public Eg003ListEnvelopesController(DSConfiguration config, IRequestItemsService
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             ListStatusChangesOptions options = new ListStatusChangesOptions();
                    
             options.fromDate = DateTime.Now.AddDays(-30).ToString("yyyy/MM/dd");
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg004EnvelopeInfoController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg004EnvelopeInfoController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -23,7 +24,11 @@ public Eg004EnvelopeInfoController(DSConfiguration config, IRequestItemsService
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             ViewBag.h1 = "Get envelope status results";
             ViewBag.message  = "Results from the Envelopes::get method:";
             DocuSign.eSign.Model.Envelope results = envelopesApi.GetEnvelope(RequestItemsService.Session.AccountId, RequestItemsService.EnvelopeId);
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg005EnvelopeRecipientsController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg005EnvelopeRecipientsController.cs
@@ -1,4 +1,5 @@
 ﻿using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
@@ -19,7 +20,11 @@ public Eg005EnvelopeRecipientsController(DSConfiguration config, IRequestItemsSe
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             ViewBag.h1 = "List envelope recipients result";
             ViewBag.message = "Results from the EnvelopeRecipients::list method:";
             var results = envelopesApi.ListRecipients(RequestItemsService.Session.AccountId, RequestItemsService.EnvelopeId);            
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg006EnvelopeDocsController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg006EnvelopeDocsController.cs
@@ -1,5 +1,6 @@
 ﻿using System.Collections.Generic;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -21,7 +22,11 @@ public Eg006EnvelopeDocsController(DSConfiguration config, IRequestItemsService
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             EnvelopeDocumentsResult result = envelopesApi.ListDocuments(RequestItemsService.Session.AccountId, 
                 RequestItemsService.EnvelopeId);
             // Save the envelopeId and its list of documents in the session so
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg007EnvelopeGetDocController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg007EnvelopeGetDocController.cs
@@ -1,5 +1,6 @@
 ﻿using System.Linq;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
 
@@ -19,7 +20,11 @@ public Eg007EnvelopeGetDocController(DSConfiguration config, IRequestItemsServic
         [HttpPost]
         public FileResult Create(string docSelect)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
 
             // Step 1. EnvelopeDocuments::get.
             // Exceptions will be caught by the calling function
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg008CreateTemplateController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg008CreateTemplateController.cs
@@ -1,6 +1,7 @@
 ﻿using System;
 using System.Collections.Generic;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -22,7 +23,11 @@ public Eg008CreateTemplateController(DSConfiguration config, IRequestItemsServic
         public IActionResult Create()
         {           
             string templateName = "Example Signer and CC template";
-            TemplatesApi templatesApi = new TemplatesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            TemplatesApi templatesApi = new TemplatesApi(config);
             TemplatesApi.ListTemplatesOptions options = new TemplatesApi.ListTemplatesOptions();
             options.searchText = "Example Signer and CC template";
             EnvelopeTemplateResults results = templatesApi.ListTemplates(RequestItemsService.Session.AccountId, options);
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg009UseTemplateController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg009UseTemplateController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -22,7 +23,11 @@ public Eg009UseTemplateController(DSConfiguration config, IRequestItemsService r
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             EnvelopeDefinition envelope = MakeEnvelope(signerEmail, signerName, ccEmail, ccName, RequestItemsService.TemplateId);
             EnvelopeSummary result = envelopesApi.CreateEnvelope(RequestItemsService.Session.AccountId, envelope);            
             RequestItemsService.EnvelopeId = result.EnvelopeId;
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg011EmbeddedSendingController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg011EmbeddedSendingController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -24,8 +25,12 @@ public Eg011EmbeddedSendingController(DSConfiguration config, IRequestItemsServi
 
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName, string startingView)
-        {            
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+        {
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             // Step 1. Make the envelope with "created" (draft) status            
             RequestItemsService.Status = "created";
             //EnvelopeSummary results = (EnvelopeSummary)controller2.doWork(args, model);
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg012EmbeddedConsoleController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg012EmbeddedConsoleController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -22,7 +23,11 @@ public Eg012EmbeddedConsoleController(DSConfiguration config, IRequestItemsServi
         [HttpPost]
         public IActionResult Create(string startingView)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             string dsReturnUrl = Config.AppUrl + "/ds-return";
             ConsoleViewRequest viewRequest = MakeConsoleViewRequest(dsReturnUrl, startingView);
             // Step 1. create the NDSE view
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg013AddDocToTemplateController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg013AddDocToTemplateController.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -25,7 +26,11 @@ public Eg013AddDocToTemplateController(DSConfiguration config, IRequestItemsServ
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName, string item, string quantity)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             string dsReturnUrl = Config.AppUrl + "/dsReturn";
             string dsPingUrl = Config.AppUrl + "/";
             // Step 1. Make the envelope request body
diff --git a/eg-03-csharp-auth-code-grant-core/Controllers/Eg014CollectPaymentController.cs b/eg-03-csharp-auth-code-grant-core/Controllers/Eg014CollectPaymentController.cs
@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using DocuSign.eSign.Api;
+using DocuSign.eSign.Client;
 using DocuSign.eSign.Model;
 using eg_03_csharp_auth_code_grant_core.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -24,7 +25,11 @@ public Eg014CollectPaymentController(DSConfiguration config, IRequestItemsServic
         [HttpPost]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
-            EnvelopesApi envelopesApi = new EnvelopesApi(RequestItemsService.DefaultConfiguration);
+            var session = RequestItemsService.Session;
+            var user = RequestItemsService.User;
+            var config = new Configuration(new ApiClient(session.BasePath + "/restapi"));
+            config.AddDefaultHeader("Authorization", "Bearer " + user.AccessToken);
+            EnvelopesApi envelopesApi = new EnvelopesApi(config);
             // Step 1. Make the envelope request body
             EnvelopeDefinition envelope = MakeEnvelope(signerEmail, signerName, ccEmail, ccName);
             // Step 2. call Envelopes::create API method

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,8 @@ namespace eg_03_csharp_auth_code_grant_core`
`5`	`5`	`{`
`6`	`6`	`public interface IRequestItemsService`
`7`	`7`	`{`
`8`		`- ApiClient DefaultApiClient { get; }`
`9`		`-`
`10`		`- Configuration DefaultConfiguration { get; }`
	`8`	`+ //ApiClient DefaultApiClient { get; }`
	`9`	`+`
`11`	`10`	`string EgName { get; set; }`
`12`	`11`
`13`	`12`	`Session Session { get; set; }`