Maestro updates (#99)

* Updating the web-form-config.json for the Web Forms example

* updating workflow definition

* Maestro changes

* decoding final URL

---------

Co-authored-by: inbargazit <[email protected]>

Author: paigesrossi

examples/Maestro/eg001TriggerWorkflow.sh

@@ -7,14 +7,14 @@ if [[ $SHELL != *"bash"* ]]; then
     echo "PROBLEM: Run these scripts from within the bash shell."
 fi
 
-workflow_id=$(cat config/WORKFLOW_ID)
-if [ -z "$workflow_id" ]; then
+workflow_created=$(cat config/WORKFLOW_ID)
+if [ -z "$workflow_created" ]; then
     bash ./examples/Maestro/utils.sh
 fi
 
 #check that create workflow script ran successfully
-workflow_id=$(cat config/WORKFLOW_ID)
-if [ -z "$workflow_id" ]; then
+workflow_created=$(cat config/WORKFLOW_ID)
+if [ -z "$workflow_created" ]; then
     echo "please create a worklow before running this example"
     exit 0
 fi
@@ -28,7 +28,7 @@ ACCESS_TOKEN=$(cat config/ds_access_token.txt)
 # Note: Substitute these values with your own
 account_id=$(cat config/API_ACCOUNT_ID)
 
-base_path="https://demo.services.docusign.net/aow-manage/v1.0"
+base_path="https://api-d.docusign.com/v1"
 
 # Construct your API headers
 #ds-snippet-start:Maestro1Step2
@@ -43,20 +43,46 @@ echo ""
 #ds-snippet-start:Maestro1Step3
 response=$(mktemp /tmp/response-wftmp.XXXXXX)
 Status=$(
-    curl -w '%{http_code}' -i --request GET "${base_path}/management/accounts/${account_id}/workflowDefinitions/${workflow_id}" \
+    curl -w '%{http_code}' --request GET "${base_path}/accounts/${account_id}/workflows" \
     "${Headers[@]}" \
     --output ${response}
 )
 # If the status code returned is greater than 201 (OK / Accepted), display an error message with the API response.
 if [[ "$Status" -gt "201" ]]; then
     echo ""
-    echo "Unable to retrieve workflow definition with workflow ID: ${workflow_id}"
+    echo "Unable to retrieve a workflow definition"
     echo ""
     cat $response
     exit 0
 fi
 
-trigger_url=`cat $response | grep triggerUrl | sed 's/.*\"triggerUrl\":\"//' | sed 's/\",.*//'`
+echo "Response:"
+cat $response
+echo ""
+
+workflow_id=$(grep -B 1 '"name": "Example workflow - send invite to signer"' $response | grep '"id":' | sed -n 's/.*"id": "\([^"]*\)".*/\1/p')
+
+# Get the trigger URL
+response=$(mktemp /tmp/response-wftmp.XXXXXX)
+Status=$(curl -s -w "%{http_code}\n" -i --request GET "${base_path}/accounts/${account_id}/workflows/${workflow_id}/trigger-requirements" \
+    "${Headers[@]}" \
+    --output ${response})
+
+# If the status code returned is greater than 201 (OK / Accepted), display an error message with the API response.
+if [[ "$Status" -gt "201" ]]; then
+    echo ""
+    echo "Unable to trigger a new instance of the specified workflow ${workflow_id}"
+    echo ""
+    cat $response
+    exit 0
+fi
+
+echo "Response:"
+cat $response
+echo ""
+
+trigger_url=$(grep '"url":' $response | sed -n 's/.*"url": "\([^"]*\)".*/\1/p')
+decoded_trigger_url=$(echo $trigger_url | sed 's/\\u0026/\&/g')
 #ds-snippet-end:Maestro1Step3
 
 echo "Please input a name for the workflow instance: "
@@ -78,36 +104,26 @@ read cc_email
 request_data=$(mktemp /tmp/request-wf-001.XXXXXX)
 printf \
 '{
-  "instanceName": "'"$instance_name"'",
-  "participants": {},
-  "payload": {
+  "instance_name": "'"$instance_name"'",
+  "trigger_inputs": {
     "signerEmail": "'"${signer_email}"'",
     "signerName": "'"${signer_name}"'",
     "ccEmail": "'"${cc_email}"'",
     "ccName": "'"${cc_name}"'"
-  },
-  "metadata": {}
+  }
 }' >$request_data
 #ds-snippet-end:Maestro1Step4
 
 #ds-snippet-start:Maestro1Step5
 response=$(mktemp /tmp/response-wftmp.XXXXXX)
