Various updates to C# UI for some code examples, also updates version of the Maestro SDK

InbarGazit · InbarGazit · commit 3afcf66cb751 · 2024-06-21T11:35:28.000-07:00
diff --git a/launcher-csharp/Admin/Controllers/CreateCLMESignUser.cs b/launcher-csharp/Admin/Controllers/CreateCLMESignUser.cs
@@ -106,7 +106,7 @@ protected override void InitializeInternal()
 
             //ds-snippet-start:Admin2Step3
             var productPermissionProfileApi = new ProductPermissionProfilesApi(apiClient);
-            var productPermissionProfiles = productPermissionProfileApi.GetProductPermissionProfiles(organizationId, Guid.Parse(accountId));
+            var productPermissionProfiles = productPermissionProfileApi.GetProductPermissionProfiles(organizationId.Value, Guid.Parse(accountId));
             this.ViewBag.CLMPermissionProfiles = productPermissionProfiles.ProductPermissionProfiles.Find(x => x.ProductName == "CLM").PermissionProfiles;
             this.ViewBag.ESignPermissionProfiles = productPermissionProfiles.ProductPermissionProfiles.Find(x => x.ProductName == "ESign").PermissionProfiles;
             clmProductId = productPermissionProfiles.ProductPermissionProfiles.Find(x => x.ProductName == "CLM").ProductId;
diff --git a/launcher-csharp/Admin/Controllers/DeleteUserDataFromAccount.cs b/launcher-csharp/Admin/Controllers/DeleteUserDataFromAccount.cs
@@ -17,7 +17,7 @@ namespace DocuSign.CodeExamples.Admin.Controllers
     using Newtonsoft.Json;
 
     [Area("Admin")]
-    [Route("Aeg011")]
+    [Route("aeg011")]
     public class DeleteUserDataFromAccount : EgController
     {
         public DeleteUserDataFromAccount(DsConfiguration config, LauncherTexts launcherTexts, IRequestItemsService requestItemsService)
@@ -27,7 +27,7 @@ public DeleteUserDataFromAccount(DsConfiguration config, LauncherTexts launcherT
             this.ViewBag.title = this.CodeExampleText.ExampleName;
         }
 
-        public override string EgName => "Aeg011";
+        public override string EgName => "aeg011";
 
         [MustAuthenticate]
         [SetViewBag]
diff --git a/launcher-csharp/Admin/Controllers/DeleteUserDataFromOrganization.cs b/launcher-csharp/Admin/Controllers/DeleteUserDataFromOrganization.cs
@@ -17,7 +17,7 @@ namespace DocuSign.CodeExamples.Admin.Controllers
     using Newtonsoft.Json;
 
     [Area("Admin")]
-    [Route("Aeg010")]
+    [Route("aeg010")]
     public class DeleteUserDataFromOrganization : EgController
     {
         public DeleteUserDataFromOrganization(DsConfiguration config, LauncherTexts launcherTexts, IRequestItemsService requestItemsService)
@@ -27,7 +27,7 @@ public DeleteUserDataFromOrganization(DsConfiguration config, LauncherTexts laun
             this.ViewBag.title = this.CodeExampleText.ExampleName;
         }
 
-        public override string EgName => "Aeg010";
+        public override string EgName => "aeg010";
 
         [MustAuthenticate]
         [SetViewBag]
diff --git a/launcher-csharp/Maestro/Controllers/TriggerWorkflow.cs b/launcher-csharp/Maestro/Controllers/TriggerWorkflow.cs
@@ -150,7 +150,8 @@ public ActionResult SubmitForm(WorkflowTriggerModel model)
                     docuSignManageClient,
                     accountId,
                     new Uri(workflow.TriggerUrl),
-                    model);
+                    model,
+                    this.RequestItemsService.WorkflowId);
 
                 this.RequestItemsService.InstanceId = result.InstanceId;
 
diff --git a/launcher-csharp/Maestro/Examples/TriggerWorkflowService.cs b/launcher-csharp/Maestro/Examples/TriggerWorkflowService.cs
@@ -50,7 +50,12 @@ public static string PublishWorkFlow(DocuSignClient docuSignClient, string accou
             }
         }
 
