Added ability to bind to json blobs

notzippy · notzippy · commit 100fc2e127cb · 2017-05-02T21:29:38.000-07:00
diff --git a/binder.go b/binder.go
@@ -14,6 +14,7 @@ import (
 	"strconv"
 	"strings"
 	"time"
+    "encoding/json"
 )
 
 // A Binder translates between string parameters and Go data structures.
@@ -290,7 +291,16 @@ func unbindSlice(output map[string]string, name string, val interface{}) {
 }
 
 func bindStruct(params *Params, name string, typ reflect.Type) reflect.Value {
-	result := reflect.New(typ).Elem()
+    resultPointer:= reflect.New(typ)
+	result := resultPointer.Elem()
+    if params.JsonRequest {
+        // Try to inject the response as a json into the created result
+        if err := json.Unmarshal(params.Json, resultPointer.Interface());err!=nil {
+            WARN.Println("W: bindStruct: Unable to unmarshal request:", name,err)
+        }
+        return result
+
+    }
 	fieldValues := make(map[string]reflect.Value)
 	for key := range params.Values {
 		if !strings.HasPrefix(key, name+".") {
diff --git a/params.go b/params.go
@@ -9,6 +9,7 @@ import (
 	"net/url"
 	"os"
 	"reflect"
+    "io/ioutil"
 )
 
 // Params provides a unified view of the request params.
@@ -31,6 +32,8 @@ type Params struct {
 
 	Files    map[string][]*multipart.FileHeader // Files uploaded in a multipart form
 	tmpFiles []*os.File                         // Temp files used during the request.
+    Json []byte
+    JsonRequest bool
 }
 
 // ParseParams parses the `http.Request` params into `revel.Controller.Params`
@@ -54,6 +57,13 @@ func ParseParams(params *Params, req *Request) {
 			params.Form = mp.GetValue()
 			params.Files = mp.GetFile()
 		}
+    case "application/json":
+        fallthrough
+    case "text/json":
+        content, _ := ioutil.ReadAll(req.GetBody())
+        // We wont bind it until we determine what we are binding too
+        params.Json = content
+        params.JsonRequest = true
 	}
 
 	params.Values = params.calcValues()
diff --git a/validation.go b/validation.go
@@ -185,50 +185,56 @@ func (v *Validation) Check(obj interface{}, checks ...Validator) *ValidationResu
 
 // ValidationFilter revel Filter function to be hooked into the filter chain.
 func ValidationFilter(c *Controller, fc []Filter) {
-	errors, err := restoreValidationErrors(c.Request)
-	c.Validation = &Validation{
-		Errors: errors,
-		keep:   false,
-	}
-	hasCookie := (err != http.ErrNoCookie)
-
-	fc[0](c, fc[1:])
-
-	// Add Validation errors to ViewArgs.
-	c.ViewArgs["errors"] = c.Validation.ErrorMap()
-
-	// Store the Validation errors
-	var errorsValue string
-	if c.Validation.keep {
-		for _, error := range c.Validation.Errors {
-			if error.Message != "" {
-				errorsValue += "\x00" + error.Key + ":" + error.Message + "\x00"
-			}
-		}
-	}
-
-	// When there are errors from Validation and Keep() has been called, store the
-	// values in a cookie. If there previously was a cookie but no errors, remove
-	// the cookie.
-	if errorsValue != "" {
-		c.SetCookie(&http.Cookie{
-			Name:     CookiePrefix + "_ERRORS",
-			Value:    url.QueryEscape(errorsValue),
-			Domain:   CookieDomain,
-			Path:     "/",
-			HttpOnly: true,
-			Secure:   CookieSecure,
-		})
-	} else if hasCookie {
-		c.SetCookie(&http.Cookie{
-			Name:     CookiePrefix + "_ERRORS",
-			MaxAge:   -1,
-			Domain:   CookieDomain,
-			Path:     "/",
-			HttpOnly: true,
-			Secure:   CookieSecure,
-		})
-	}
+    // Ignore cookies on json requests
+    if c.Params !=nil && c.Params.JsonRequest {
+        c.Validation = &Validation{}
+        fc[0](c, fc[1:])
+    } else {
+        errors, err := restoreValidationErrors(c.Request)
+        c.Validation = &Validation{
+            Errors: errors,
+            keep:   false,
+        }
+        hasCookie := (err != http.ErrNoCookie)
+
+        fc[0](c, fc[1:])
+
+        // Add Validation errors to ViewArgs.
+        c.ViewArgs["errors"] = c.Validation.ErrorMap()
+
+        // Store the Validation errors
+        var errorsValue string
+        if c.Validation.keep {
+            for _, error := range c.Validation.Errors {
+                if error.Message != "" {
+                    errorsValue += "\x00" + error.Key + ":" + error.Message + "\x00"
+                }
+            }
+        }
+
+        // When there are errors from Validation and Keep() has been called, store the
+        // values in a cookie. If there previously was a cookie but no errors, remove
+        // the cookie.
+        if errorsValue != "" {
+            c.SetCookie(&http.Cookie{
+                Name:     CookiePrefix + "_ERRORS",
+                Value:    url.QueryEscape(errorsValue),
+                Domain:   CookieDomain,
+                Path:     "/",
+                HttpOnly: true,
+                Secure:   CookieSecure,
+            })
+        } else if hasCookie {
+            c.SetCookie(&http.Cookie{
+                Name:     CookiePrefix + "_ERRORS",
+                MaxAge:   -1,
+                Domain:   CookieDomain,
+                Path:     "/",
+                HttpOnly: true,
+                Secure:   CookieSecure,
+            })
+        }
+    }
 }
 
 // Restore Validation.Errors from a request.
