added modifications to support new SDK

Author: annahileta

launcher-csharp/Common/IRequestItemsService.cs

@@ -24,6 +24,8 @@ public interface IRequestItemsService
 
         string EnvelopeId { get; set; }
 
+        public string ExtensionApps { get; set; }
+
         public string DocumentId { get; set; }
 
         public string ClickwrapId { get; set; }

launcher-csharp/Common/RequestItemsService.cs

@@ -130,6 +130,12 @@ public string EnvelopeId
             set => this.cache.Set(this.GetKey("EnvelopeId"), value);
         }
 
+        public string ExtensionApps
+        {
+            get => this.cache.Get<string>(this.GetKey("ExtensionApps"));
+            set => this.cache.Set(this.GetKey("ExtensionApps"), value);
+        }
+
         public string DocumentId
         {
             get => this.cache.Get<string>(this.GetKey("DocumentId"));

launcher-csharp/ConnectedFields/Controllers/Eg001SetConnectedFieldsController.cs

@@ -4,14 +4,13 @@
 
 namespace DocuSign.CodeExamples.Controllers
 {
-    using System;
     using System.Linq;
     using DocuSign.CodeExamples.Common;
-    using DocuSign.CodeExamples.ConnectedFields.Models;
     using DocuSign.CodeExamples.Examples;
     using DocuSign.CodeExamples.Models;
     using Microsoft.AspNetCore.Mvc;
-    using Microsoft.IdentityModel.Tokens;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
 
     [Area("ConnectedFields")]
     [Route("cf001")]
@@ -38,20 +37,22 @@ public override IActionResult Get()
                 return actionResult;
             }
 
-            Guid? organizationId = this.RequestItemsService.OrganizationId;
             string accessToken = this.RequestItemsService.User.AccessToken;
+            string accountId = this.RequestItemsService.Session.AccountId;
 
-            ExtensionApps extensionApps = SetConnectedFields.GetConnectedFieldsAsync(accessToken, this.RequestItemsService.User.AccountId).Result;
+            object extensionApps = SetConnectedFields.GetConnectedFieldsTabGroupsAsync(accountId, accessToken).Result;
+            object filteredExtensionApps = SetConnectedFields.FilterData((JArray)extensionApps);
+            var extensionAppsString = JsonConvert.SerializeObject(filteredExtensionApps);
 
-            var filteredExtensionApps = extensionApps.Applications.FindAll(extension => !extension.Tabs.Where(tabs => tabs.ExtensionData.ActionContract.Contains("Verify") == true).IsNullOrEmpty());
+            this.ViewBag.ExtensionApps = extensionAppsString;
+            this.RequestItemsService.ExtensionApps = extensionAppsString;
 
-            this.ViewBag.ExtensionApps = filteredExtensionApps;
             return this.View(this.EgName, this);
         }
 
         [HttpPost]
         [SetViewBag]
-        public IActionResult Create(string signerEmail, string signerName, string extensionName)
+        public IActionResult Create(string signerEmail, string signerName, string appId)
         {
             bool tokenOk = this.CheckToken(3);
             if (!tokenOk)
@@ -60,21 +61,25 @@ public IActionResult Create(string signerEmail, string signerName, string extens
                 return this.Redirect("/ds/mustAuthenticate");
             }
 
-            var accessToken = this.RequestItemsService.User.AccessToken;
-            var basePath = this.RequestItemsService.Session.BasePath + "/restapi";
-            var accountId = this.RequestItemsService.Session.AccountId;
+            JArray extensionApp = JArray.Parse(this.RequestItemsService.ExtensionApps);
+            JObject selectedApp = extensionApp.FirstOrDefault(app => (string)app["appId"] == appId) as JObject;
 
-            var envelopeId = SetConnectedFields.SendEnvelopeViaEmail(
-                signerEmail,
-                signerName,
-                null, // pass extension here
-                accessToken,
+            string accessToken = this.RequestItemsService.User.AccessToken;
+            string basePath = this.RequestItemsService.Session.BasePath + "/restapi";
+            string accountId = this.RequestItemsService.Session.AccountId;
+
+            string envelopeId = SetConnectedFields.SendEnvelopeViaEmail(
                 basePath,
+                accessToken,
                 accountId,
-                this.Config.DocPdf);
+                signerEmail,
+                signerName,
+                this.Config.DocPdf,
+                selectedApp);
 
             this.ViewBag.h1 = this.CodeExampleText.ExampleName;
             this.ViewBag.message = string.Format(this.CodeExampleText.ResultsPageText, envelopeId);
+
             return this.View("example_done");
         }
     }

launcher-csharp/ConnectedFields/Examples/SetConnectedFields.cs

@@ -8,57 +8,102 @@ namespace DocuSign.CodeExamples.Examples
     using System.Collections.Generic;
     using System.Linq;
     using System.Net.Http;
