Still allow accessing webhook.json after a wait

Author: rowanseymour

flows/runs/legacy.go

@@ -1,11 +1,13 @@
 package runs
 
 import (
+	"net/http"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 
+	"github.com/nyaruka/gocommon/httpx"
 	"github.com/nyaruka/goflow/envs"
 	"github.com/nyaruka/goflow/excellent/types"
 	"github.com/nyaruka/goflow/flows"
@@ -100,7 +102,7 @@ func arrayToObject(array *types.XArray) *types.XObject {
 }
 
 // finds the last webhook response that was saved as extra on a result
-func lastWebhookSavedAsExtra(r *run) types.XValue {
+func lastWebhookSavedAsExtra(r *run) *flows.WebhookCall {
 	for i := len(r.events) - 1; i >= 0; i-- {
 		switch typed := r.events[i].(type) {
 		case *events.WebhookCalledEvent:
@@ -110,11 +112,11 @@ func lastWebhookSavedAsExtra(r *run) types.XValue {
 			if resultEvent != nil {
 				asResultEvent := resultEvent.(*events.RunResultChangedEvent)
 				if asResultEvent.Extra != nil {
-					value := types.JSONToXValue([]byte(asResultEvent.Extra))
-					if value != nil {
-						value.SetDeprecated("webhook recreated from extra")
+					return &flows.WebhookCall{
+						Trace:        &httpx.Trace{Response: &http.Response{}},
+						ResponseJSON: asResultEvent.Extra,
+						Recreated:    true,
 					}
-					return value
 				}
 			}
 		default:

flows/runs/run.go

@@ -471,6 +471,8 @@ func ReadRun(session flows.Session, data json.RawMessage, missing assets.Missing
 		}
 	}
 
+	// create context
+	r.webhook = lastWebhookSavedAsExtra(r)
 	r.legacyExtra = newLegacyExtra(r)
 
 	return r, nil

flows/services.go

@@ -51,6 +51,7 @@ type WebhookCall struct {
 	*httpx.Trace
 	ResponseJSON    []byte
 	ResponseCleaned bool // whether response had to be cleaned to make it valid JSON
+	Recreated       bool // whether the call was recreated from a result
 }
 
 // Context returns the properties available in expressions
@@ -66,6 +67,19 @@ func (w *WebhookCall) Context(env envs.Environment) map[string]types.XValue {
 	headers := types.XObjectEmpty
 	var json types.XValue
 
+	// TODO remove when users stop relying on this
+	if w.Recreated {
+		json = types.JSONToXValue(w.ResponseJSON)
+		if types.IsXError(json) {
+			json = nil
+		}
+		if json != nil {
+			json.SetDeprecated("webhook recreated from extra")
+		}
+
+		return map[string]types.XValue{"json": json}
+	}
+
 	if w.Response != nil {
 		status = types.NewXNumberFromInt(w.Response.StatusCode)
 

test/testdata/runner/webhook_results.test.json

@@ -605,14 +605,14 @@
                 {
                     "created_on": "2018-07-06T12:31:02.123456789Z",
                     "step_uuid": "44fe8d72-00ed-4736-acca-bbca70987315",
-                    "text": "error evaluating @webhook.json: null doesn't support lookups",
-                    "type": "error"
+                    "text": "deprecated context value accessed: webhook recreated from extra",
+                    "type": "warning"
                 },
                 {
                     "created_on": "2018-07-06T12:31:04.123456789Z",
                     "msg": {
                         "locale": "eng-US",
-                        "text": "Finally..\n\n1. \n2. {greeting: hello}\n3. ",
+                        "text": "Finally..\n\n1. \n2. {greeting: hello}\n3. {greeting: hello}",
                         "unsendable_reason": "no_destination",
                         "uuid": "688e64f9-2456-4b42-afcb-91a2073e5459"
                     },
@@ -805,14 +805,14 @@
                             {
                                 "created_on": "2018-07-06T12:31:02.123456789Z",
                                 "step_uuid": "44fe8d72-00ed-4736-acca-bbca70987315",
-                                "text": "error evaluating @webhook.json: null doesn't support lookups",
-                                "type": "error"
+                                "text": "deprecated context value accessed: webhook recreated from extra",
+                                "type": "warning"
                             },
                             {
                                 "created_on": "2018-07-06T12:31:04.123456789Z",
                                 "msg": {
                                     "locale": "eng-US",
-                                    "text": "Finally..\n\n1. \n2. {greeting: hello}\n3. ",
+                                    "text": "Finally..\n\n1. \n2. {greeting: hello}\n3. {greeting: hello}",
                                     "unsendable_reason": "no_destination",
                                     "uuid": "688e64f9-2456-4b42-afcb-91a2073e5459"
                                 },