-        public static TriggerWorkflowViaPostResponse TriggerWorkflow(DocuSignClient docuSignClient, string accountId, Uri triggerUrl, WorkflowTriggerModel model)
+        public static TriggerWorkflowViaPostResponse TriggerWorkflow(
+            DocuSignClient docuSignClient,
+            string accountId,
+            Uri triggerUrl,
+            WorkflowTriggerModel model,
+            string workflowId)
         {
             //ds-snippet-start:Maestro1Step4
             var maestroApi = new WorkflowTriggerApi(docuSignClient);
@@ -76,7 +81,7 @@ public static TriggerWorkflowViaPostResponse TriggerWorkflow(DocuSignClient docu
             };
             //ds-snippet-end:Maestro1Step4
             //ds-snippet-start:Maestro1Step5
-            return maestroApi.TriggerWorkflow(accountId, payload, options);
+            return maestroApi.TriggerWorkflow(accountId, workflowId, payload, options);
             //ds-snippet-end:Maestro1Step5
         }
     }
diff --git a/launcher-csharp/Views/Home/Index.cshtml b/launcher-csharp/Views/Home/Index.cshtml
@@ -6,18 +6,18 @@
     Boolean.TryParse(ViewData["showDoc"].ToString(), out showDoc);//ViewBag.ShowDoc;
     Layout = "_HomeLayout";
 }
-    <div class="jumbotron">
+<div class="jumbotron" style="background-color: #210058!important">
         <table>
             <tbody>
                 <tr>
                     <td>
-                        <h1 class="display-4">C# Launcher</h1>
+                    <h1 class="display-4" style="background-color: #210058!important">C# Launcher</h1>
                         <p class="Xlead">
                             @Html.Raw(ViewBag.SupportingTexts.HomePageText)
                         </p>
                     </td>
                     <td>
-                        <img src="/images/banner-code.PNG" />
+                        <img src="/images/header.PNG" />
                     </td>
                 </tr>
             </tbody>
diff --git a/launcher-csharp/appsettings.example.json b/launcher-csharp/appsettings.example.json
@@ -15,7 +15,7 @@
     "AppUrl": "https://localhost:44333",
     "RoomsApiEndpoint": "https://demo.rooms.docusign.com",
     "AdminApiEndpoint": "https://api-d.docusign.net/management",
-    "MaestroApiEndpoint": "https://demo.services.docusign.net/",
+    "MaestroApiEndpoint": "https://apps-d.docusign.com/api/maestro",
     "WebFormsBasePath": "https://apps-d.docusign.com/api/webforms/v1.1",
     "CodeExamplesManifest": "https://raw.githubusercontent.com/docusign/code-examples-csharp/master/manifest/CodeExamplesManifest.json",
     "SignerEmail": "{SIGNER_EMAIL}",
