Merge branch 'master' into fix/updated-maestro-to-work-with-new-sdk

Author: InbarGazit

src/main/java/com/docusign/controller/eSignature/examples/EG020ControllerPhoneAuthentication.java

@@ -50,6 +50,10 @@ protected void onInitModel(WorkArguments args, ModelMap model) throws Exception
     @Override
     protected Object doWork(WorkArguments args, ModelMap model, HttpServletResponse response)
             throws ApiException, IOException {
+        if (args.getSignerEmail().equals(config.getSignerEmail())) {
+            throw new ApiException(config.getCodeExamplesText().SupportingTexts.IdenticalEmailsNotAllowedErrorMessage);
+        }
+
         String accountId = session.getAccountId();
 
         ApiClient apiClient = createApiClient(session.getBasePath(), user.getAccessToken());

src/main/java/com/docusign/controller/eSignature/examples/EG022ControllerKBAAuthentication.java

@@ -33,6 +33,10 @@ public EG022ControllerKBAAuthentication(DSConfiguration config, Session session,
     // ***DS.snippet.0.start
     protected Object doWork(WorkArguments args, ModelMap model,
                             HttpServletResponse response) throws ApiException, IOException {
+        if (args.getSignerEmail().equals(config.getSignerEmail())) {
+                throw new ApiException(config.getCodeExamplesText().SupportingTexts.IdenticalEmailsNotAllowedErrorMessage);
+        }
+
         // Step 1: Construct your API headers
         EnvelopesApi envelopesApi = createEnvelopesApi(session.getBasePath(), user.getAccessToken());
 

src/main/java/com/docusign/controller/eSignature/examples/EG023ControllerIdvAuthentication.java

@@ -35,6 +35,10 @@ public EG023ControllerIdvAuthentication(DSConfiguration config, Session session,
 
     @Override
     protected Object doWork(WorkArguments args, ModelMap model, HttpServletResponse response) throws ApiException, IOException {
+        if (args.getSignerEmail().equals(config.getSignerEmail())) {
+            throw new ApiException(config.getCodeExamplesText().SupportingTexts.IdenticalEmailsNotAllowedErrorMessage);
+        }
+
         ApiClient apiClient = createApiClient(session.getBasePath(), user.getAccessToken());
         EnvelopesApi envelopesApi = new EnvelopesApi(apiClient);
         String workflowId = IdvAuthenticationService.retrieveWorkflowId(apiClient, session.getAccountId());

src/main/java/com/docusign/core/model/manifestModels/SupportingTexts.java

@@ -34,6 +34,8 @@ public class SupportingTexts {
 
     public String CFRError;
 
+    public String IdenticalEmailsNotAllowedErrorMessage;
+
     public LoginPage LoginPage;
 
     public SelectAPIPage SelectAPIPage;

src/main/webapp/WEB-INF/templates/views/pages/esignature/examples/eg020.jsp

@@ -62,8 +62,7 @@
                name="signerEmail"
                aria-describedby="emailHelp"
                placeholder="${example.getForms().get(formNumber).getInputs().get(signerEmailInputNumber).getInputPlaceholder()}"
-               required
-               value="${locals.dsConfig.signerEmail}">
+               required>
 
         <small id="emailHelp" class="form-text text-muted">
             ${launcherTexts.getHelpingTexts().getEmailWontBeShared()}
@@ -79,7 +78,6 @@
                id="signerName"
                placeholder="${example.getForms().get(formNumber).getInputs().get(signerNameInputNumber).getInputPlaceholder()}"
                name="signerName"
-               value="${locals.dsConfig.signerName}"
                required>
     </div>
     <input type="hidden" name="_csrf" value="${csrfToken}">

src/main/webapp/WEB-INF/templates/views/pages/esignature/examples/eg022.jsp

@@ -7,7 +7,6 @@
 
 <h4>${example.getExampleName()}</h4>
 <p>${example.getExampleDescription()}</p>
-<p>${example.getNotes()}</p>
 
 <c:if test="${showDoc}">
     <p><a target='_blank' href='${documentation}'>Documentation</a> about this example.</p>
@@ -32,8 +31,7 @@
                name="signerEmail"
                aria-describedby="emailHelp"
                placeholder="${example.getForms().get(formNumber).getInputs().get(signerEmailInputNumber).getInputPlaceholder()}"
-               required
-               value="${locals.dsConfig.signerEmail}">
+               required>
 
         <small id="emailHelp" class="form-text text-muted">
             ${launcherTexts.getHelpingTexts().getEmailWontBeShared()}
@@ -49,7 +47,6 @@
                id="signerName"
                placeholder="${example.getForms().get(formNumber).getInputs().get(signerNameInputNumber).getInputPlaceholder()}"
                name="signerName"
-               value="${locals.dsConfig.signerName}"
                required>
     </div>
     <input type="hidden" name="_csrf" value="${csrfToken}">

src/main/webapp/WEB-INF/templates/views/pages/esignature/examples/eg023.jsp

@@ -7,7 +7,6 @@
 
 <h4>${example.getExampleName()}</h4>
 <p>${example.getExampleDescription()}</p>
-<p>${example.getNotes()}</p>
 
 <c:if test="${showDoc}">
     <p><a target='_blank' href='${documentation}'>Documentation</a> about this example.</p>
@@ -31,8 +30,7 @@
                name="signerEmail"
                aria-describedby="emailHelp"
                placeholder="${example.getForms().get(formNumber).getInputs().get(signerEmailInputNumber).getInputPlaceholder()}"
-               required
-               value="${locals.dsConfig.signerEmail}">
+               required>
 
         <small id="emailHelp" class="form-text text-muted">
             ${launcherTexts.getHelpingTexts().getEmailWontBeShared()}
@@ -48,7 +46,6 @@
                id="signerName"
                placeholder="${example.getForms().get(formNumber).getInputs().get(signerNameInputNumber).getInputPlaceholder()}"
                name="signerName"
-               value="${locals.dsConfig.signerName}"
                required>
     </div>
     <input type="hidden" name="_csrf" value="${csrfToken}">