merging phone auth changes

Author: paigesrossi

config/documentNames.json

@@ -19,8 +19,7 @@
       "eg017": "eg017SetTemplateTabValues.js",
       "eg018": "eg018EnvelopeCustomFieldData.js",
       "eg019": "eg019AccessCodeAuthentication.js",
-      "eg020": "eg020SmsAuthentication.js",
-      "eg021": "eg021PhoneAuthentication.js",
+      "eg020": "eg020PhoneAuthentication.js",
       "eg022": "eg022KbaAuthentication.js",
       "eg023": "eg023IdvAuthentication.js",
       "eg024": "eg024CreateBrand.js",

index.js

@@ -24,7 +24,7 @@ const eg001 = require('./eg001EmbeddedSigning');
 const {
   eg002, eg003, eg004, eg005, eg006, eg007, eg008,
   eg009, eg010, eg011, eg012, eg013, eg014, eg015,
-  eg016, eg017, eg018, eg019, eg020, eg021, eg022,
+  eg016, eg017, eg018, eg019, eg020, eg022,
   eg023, eg024, eg025, eg026, eg027, eg028, eg029,
   eg030, eg031, eg032, eg033, eg034, eg035,
 } = require("./lib/eSignature/controllers");
@@ -187,8 +187,6 @@ if (dsConfig.examplesApi.isRoomsApi) {
     .post('/eg019', eg019.createController)
     .get('/eg020', eg020.getController)
     .post('/eg020', eg020.createController)
-    .get('/eg021', eg021.getController)
-    .post('/eg021', eg021.createController)
     .get('/eg022', eg022.getController)
     .post('/eg022', eg022.createController)
     .get('/eg023', eg023.getController)

…/controllers/eg021PhoneAuthentication.js …/controllers/eg020PhoneAuthentication.jslib/eSignature/controllers/eg021PhoneAuthentication.js renamed to lib/eSignature/controllers/eg020PhoneAuthentication.js lib/eSignature/controllers/eg021PhoneAuthentication.js renamed to lib/eSignature/controllers/eg020PhoneAuthentication.js

@@ -1,6 +1,6 @@
 /**
  * @file
- * Example 021: Phone-based recipient authentication
+ * Example 020: Phone authentication
  * @author DocuSign
  */
 
@@ -9,8 +9,8 @@ const { phoneAuthentication } = require('../examples/phoneAuthentication');
 const validator = require('validator');
 const dsConfig = require('../../../config/index.js').config;
 
-const eg021PhoneAuthentication = exports;
-const eg = 'eg021'; // This example reference.
+const eg020PhoneAuthentication = exports;
+const eg = 'eg020'; // This example reference.
 const mustAuthenticate = '/ds/mustAuthenticate';
 const minimumBufferMin = 3;
 
@@ -19,7 +19,7 @@ const minimumBufferMin = 3;
  * @param {object} req Request obj
  * @param {object} res Response obj
  */
-eg021PhoneAuthentication.createController = async (req, res) => {
+eg020PhoneAuthentication.createController = async (req, res) => {
     // Step 1: Obtain your OAuth token
     // At this point we should have a good token. But we
     // double-check here to enable a better UX to the user.
@@ -36,7 +36,8 @@ eg021PhoneAuthentication.createController = async (req, res) => {
     const envelopeArgs  = {
         signerEmail: validator.escape(body.signerEmail), // represents your {SIGNER_EMAIL}
         signerName: validator.escape(body.signerName),    // represents your {SIGNER_NAME}
-        phoneNumber: validator.escape(body.phoneNumber)
+        phoneNumber: validator.escape(body.phoneNumber),   // represents your phone number
+        countryCode: validator.escape(body.countryCode)   // represents your country code
     };
     const args = {
         accessToken: req.user.accessToken,  // represents your {ACCESS_TOKEN}
@@ -47,9 +48,10 @@ eg021PhoneAuthentication.createController = async (req, res) => {
     let results = null;
 
     try {
-	    // Step 2: Send the envelope
+        // Step 2: Call the api method
         results = await phoneAuthentication(args);
-	}
+        console.log("WorkflowId: " + results.workflowId);
+    }
     catch (error) {
         const errorBody = error && error.response && error.response.body;
         // we can pull the DocuSign error code and message from the response body
@@ -59,34 +61,36 @@ eg021PhoneAuthentication.createController = async (req, res) => {
         // remediation advice to the user.
         res.render('pages/error', {err: error, errorCode, errorMessage});
     }
+	
     if (results) {
         req.session.envelopeId = results.envelopeId; 	// Save for use by other examples
-														// which need an envelopeId
+	    												// which need an envelopeId
         res.render('pages/example_done', {
-            title: "Envelope sent",
-            h1: "Envelope sent",
+            title: "Require Phone Authentication for a Recipient",
+            h1: "Require Phone Authentication for a Recipient",
             message: `The envelope has been created and sent!<br/>Envelope ID ${results.envelopeId}.`
         });
     }
 }
 
+
+
 // ***DS.snippet.0.end
 
 /**
  * Form page for this application
  */
-eg021PhoneAuthentication.getController = (req, res) => {
+eg020PhoneAuthentication.getController = (req, res) => {
     // Check that the authentication token is ok with a long buffer time.
     // If needed, now is the best time to ask the user to authenticate
     // since they have not yet entered any information into the form.
     const tokenOK = req.dsAuth.checkToken();
     if (tokenOK) {
-        sourceFile = (path.basename(__filename))[5].toLowerCase() + (path.basename(__filename)).substr(6);
-        res.render('pages/examples/eg021PhoneAuthentication', {
+        res.render('pages/examples/eg020PhoneAuthentication', {
             eg: eg, csrfToken: req.csrfToken(),
-            title: "Signing request by email",
-            sourceFile: sourceFile,
-            sourceUrl: dsConfig.githubExampleUrl + 'eSignature/examples/' + sourceFile,
+            title: "Require Phone Authentication for a Recipient",
+            sourceFile: path.basename(__filename),
+            sourceUrl: dsConfig.githubExampleUrl + 'eSignature/' + path.basename(__filename),
             documentation: dsConfig.documentation + eg,
             showDoc: dsConfig.documentation
         });
@@ -95,4 +99,4 @@ eg021PhoneAuthentication.getController = (req, res) => {
         req.dsAuth.setEg(req, eg);
         res.redirect(mustAuthenticate);
     }
-}
+}

lib/eSignature/controllers/eg020SmsAuthentication.js

@@ -17,8 +17,7 @@ module.exports.eg016 = require('./eg016SetTabValues');
 module.exports.eg017 = require('./eg017SetTemplateTabValues');
 module.exports.eg018 = require('./eg018EnvelopeCustomFieldData');
 module.exports.eg019 = require('./eg019AccessCodeAuthentication');
-module.exports.eg020 = require('./eg020SmsAuthentication');
-module.exports.eg021 = require('./eg021PhoneAuthentication');
+module.exports.eg020 = require('./eg020PhoneAuthentication');
 module.exports.eg022 = require('./eg022KbaAuthentication');
 module.exports.eg023 = require('./eg023IdvAuthentication');
 module.exports.eg024 = require('./eg024CreatePermission');