diff --git a/launcher-csharp/eSignature/Controllers/RecipientAuthIDV.cs b/launcher-csharp/eSignature/Controllers/RecipientAuthIDV.cs
@@ -27,6 +27,15 @@ public RecipientAuthIdv(DsConfiguration config, LauncherTexts launcherTexts, IRe
         [SetViewBag]
         public IActionResult Create(string signerEmail, string signerName, string ccEmail, string ccName)
         {
+            if (signerEmail == this.Config.SignerEmail)
+            {
+                this.ViewBag.errorCode = "400";
+                this.ViewBag.errorMessage = this.LauncherTexts.ManifestStructure.SupportingTexts.IdenticalEmailsNotAllowedErrorMessage;
+                this.ViewBag.SupportingTexts = this.LauncherTexts.ManifestStructure.SupportingTexts;
+
+                return this.View("Error");
+            }
+
             try
             {
                 // Check the token with minimal buffer time.
diff --git a/launcher-csharp/eSignature/Controllers/RecipientAuthKBA.cs b/launcher-csharp/eSignature/Controllers/RecipientAuthKBA.cs
@@ -26,6 +26,15 @@ public RecipientAuthKba(DsConfiguration config, LauncherTexts launcherTexts, IRe
         [SetViewBag]
         public IActionResult Create(string signerEmail, string signerName)
         {
+            if (signerEmail == this.Config.SignerEmail)
+            {
+                this.ViewBag.errorCode = "400";
+                this.ViewBag.errorMessage = this.LauncherTexts.ManifestStructure.SupportingTexts.IdenticalEmailsNotAllowedErrorMessage;
+                this.ViewBag.SupportingTexts = this.LauncherTexts.ManifestStructure.SupportingTexts;
+
+                return this.View("Error");
+            }
+
             // Check the token with minimal buffer time.
             bool tokenOk = this.CheckToken(3);
             if (!tokenOk)
diff --git a/launcher-csharp/eSignature/Controllers/RecipientAuthPhone.cs b/launcher-csharp/eSignature/Controllers/RecipientAuthPhone.cs
@@ -27,6 +27,15 @@ public RecipientAuthPhone(DsConfiguration config, LauncherTexts launcherTexts, I
         [SetViewBag]
         public IActionResult Create(string signerEmail, string signerName, string signerCountryCode, string signerPhoneNumber)
         {
+            if (signerEmail == this.Config.SignerEmail)
+            {
+                this.ViewBag.errorCode = "400";
+                this.ViewBag.errorMessage = this.LauncherTexts.ManifestStructure.SupportingTexts.IdenticalEmailsNotAllowedErrorMessage;
+                this.ViewBag.SupportingTexts = this.LauncherTexts.ManifestStructure.SupportingTexts;
+
+                return this.View("Error");
+            }
+
             try
             {
                 // Check the token with minimal buffer time.
diff --git a/launcher-csharp/eSignature/Models/ModelsToReadManifest/SupportingTexts.cs b/launcher-csharp/eSignature/Models/ModelsToReadManifest/SupportingTexts.cs
@@ -50,6 +50,9 @@ public class SupportingTexts
         [JsonProperty("ContactSupportToEnableFeature")]
         public string ContactSupportToEnableFeature { get; set; }
 
+        [JsonProperty("IdenticalEmailsNotAllowedErrorMessage")]
+        public string IdenticalEmailsNotAllowedErrorMessage { get; set; }
+
         [JsonProperty("LoginPage")]
         public LoginPage LoginPage { get; set; }
 
diff --git a/launcher-csharp/eSignature/Views/Eg020SmsAuth/eg020.cshtml b/launcher-csharp/eSignature/Views/Eg020SmsAuth/eg020.cshtml
@@ -51,8 +51,7 @@
                name="signerEmail"
                aria-describedby="emailHelp" 
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[emailInputNumber].InputPlaceholder" 
-               required
-               value="@ViewBag.Locals.DsConfig.SignerEmail">
+               required>
 
         <small id="emailHelp" class="form-text text-muted">
             @Html.Raw(ViewBag.SupportingTexts.HelpingTexts.EmailWontBeShared)
@@ -68,7 +67,6 @@
                id="signerName" 
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[nameInputNumber].InputPlaceholder" 
                name="signerName"
-               value="@ViewBag.Locals.DsConfig.SignerName" 
                required>
     </div>
 
diff --git a/launcher-csharp/eSignature/Views/RecipientAuthIDV/eg023.cshtml b/launcher-csharp/eSignature/Views/RecipientAuthIDV/eg023.cshtml
@@ -21,8 +21,6 @@
 </p>
 
 <form class="eg" action="" method="post" data-busy="form">
-    <p>@Html.Raw(ViewBag.CodeExampleText.Notes)</p>
-
     <div class="form-group">
         <label for="signerEmail">
             @Html.Raw(ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerEmailInputNumber].InputName)
@@ -34,8 +32,7 @@
                name="signerEmail"
                aria-describedby="emailHelp"
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerEmailInputNumber].InputPlaceholder"
-               required
-               value="@ViewBag.Locals.DsConfig.SignerEmail">
+               required>
 
         <small id="emailHelp" class="form-text text-muted">
             @Html.Raw(ViewBag.SupportingTexts.HelpingTexts.EmailWontBeShared)
@@ -51,7 +48,6 @@
                id="signerName"
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerNameInputNumber].InputPlaceholder"
                name="signerName"
-               value="@ViewBag.Locals.DsConfig.SignerName"
                required />
     </div>
 
diff --git a/launcher-csharp/eSignature/Views/RecipientAuthKBA/eg022.cshtml b/launcher-csharp/eSignature/Views/RecipientAuthKBA/eg022.cshtml
@@ -21,8 +21,6 @@
 </p>
 
 <form class="eg" action="" method="post" data-busy="form">
-    <p>@Html.Raw(ViewBag.CodeExampleText.Notes)</p>
-
     <div class="form-group">
         <label for="signerEmail">
             @Html.Raw(ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerEmailInputNumber].InputName)
@@ -34,8 +32,7 @@
                name="signerEmail"
                aria-describedby="emailHelp"
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerEmailInputNumber].InputPlaceholder" 
-               required
-               value="@ViewBag.Locals.DsConfig.SignerEmail">
+               required>
         <small id="emailHelp" class="form-text text-muted">
             @Html.Raw(ViewBag.SupportingTexts.HelpingTexts.EmailWontBeShared)
         </small>
@@ -50,7 +47,6 @@
                id="signerName" 
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerNameInputNumber].InputPlaceholder" 
                name="signerName"
-               value="@ViewBag.Locals.DsConfig.SignerName" 
                required />
     </div>
     <input type="hidden" name="_csrf" value="<%- csrfToken %>">
diff --git a/launcher-csharp/eSignature/Views/RecipientAuthPhone/eg020.cshtml b/launcher-csharp/eSignature/Views/RecipientAuthPhone/eg020.cshtml
@@ -65,8 +65,7 @@
                name="signerEmail"
                aria-describedby="emailHelp" 
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerEmailInputNumber].InputPlaceholder" 
-               required
-               value="@ViewBag.Locals.DsConfig.SignerEmail">
+               required>
 
         <small id="emailHelp" class="form-text text-muted">
             @Html.Raw(ViewBag.SupportingTexts.HelpingTexts.EmailWontBeShared)
@@ -81,7 +80,6 @@
                id="signerName" 
                placeholder="@ViewBag.CodeExampleText.Forms[formNumber].Inputs[signerNameInputNumber].InputPlaceholder"
                name="signerName"
-               value="@ViewBag.Locals.DsConfig.SignerName" 
                required />
     </div>
     <input type="hidden" name="_csrf" value="<%- csrfToken %>">
diff --git a/launcher-csharp/launcher-csharp.csproj b/launcher-csharp/launcher-csharp.csproj
@@ -40,7 +40,7 @@
     <PackageReference Include="DocuSign.Click" Version="2.0.0-rc1" />
     <PackageReference Include="DocuSign.eSign.dll" Version="7.0.0-rc2" />
     <PackageReference Include="DocuSign.Monitor" Version="2.0.0-rc1" />
-    <PackageReference Include="DocuSign.Maestro" Version="1.0.0-rc1" />
+    <PackageReference Include="DocuSign.Maestro" Version="1.0.0-rc4" />
     <PackageReference Include="DocuSign.Rooms" Version="2.0.0-rc1" />
     <PackageReference Include="DocuSign.WebForms" Version="2.0.0-rc1" />
     <PackageReference Include="Microsoft.AspNetCore.Session" Version="2.2.0" />
diff --git a/launcher-csharp/wwwroot/images/banner-code.PNG b/launcher-csharp/wwwroot/images/banner-code.PNG
diff --git a/launcher-csharp/wwwroot/images/header.png b/launcher-csharp/wwwroot/images/header.png
diff --git a/manifest/CodeExamplesManifest.json b/manifest/CodeExamplesManifest.json
@@ -14,6 +14,7 @@
       "WelcomeText":"Welcome {0} (Account: {1})",
       "CFRError":"This example is not compatible with your CFR Part 11 account. Please return to the homepage to run one of the examples that is compatible or authenticate with a different account.",
       "ContactSupportToEnableFeature": "Please contact <a href=\"https://support.docusign.com/\">support</a> to enable {0} in your account",
+      "IdenticalEmailsNotAllowedErrorMessage": "For recipient authentication you must specify a different recipient from the account owner (sender) in order to ensure recipient authentication is performed",
       "LoginPage":{
          "LoginHeader":"<h1 class='display-4'>Please Authenticate with Docusign</h1><label for='auth_type'>Please choose your authentication type</label>",
          "LoginButton":"Authenticate with Docusign",
@@ -187,7 +188,8 @@
                               },
                               {
                                  "InputName": "RSUs"
-                              }                           ]
+                              }
+                           ]
                         }
                      ],
                      "ResultsPageText":"The envelope has been created and sent!<br />Envelope ID {0}."
