Merge branch 'master' of https://github.com/docusign/code-examples-java-private

Author: paigesrossi

pom.xml

@@ -26,7 +26,7 @@
         <oauth2.version>2.5.6</oauth2.version>
         <commonsio.version>2.16.1</commonsio.version>
 
-        <esignature.version>4.6.0-RC1</esignature.version>
+        <esignature.version>5.0.0-RC1</esignature.version>
         <rooms.version>1.4.3</rooms.version>
         <click.version>1.5.0</click.version>
         <monitor.version>1.4.0</monitor.version>

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

@@ -58,13 +58,11 @@ protected Object doWork(WorkArguments args, ModelMap model,
                 envelopesApi,
                 accountId,
                 envelopeId,
-                config.getDsReturnUrl());
+                config.getDsReturnUrl(),
+                args.getStartingView());
 
         // Switch to Recipient and Documents view if requested by the user
         String url = viewUrl.getUrl();
-        if ("recipient".equalsIgnoreCase(args.getStartingView())) {
-            url = url.replace("send=1", "send=0");
-        }
 
         return new RedirectView(url);
     }

src/main/java/com/docusign/controller/eSignature/services/EmbeddedSendingService.java

@@ -6,7 +6,12 @@
 import com.docusign.esign.client.ApiException;
 import com.docusign.esign.model.EnvelopeDefinition;
 import com.docusign.esign.model.EnvelopeSummary;
-import com.docusign.esign.model.ReturnUrlRequest;
+import com.docusign.esign.model.EnvelopeViewDocumentSettings;
+import com.docusign.esign.model.EnvelopeViewRecipientSettings;
+import com.docusign.esign.model.EnvelopeViewRequest;
+import com.docusign.esign.model.EnvelopeViewSettings;
+import com.docusign.esign.model.EnvelopeViewTaggerSettings;
+import com.docusign.esign.model.EnvelopeViewTemplateSettings;
 import com.docusign.esign.model.ViewUrl;
 
 import java.io.IOException;
@@ -17,13 +22,46 @@ public static ViewUrl createSenderView(
             EnvelopesApi envelopesApi,
             String accountId,
             String envelopeId,
-            String dsReturnUrl
+            String dsReturnUrl,
+            String startingScreen
     ) throws ApiException {
         // Create the sender view.
         // Set the url where you want the recipient to go once they are done
         // signing should typically be a callback route somewhere in your app.
-        ReturnUrlRequest viewRequest = new ReturnUrlRequest();
+        EnvelopeViewRecipientSettings recipientSettings = new EnvelopeViewRecipientSettings();
+        recipientSettings.setShowEditRecipients("false");
+        recipientSettings.setShowContactsList("false");
+
+        EnvelopeViewDocumentSettings documentSettings = new EnvelopeViewDocumentSettings();
+        documentSettings.setShowEditDocuments("false");
+        documentSettings.setShowEditDocumentVisibility("false");
+        documentSettings.setShowEditPages("false");
+
+        EnvelopeViewTaggerSettings taggerSettings = new EnvelopeViewTaggerSettings();
+        taggerSettings.setPaletteSections("default");
+        taggerSettings.setPaletteDefault("custom");
+
+        EnvelopeViewTemplateSettings templateSettings = new EnvelopeViewTemplateSettings();
+        templateSettings.setShowMatchingTemplatesPrompt("true");
+
+        EnvelopeViewSettings viewSettings = new EnvelopeViewSettings();
+        viewSettings.setStartingScreen(startingScreen);
+        viewSettings.setSendButtonAction("send");
+        viewSettings.setShowBackButton("false");
+        viewSettings.setBackButtonAction("previousPage");
+        viewSettings.setShowHeaderActions("false");
+        viewSettings.setShowDiscardAction("false");
+        viewSettings.setLockToken("");
+        viewSettings.setRecipientSettings(recipientSettings);
+        viewSettings.setDocumentSettings(documentSettings);
+        viewSettings.setTaggerSettings(taggerSettings);
+        viewSettings.setTemplateSettings(templateSettings);
+
+        EnvelopeViewRequest viewRequest = new EnvelopeViewRequest();
         viewRequest.setReturnUrl(dsReturnUrl);
+        viewRequest.setViewAccess("envelope");
+        viewRequest.setSettings(viewSettings);
+
         return envelopesApi.createSenderView(accountId, envelopeId, viewRequest);
     }
     //ds-snippet-end:eSign11Step3

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

@@ -28,8 +28,8 @@
         </label>
 
         <select id="startingView" name="startingView" class="form-control">
-            <option value="tagging" selected>Tagging view</option>
-            <option value="recipient">Recipient &amp; Documents view</option>
+            <option value="Tagger" selected>Tagging view</option>
+            <option value="Prepare">Prepare view</option>
         </select>
     </div>
     <div class="form-group">