Merge pull request #217 from rod-hynes/master

Workaround for requestJSONObject vs. map[string]interface{} type issue

psiphon/server/api.go

@@ -587,7 +587,7 @@ func getJSONObjectRequestParam(params requestJSONObject, name string) (requestJS
 	if params[name] == nil {
 		return nil, common.ContextError(fmt.Errorf("missing param: %s", name))
 	}
-	// TODO: can't use requestJSONObject type?
+	// Note: generic unmarshal of JSON produces map[string]interface{}, not requestJSONObject
 	value, ok := params[name].(map[string]interface{})
 	if !ok {
 		return nil, common.ContextError(fmt.Errorf("invalid param: %s", name))
@@ -606,7 +606,7 @@ func getJSONObjectArrayRequestParam(params requestJSONObject, name string) ([]re
 
 	result := make([]requestJSONObject, len(value))
 	for i, item := range value {
-		// TODO: can't use requestJSONObject type?
+		// Note: generic unmarshal of JSON produces map[string]interface{}, not requestJSONObject
 		resultItem, ok := item.(map[string]interface{})
 		if !ok {
 			return nil, common.ContextError(fmt.Errorf("invalid param: %s", name))

psiphon/server/webServer.go

@@ -194,7 +194,7 @@ func convertHTTPRequestToAPIRequest(
 		if err != nil {
 			return nil, common.ContextError(err)
 		}
-		var bodyParams requestJSONObject
+		var bodyParams map[string]interface{}
 		err = json.Unmarshal(body, &bodyParams)
 		if err != nil {
 			return nil, common.ContextError(err)