Merge pull request #27 from stone-payments/release/v0.5.0

[master] Release/v0.5.0

Author: Pedro Fadel

CHANGELOG.md

@@ -5,9 +5,14 @@ All changes made on any release of this project should be commented on high leve
 Document model based on [Semantic Versioning](http://semver.org/).
 Examples of how to use this _markdown_ cand be found here [Keep a CHANGELOG](http://keepachangelog.com/).
 
+
+## [0.5.0](https://github.com/stone-payments/kong-plugin-url-rewrite/tree/v0.5.0) - 2020-03-05
+### Added
+- Support to querystring field.
+
 ## [0.4.0](https://github.com/stone-payments/kong-plugin-url-rewrite/tree/v0.4.0) - 2018-12-26
 ### Added
-- support to parameter replacing when rewriting URL.
+- Support to parameter replacing when rewriting URL.
 
 ## [0.3.0](https://github.com/stone-payments/kong-plugin-url-rewrite/tree/v0.3.0) - 2018-10-30
 ### Added

kong-plugin-url-rewrite-0.4.0-0.rockspec kong-plugin-url-rewrite-0.5.0-0.rockspeckong-plugin-url-rewrite-0.4.0-0.rockspec renamed to kong-plugin-url-rewrite-0.5.0-0.rockspec

@@ -1,5 +1,5 @@
 package = "kong-plugin-url-rewrite"
-version = "0.4.0-0"
+version = "0.5.0-0"
 source = {
    url = "git://github.com/stone-payments/kong-plugin-url-rewrite",
 }

url-rewrite/handler.lua

@@ -4,6 +4,14 @@ local URLRewriter = BasePlugin:extend()
 
 URLRewriter.PRIORITY = 700
 
+function split(s, delimiter)
+  result = {}
+  for match in (s..delimiter):gmatch("(.-)"..delimiter) do
+      table.insert(result, match)
+  end
+  return result
+end
+
 function URLRewriter:new()
   URLRewriter.super.new(self, "url-rewriter")
 end
@@ -22,8 +30,22 @@ end
 
 function URLRewriter:access(config)
   URLRewriter.super.access(self)
+
+  if config.query_string ~= nil then
+    local args = ngx.req.get_uri_args()
+    for k, queryString in ipairs(config.query_string) do
+      local splitted = split(queryString, '=')
+      local key, value = splitted[1], splitted[2]
+      local queryParams = getRequestUrlParams(value)
+      local resolvedParams = resolveUrlParams(queryParams, value)
+      args[key] = resolvedParams
+    end
+    ngx.req.set_uri_args(args)
+  end
+
   requestParams = getRequestUrlParams(config.url)
-  ngx.var.upstream_uri = resolveUrlParams(requestParams, config.url)
+  local url = resolveUrlParams(requestParams, config.url)
+  ngx.var.upstream_uri = url
 end
 
 return URLRewriter

url-rewrite/schema.lua

@@ -1,6 +1,7 @@
 return {
   no_consumer = true,
   fields = {
-    url = {required = true, type = "string"}
+    url = {required = true, type = "string"},
+    query_string = {required = false, type = "table"}
   }
 }

url-rewrite/spec/handler_spec.lua

@@ -8,6 +8,10 @@ local ngx =  {
       router_matches = {
         uri_captures = {}
       }
+    },
+    req = {
+      get_uri_args = spy.new(function() return {} end),
+      set_uri_args = spy.new(function() end)
     }
 }
 
@@ -53,4 +57,22 @@ describe("TestHandler", function()
 
     assert.equal("url/123456/test", result)
   end)
+
+  it("should add querystring params when schema has query_string field", function()
+    URLRewriter:new()
+    ngx.ctx.router_matches.uri_captures["code_parameter"] = "123456"
+    config = {
+        url = "new_url",
+        query_string = {
+          "code_parameter=<code_parameter>",
+          "parameter2=abcdef",
+        }
+    }
+    URLRewriter:access(config)
+    local expected = {
+      code_parameter = "123456",
+      parameter2 = "abcdef",
+    }
+    assert.spy(ngx.req.set_uri_args).was_called_with(expected)
+  end)
 end)