Merge pull request #13 from sriharip-docusign/dev

Push changes from my local branch to release branch

Author: sriharip-docusign

certified-connectors/DocuSignDemo/apiDefinition.swagger.json

@@ -387,12 +387,12 @@
             "type": "string"
           },
           {
-            "name": "documentId",
+            "name": "documentGuid",
             "in": "query",
-            "description": "Document Id",
+            "description": "Document Guid",
             "required": true,
-            "x-ms-summary": "Document Id",
-            "x-ms-test-value": "insert document id guid",
+            "x-ms-summary": "Document Guid",
+            "x-ms-test-value": "insert document guid",
             "type": "string"
           },
           {
@@ -998,14 +998,12 @@
         "consumes": [
           "application/json",
           "text/json",
-          "application/xml",
           "text/xml",
           "application/x-www-form-urlencoded"
         ],
         "produces": [
           "application/json",
           "text/json",
-          "application/xml",
           "text/xml"
         ],
         "parameters": [
@@ -1029,9 +1027,20 @@
             "in": "query",
             "description": "Template id",
             "required": true,
-            "x-ms-summary": "Template id",
+            "x-ms-summary": "Template",
             "x-ms-test-value": "insert template id",
             "x-ms-visibility": "important",
+            "x-ms-dynamic-values": {
+              "operationId": "GetEnvelopeTemplates",
+              "parameters": {
+                "accountId": {
+                  "parameter": "accountId"
+                }
+              },
+              "value-collection": "envelopeTemplates",
+              "value-path": "templateId",
+              "value-title": "name"
+            },
             "type": "string"
           },
           {
@@ -3058,9 +3067,9 @@
     },
     "/accounts/{accountId}/envelopes/{envelopeId}/get_document_id": {
       "get": {
-        "summary": "Get document id",
-        "description": "Get document id",
-        "operationId": "GetDocumentId",
+        "summary": "Get envelope document id",
+        "description": "Get envelope document id",
+        "operationId": "GetEnvelopeDocumentId",
         "parameters": [
           {
             "name": "accountId",
@@ -4508,6 +4517,12 @@
           "x-ms-summary": "Envelope Id",
           "x-ms-visibility": "important"
         },
+        "templateId": {
+          "description": "The id of the template.",
+          "type": "string",
+          "x-ms-summary": "Template Id",
+          "x-ms-visibility": "important"
+        },
         "status": {
           "description": "The status of the envelope.",
           "type": "string",
@@ -5100,17 +5115,20 @@
     "EnvelopeDocument": {
       "type": "object",
       "properties": {
+        "name": {
+          "description": "The name of the document.",
+          "type": "string",
+          "x-ms-summary": "Name"
+        },
         "documentId": {
           "description": "The id of the document.",
           "type": "string",
-          "x-ms-summary": "Document Id",
-          "x-ms-visibility": "important"
+          "x-ms-summary": "Document Id"
         },
-        "name": {
-          "description": "The name of the document.",
+        "documentIdGuid": {
+          "description": "The guid of the document.",
           "type": "string",
-          "x-ms-summary": "Name",
-          "x-ms-visibility": "important"
+          "x-ms-summary": "Document Guid"
         }
       }
     },

certified-connectors/DocuSignDemo/script.csx

@@ -1475,7 +1475,7 @@ public class Script : ScriptBase
     var body = ParseContentAsJArray(await this.Context.Request.Content.ReadAsStringAsync().ConfigureAwait(false), true);
     var query = HttpUtility.ParseQueryString(this.Context.Request.RequestUri.Query);
     var fieldList = new JArray();
-    var documentId = query.Get("documentId");
+    var documentId = query.Get("documentGuid");
 
     foreach (var field in body)
     {
@@ -1752,7 +1752,7 @@ public class Script : ScriptBase
       this.Context.Request.RequestUri = uriBuilder.Uri;
     }
 
-    if ("GetDocumentId".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase))
+    if ("GetEnvelopeDocumentId".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase))
     {
       var uriBuilder = new UriBuilder(this.Context.Request.RequestUri);
       uriBuilder.Path = uriBuilder.Path.Replace("/get_document_id", "/documents");
@@ -2392,7 +2392,7 @@ public class Script : ScriptBase
       response.Content = new StringContent(newBody.ToString(), Encoding.UTF8, "application/json");
     }
 
-    if ("GetDocumentId".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase))
+    if ("GetEnvelopeDocumentId".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase))
     {
       var body = ParseContentAsJObject(await response.Content.ReadAsStringAsync().ConfigureAwait(false), false);
       var query = HttpUtility.ParseQueryString(this.Context.Request.RequestUri.Query);
@@ -2403,7 +2403,8 @@ public class Script : ScriptBase
       {
         if (documentName.Equals(documentInfo["name"].ToString()))
         {
-          newBody["documentId"] = documentInfo["documentIdGuid"];
+          newBody["documentId"] = documentInfo["documentId"];
+          newBody["documentIdGuid"] = documentInfo["documentIdGuid"];
           newBody["name"] = documentInfo["name"];
           break;
         }
@@ -2417,6 +2418,17 @@ public class Script : ScriptBase
       response.Content = new StringContent(newBody.ToString(), Encoding.UTF8, "application/json");
     }
 
+    if ("CreateEnvelopeFromTemplateNoRecipients".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase) ||
+        "SendEnvelope".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase))
+    {
+      var body = ParseContentAsJObject(await response.Content.ReadAsStringAsync().ConfigureAwait(false), false);
+      var query = HttpUtility.ParseQueryString(this.Context.Request.RequestUri.Query);
+      var templateId = query.Get("templateId");
+      body["templateId"] = templateId;
+
+      response.Content = new StringContent(body.ToString(), Encoding.UTF8, "application/json");
+    }
+
     if (response.Content?.Headers?.ContentType != null)
     {
       if ("GetDocuments".Equals(this.Context.OperationId, StringComparison.OrdinalIgnoreCase))