-Status=$(curl -s -w "%{http_code}\n" --request POST ${trigger_url} \
+Status=$(curl -s -w "%{http_code}\n" -i --request POST ${decoded_trigger_url} \
     "${Headers[@]}" \
     --data-binary @${request_data} \
     --output ${response})
 #ds-snippet-end:Maestro1Step5
 
-# If the status code returned is greater than 201 (OK / Accepted), display an error message with the API response.
-if [[ "$Status" -gt "201" ]]; then
-    echo ""
-    echo "Unable to trigger a new instance of the specified workflow ${workflow_id}"
-    echo ""
-    cat $response
-    exit 0
-fi
 
-instance_id=`cat $response | grep instanceId | sed 's/.*\"instanceId\":\"//' | sed 's/\".*//'`
+instance_id=`cat $response | grep instance_id | sed 's/.*\"instance_id\":\"//' | sed 's/\".*//'`
 # Store the instance_id into the config file
 echo $instance_id >config/INSTANCE_ID
 
@@ -116,6 +132,12 @@ echo "Response:"
 cat $response
 echo ""
 
+instance_url=$(grep '"instance_url":' $response | sed -n 's/.*"instance_url": "\([^"]*\)".*/\1/p')
+decoded_instance_url=$(echo $instance_url | sed 's/\\u0026/\&/g')
+echo ""
+echo "Use this URL to complete the workflow steps:"
+echo $decoded_instance_url
+
 # Remove the temporary files
 rm "$request_data"
 rm "$response"

examples/Maestro/eg002CancelWorkflow.sh

@@ -101,7 +101,8 @@ printf \
                     "propertyName": "dacId",
                     "stepId": "'"${TRIGGER_ID}"'"
                 }
-            }
+            },
+            "type": "API"
         },
         "variables": {
             "dacId_'"${TRIGGER_ID}"'": {
@@ -154,46 +155,6 @@ printf \
             }
         },
         "steps": [
-            {
-                "id": "step1",
-                "name": "Set Up Invite",
-                "moduleName": "Notification-SendEmail",
-                "configurationProgress": "Completed",
-                "type": "DS-EmailNotification",
-                "config": {
-                    "templateType": "WorkflowParticipantNotification",
-                    "templateVersion": 1,
-                    "language": "en",
-                    "sender_name": "DocuSign Orchestration",
-                    "sender_alias": "Orchestration",
-                    "participantId": "'"${SIGNER_ID}"'"
-                },
-                "input": {
-                    "recipients": [
-                        {
-                            "name": {
-                                "source": "step",
-                                "propertyName": "signerName",
-                                "stepId": "'"${TRIGGER_ID}"'"
-                            },
-                            "email": {
-                                "source": "step",
-                                "propertyName": "signerEmail",
-                                "stepId": "'"${TRIGGER_ID}"'"
-                            }
-                        }
-                    ],
-                    "mergeValues": {
-                        "CustomMessage": "Follow this link to access and complete the workflow.",
-                        "ParticipantFullName": {
-                            "source": "step",
-                            "propertyName": "signerName",
-                            "stepId": "'"${TRIGGER_ID}"'"
-                        }
-                    }
-                },
-                "output": {}
-            },
             {
                 "id": "step2",
                 "name": "Get Signatures",
@@ -580,7 +541,8 @@ printf \
                         }
                     }
                 },
-                "output": {}
+                "output": {},
+                "triggerType": "API"
             }
         ]
     }

examples/Maestro/eg003GetWorkflowStatus.sh

@@ -951,8 +951,6 @@ function startMaestro() {
     PS3='Select the action : '
     select CHOICE in \
         "Trigger_Workflow" \
-        "Stop_Workflow" \
-        "Get_Workflow_Status"\
         "Home"; do
         case "$CHOICE" in
 
@@ -963,14 +961,6 @@ function startMaestro() {
             bash examples/Maestro/eg001TriggerWorkflow.sh
             startMaestro
             ;;
-        Stop_Workflow)
-            bash examples/Maestro/eg002CancelWorkflow.sh
-            startMaestro
-            ;;
-        Get_Workflow_Status)
-            bash examples/Maestro/eg003GetWorkflowStatus.sh
-            startMaestro
-            ;;
         *)
             echo "Default action..."
             startMaestro