feat(admin) add multipart/form-data support to admin api (80% solution)

Kong · Sep 15, 2018 · 857fbc7 · 857fbc7
1 parent 568a1b5
commit 857fbc7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/kong/api/arguments.lua b/kong/api/arguments.lua
@@ -653,17 +653,22 @@ local function load(opts)
     end
 
   elseif options.multipart and find(content_type_lower, "multipart/form-data", 1, true) == 1 then
-    local pargs, err = parse_multipart(options, content_type)
-    if pargs then
-      if options.decode then
-        args.post = decode(pargs, options.schema)
+    if options.request and options.request.params_post then
+      args.post = decode(options.request.params_post, options.schema)
 
-      else
-        args.post = pargs
-      end
+    else
+      local pargs, err = parse_multipart(options, content_type)
+      if pargs then
+        if options.decode then
+          args.post = decode(pargs, options.schema)
 
-    elseif err then
-      log(NOTICE, err)
+        else
+          args.post = pargs
+        end
+
+      elseif err then
+        log(NOTICE, err)
+      end
     end
 
   else

diff --git a/kong/api/init.lua b/kong/api/init.lua
@@ -11,6 +11,7 @@ local arguments   = require "kong.api.arguments"
 local Errors      = require "kong.db.errors"
 
 
+local ngx      = ngx
 local sub      = string.sub
 local find     = string.find
 local type     = type
@@ -209,7 +210,8 @@ local function attach_new_db_routes(routes)
     for method_name, method_handler in pairs(methods) do
       local wrapped_handler = function(self)
         self.args = arguments.load({
-          schema = schema,
+          schema  = schema,
+          request = self.req,
         })
 
         return method_handler(self, singletons.db, handler_helpers)