-    using System.Net.Http.Headers;
-    using System.Text;
-    using System.Text.Json;
     using System.Threading.Tasks;
-    using DocuSign.CodeExamples.ConnectedFields.Models;
     using DocuSign.eSign.Api;
     using DocuSign.eSign.Client;
     using DocuSign.eSign.Model;
-    using static System.Net.Mime.MediaTypeNames;
+    using Newtonsoft.Json;
+    using Newtonsoft.Json.Linq;
 
     public static class SetConnectedFields
     {
         private static readonly HttpClient Client = new HttpClient();
 
-        public static async Task<ExtensionApps> GetConnectedFieldsAsync(string accessToken, string accountId)
+        public static async Task<object> GetConnectedFieldsTabGroupsAsync(string accountId, string accessToken)
         {
-            string baseUrl = "https://api-d.docusign.com/v1";
-            string requestUrl = $"{baseUrl}/accounts/{accountId}/connected-fields/tab-groups";
+            var url = $"https://api-d.docusign.com/v1/accounts/{accountId}/connected-fields/tab-groups";
 
-            using (var request = new HttpRequestMessage(HttpMethod.Get, requestUrl))
+            var requestMessage = new HttpRequestMessage(HttpMethod.Get, url);
+
+            requestMessage.Headers.Add("Authorization", $"Bearer {accessToken}");
+            requestMessage.Headers.Add("Accept", "application/json");
+
+            try
             {
-                request.Headers.Authorization = new AuthenticationHeaderValue("Bearer", accessToken);
-                request.Headers.Accept.Add(new MediaTypeWithQualityHeaderValue("application/json"));
-                request.Headers.Add("Content-Type", "application/json");
+                var response = await Client.SendAsync(requestMessage);
+                response.EnsureSuccessStatusCode();
 
-                HttpResponseMessage response = await Client.SendAsync(request);
-                string responseBody = await response.Content.ReadAsStringAsync();
+                var body = await response.Content.ReadAsStringAsync();
+                var data = JsonConvert.DeserializeObject<object>(body);
 
-                return JsonSerializer.Deserialize<ExtensionApps>(responseBody);
+                return data;
+            }
+            catch (HttpRequestException e)
+            {
+                throw new Exception($"DocuSign API Request failed: {e.Message}");
             }
         }
 
-        public static string SendEnvelopeViaEmail(string signerEmail, string signerName, ExtensionApp extension, string basePath, string accessToken, string accountId, string docPdf)
+        public static JArray FilterData(JArray data)
         {
-            EnvelopeDefinition env = MakeEnvelope(signerEmail, signerName, extension,  docPdf);
+            var filteredData = data.Where(item =>
+            {
+                var tabs = item["tabs"] as JArray;
+                if (tabs == null)
+                {
+                    return false;
+                }
+
+                foreach (var tab in tabs)
+                {
+                    var extensionData = tab["extensionData"];
+                    var tabLabel = tab["tabLabel"]?.ToString();
+
+                    if ((extensionData != null && extensionData["actionContract"]?.ToString().Contains("Verify") == true) ||
+                        (tabLabel != null && tabLabel.Contains("connecteddata")))
+                    {
+                        return true;
+                    }
+                }
+
+                return false;
+            }).ToList();
+
+            return new JArray(filteredData);
+        }
+
+        public static string SendEnvelopeViaEmail(
+            string basePath,
+            string accessToken,
+            string accountId,
+            string signerEmail,
+            string signerName,
+            string docPdf,
+            JObject selectedApp)
+        {
+            EnvelopeDefinition envelopeDefinition = MakeEnvelope(signerEmail, signerName, docPdf, selectedApp);
             var docuSignClient = new DocuSignClient(basePath);
             docuSignClient.Configuration.DefaultHeader.Add("Authorization", "Bearer " + accessToken);
 
             EnvelopesApi envelopesApi = new EnvelopesApi(docuSignClient);
-            EnvelopeSummary results = envelopesApi.CreateEnvelope(accountId, env);
+            EnvelopeSummary results = envelopesApi.CreateEnvelope(accountId, envelopeDefinition);
             return results.EnvelopeId;
         }
 
-        public static EnvelopeDefinition MakeEnvelope(string signerEmail, string signerName, ExtensionApp extension, string docPdf)
+        public static EnvelopeDefinition MakeEnvelope(
+            string signerEmail,
+            string signerName,
+            string docPdf,
+            JObject selectedApp)
         {
+            var appId = selectedApp["appId"]?.ToString() ?? string.Empty;
+            JArray tabLabels = (JArray)selectedApp["tabs"];
+
             EnvelopeDefinition envelopeDefinition = new EnvelopeDefinition();
             envelopeDefinition.EmailSubject = "Please sign this document set";
             envelopeDefinition.Status = "sent";
 
             string docPdfBytes = Convert.ToBase64String(System.IO.File.ReadAllBytes(docPdf));
-
             Document document = new Document
             {
                 DocumentBase64 = docPdfBytes,
@@ -75,7 +120,7 @@ public static EnvelopeDefinition MakeEnvelope(string signerEmail, string signerN
                 Name = signerName,
                 RecipientId = "1",
                 RoutingOrder = "1",
-                Tabs = new eSign.Model.Tabs
+                Tabs = new Tabs
                 {
                    SignHereTabs = new List<SignHere>
                    {
@@ -87,36 +132,81 @@ public static EnvelopeDefinition MakeEnvelope(string signerEmail, string signerN
                             AnchorXOffset = "20",
                         },
                    },
-                   TextTabs = new List<eSign.Model.Text>
-                   {
-                        new eSign.Model.Text
+                   TextTabs = new List<Text>(),
+                },
+            };
+
+            foreach (var tab in tabLabels)
+            {
+                var connectionKey = tab["extensionData"]["connectionInstances"] != null ?
+                    tab["extensionData"]["connectionInstances"][0]?["connectionKey"]?.ToString() : string.Empty;
+                var connectionValue = tab["extensionData"]["connectionInstances"] != null ?
+                    tab["extensionData"]["connectionInstances"][0]?["connectionValue"]?.ToString() : string.Empty;
+                var extensionGroupId = tab["extensionData"]["extensionGroupId"]?.ToString() ?? string.Empty;
+                var publisherName = tab["extensionData"]["publisherName"]?.ToString() ?? string.Empty;
+                var applicationName = tab["extensionData"]["applicationName"]?.ToString() ?? string.Empty;
+                var actionName = tab["extensionData"]["actionName"]?.ToString() ?? string.Empty;
+                var actionInputKey = tab["extensionData"]["actionInputKey"]?.ToString() ?? string.Empty;
+                var actionContract = tab["extensionData"]["actionContract"]?.ToString() ?? string.Empty;
+                var extensionName = tab["extensionData"]["extensionName"]?.ToString() ?? string.Empty;
+                var extensionContract = tab["extensionData"]["extensionContract"]?.ToString() ?? string.Empty;
+                var requiredForExtension = tab["extensionData"]["requiredForExtension"]?.ToString() ?? string.Empty;
+
+                var text = new Text
+                {
+                    RequireInitialOnSharedChange = "false",
+                    RequireAll = "false",
+                    Name = applicationName,
+                    Required = "false",
+                    Locked = "false",
+                    DisableAutoSize = "false",
+                    MaxLength = "4000",
+                    TabLabel = tab["tabLabel"].ToString(),
+                    Font = "lucidaconsole",
+                    FontColor = "black",
+                    FontSize = "size9",
+                    DocumentId = "1",
+                    RecipientId = "1",
+                    PageNumber = "1",
+                    XPosition = "273",
+                    YPosition = "191",
+                    Width = "84",
+                    Height = "22",
+                    TemplateRequired = "false",
+                    TabType = "text",
+                    ExtensionData = new ExtensionData
+                    {
+                        ExtensionGroupId = extensionGroupId,
+                        PublisherName = publisherName,
+                        ApplicationId = appId,
+                        ApplicationName = applicationName,
+                        ActionName = actionName,
+                        ActionContract = actionContract,
+                        ExtensionName = extensionName,
+                        ExtensionContract = extensionContract,
+                        RequiredForExtension = requiredForExtension,
+                        ActionInputKey = actionInputKey,
+                        ExtensionPolicy = "MustVerifyToSign",
+                        ConnectionInstances = new List<ConnectionInstance>
                         {
-                            RequireInitialOnSharedChange = "false",
-                            RequireAll = "false",
-                            Name = extension.Tabs.First().ExtensionData.ApplicationName,
-                            Required = "false",
-                            Locked = "false",
-                            DisableAutoSize = "false",
-                            MaxLength = "4000",
-                            TabLabel = extension.Tabs.First().TabLabel,
-                            Font = "lucidaconsole",
-                            FontColor = "black",
-                            FontSize = "size9",
-                            DocumentId = "1",
-                            RecipientId = "1",
-                            PageNumber = "1",
-                            XPosition = "273",
-                            YPosition = "191",
-                            Width = "84",
-                            Height = "22",
-                            TemplateRequired = "false",
-                            TabType = "text",
-                            //add extension code here
+                            new ConnectionInstance
+                            {
+                                ConnectionKey = connectionKey,
+                                ConnectionValue = connectionValue,
+                            },
                         },
-                   },
+                    },
+                };
+                signer.Tabs.TextTabs.Add(text);
+            }
+
+            envelopeDefinition.Recipients = new Recipients
+            {
+                Signers = new List<Signer>
+                {
+                    signer,
                 },
             };
-
             return envelopeDefinition;
         }
     }