@@ -1520,7 +1522,7 @@
                      "CFREnabled":"AllAccounts",
                      "ExampleName":"Send an envelope with ID Verification Authentication",
                      "ExampleDescription":"Submit an envelope that requires verification of a government issued identity.",
-                     "Notes":"<p><b>Note:<b/> The access code for this example is the Signer Name.</p>",
+                     "Notes":"<b>Note:</b> The access code for this example is the Signer Name.",
                      "LinksToAPIMethod":[
                         {
                            "Path":"https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/",
@@ -1554,7 +1556,7 @@
                      "CFREnabled":"AllAccounts",
                      "ExampleName":"Send an envelope with Recipient Knowledged Based Authentication",
                      "ExampleDescription":"Submit an envelope with multiple choice, public records based questions to provide multi-factor authentication.",
-                     "Notes":"<p><b>Note:<b/> The access code for this example is the Signer Name.</p>",
+                     "Notes":"<b>Note:</b> The access code for this example is the Signer Name.",
                      "LinksToAPIMethod":[
                         {
                            "Path":"https://developers.docusign.com/docs/esign-rest-api/reference/envelopes/envelopes/create/",
@@ -1886,7 +1888,7 @@
                         }
                      ],
                      "ResultsPageText":"This value should match the value of your x-docusign-signature header: <br/>HMAC signature {0}",
-                     "SkipForLanguages":"bash;powershell;java;php"
+                     "SkipForLanguages":"bash;powershell"
                   }
                ]
             }
@@ -2711,8 +2713,7 @@
                            ]
                         }
                      ],
-                     "ResultsPageText":"Results from DataDeletion:redactIndividualMembershipData method:",
-                     "SkipForLanguages":"java"
+                     "ResultsPageText":"Results from DataDeletion:redactIndividualMembershipData method:"
                   },
                   {
                      "ExampleNumber":11,
@@ -2734,8 +2735,7 @@
                            ]
                         }
                      ],
-                     "ResultsPageText":"Results from DataDeletion:redactIndividualUserData method:",
-                     "SkipForLanguages":"java"
+                     "ResultsPageText":"Results from DataDeletion:redactIndividualUserData method:"
                   },
                   {
                      "ExampleNumber":12,
@@ -2783,4 +2783,4 @@
          ]
       }
    ]
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace DocuSign.CodeExamples.Admin.Controllers`
`17`	`17`	`using Newtonsoft.Json;`
`18`	`18`
`19`	`19`	`[Area("Admin")]`
`20`		`- [Route("Aeg011")]`
	`20`	`+ [Route("aeg011")]`
`21`	`21`	`public class DeleteUserDataFromAccount : EgController`
`22`	`22`	`{`
`23`	`23`	`public DeleteUserDataFromAccount(DsConfiguration config, LauncherTexts launcherTexts, IRequestItemsService requestItemsService)`
`@@ -27,7 +27,7 @@ public DeleteUserDataFromAccount(DsConfiguration config, LauncherTexts launcherT`
`27`	`27`	`this.ViewBag.title = this.CodeExampleText.ExampleName;`
`28`	`28`	`}`
`29`	`29`
`30`		`- public override string EgName => "Aeg011";`
	`30`	`+ public override string EgName => "aeg011";`
`31`	`31`
`32`	`32`	`[MustAuthenticate]`
`33`	`33`	`[SetViewBag]`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,12 @@ public static string PublishWorkFlow(DocuSignClient docuSignClient, string accou`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`
`53`		`- public static TriggerWorkflowViaPostResponse TriggerWorkflow(DocuSignClient docuSignClient, string accountId, Uri triggerUrl, WorkflowTriggerModel model)`
	`53`	`+ public static TriggerWorkflowViaPostResponse TriggerWorkflow(`
	`54`	`+ DocuSignClient docuSignClient,`
	`55`	`+ string accountId,`
	`56`	`+ Uri triggerUrl,`
	`57`	`+ WorkflowTriggerModel model,`
	`58`	`+ string workflowId)`
`54`	`59`	`{`
`55`	`60`	`//ds-snippet-start:Maestro1Step4`
`56`	`61`	`var maestroApi = new WorkflowTriggerApi(docuSignClient);`
`@@ -76,7 +81,7 @@ public static TriggerWorkflowViaPostResponse TriggerWorkflow(DocuSignClient docu`
`76`	`81`	`};`
`77`	`82`	`//ds-snippet-end:Maestro1Step4`
`78`	`83`	`//ds-snippet-start:Maestro1Step5`
`79`		`- return maestroApi.TriggerWorkflow(accountId, payload, options);`
	`84`	`+ return maestroApi.TriggerWorkflow(accountId, workflowId, payload, options);`
`80`	`85`	`//ds-snippet-end:Maestro1Step5`
`81`	`86`	`}`
`82`	`87`	`}`