From f084af068159f4ae4628d15ffbd3f4f4b8db55af Mon Sep 17 00:00:00 2001
From: matteo-cristino <cristino.matteo97@gmail.com>
Date: Tue, 15 Oct 2024 10:33:45 +0200
Subject: [PATCH] fix(http): allow to append also numbers as url query
 parameters

---
 src/lua/zencode_http.lua | 19 +++++++++-------
 test/zencode/http.bats   | 47 +++++++++++++++++++++++++++++++++++-----
 2 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/lua/zencode_http.lua b/src/lua/zencode_http.lua
index fd06be0ae..9df0d90ef 100644
--- a/src/lua/zencode_http.lua
+++ b/src/lua/zencode_http.lua
@@ -159,13 +159,15 @@ end)
 local function _append_to_url(ele, dst, encoding_f)
     local arg, arg_c = have(ele)
     local url, url_c = have(dst)
-    zencode_assert(arg_c.encoding == 'string' and luatype(arg) ~= 'table', 
-        "Cannot append http request that are not strings: "..ele)
-    zencode_assert(url_c.content == 'url',
-        "Cannot append http request to invalid url: "..dst)
+    if url_c.content ~= 'url' then
+        error("Cannot append http request to invalid url: "..dst, 2)
+    end
+    if luatype(arg) == 'table' then
+        error("Cannot append table to url: "..dst, 2)
+    end
     local separator = fif( url:str():find('?'), '&', '?' )
     local tv = type(arg)
-    if tv == 'zenroom.time' or tv == 'zenroom.big' then
+    if tv == 'zenroom.time' or tv == 'zenroom.big' or tv == 'zenroom.float' then
         arg = tostring(arg)
     elseif tv == 'zenroom.octet' then
         arg = arg:str()
@@ -193,13 +195,14 @@ local function _get_parameters_from_table(table_params, encoding_f)
     if(params_c.zentype ~= 'd') then
         error("Expected dictionary, found "..params_c.zentype.." for "..table_params, 2)
     end
-    if(params_c.encoding ~= 'string') then
-        error("Parameters in "..table_params.." must be strings", 2)
+    if( params_c.encoding ~= 'string' and params_c.encoding ~= 'float' and
+        params_c.encoding ~= 'integer' and params_c.encoding ~= 'time') then
+        error("Parameters in "..table_params.." must be of type 'string', 'float', 'integer' or 'time'", 2)
     end
     local res = ""
     for k,v in pairs(params) do
         local tv = type(v)
-        if tv == 'zenroom.time' or tv == 'zenroom.big' then
+        if tv == 'zenroom.time' or tv == 'zenroom.big' or tv == 'zenroom.float' then
             v = tostring(v)
         elseif tv == 'zenroom.octet' then
             v = v:str()
diff --git a/test/zencode/http.bats b/test/zencode/http.bats
index 0dbab14e0..dc9f61945 100644
--- a/test/zencode/http.bats
+++ b/test/zencode/http.bats
@@ -219,26 +219,28 @@ EOF
     assert_output '{"empty_get_parameters":"","get_parameters_with_percent_endoing":"client_id=did%3Adyne%3Asandbox.signroom%3APTDvvQn1iWQiVxkfsDnUid8FbieKbHq46Qs8c9CZx67&code=eyJhbGciOiJFUzI1NiJ9.eyJzdWIiOiJlYWMyMjNmOTMwYmRkNzk1NDdlNzI2ZGRjZTg5ZTlmYTA1NWExZTFjIiwiaWF0IjoxNzA5MDQ4MzkzMjk1LCJpc3MiOiJodHRwczovL3ZhbGlkLmlzc3Vlci51cmwiLCJhdWQiOiJkaWQ6ZHluZTpzYW5kYm94LmdlbmVyaWNpc3N1ZXI6NkNwOG1QVXZKbVFhTXhRUFNuTnloYjc0ZjlHYTRXcWZYQ2tCbmVGZ2lrbTUiLCJleHAiOjE3MDkwNTE5OTN9.TahF8CqDDj5yynvtvkhr-Gt6RjzHSvKMosOhFf5sVmWGohKBPMNFhI8WlBlWj7aRauXB0lsvbQk03lf4eZN-2g&redirectUris=https%3A%2F%2Fdidroom.com%2F&grant_type=authorization_code&code_verifier=JYTDgtxcjiNqa3AvJjfubMX6gx98-wCH7iTydBYAeFg","get_parameters_without_percent_endoing":"client_id=did:dyne:sandbox.signroom:PTDvvQn1iWQiVxkfsDnUid8FbieKbHq46Qs8c9CZx67&code=eyJhbGciOiJFUzI1NiJ9.eyJzdWIiOiJlYWMyMjNmOTMwYmRkNzk1NDdlNzI2ZGRjZTg5ZTlmYTA1NWExZTFjIiwiaWF0IjoxNzA5MDQ4MzkzMjk1LCJpc3MiOiJodHRwczovL3ZhbGlkLmlzc3Vlci51cmwiLCJhdWQiOiJkaWQ6ZHluZTpzYW5kYm94LmdlbmVyaWNpc3N1ZXI6NkNwOG1QVXZKbVFhTXhRUFNuTnloYjc0ZjlHYTRXcWZYQ2tCbmVGZ2lrbTUiLCJleHAiOjE3MDkwNTE5OTN9.TahF8CqDDj5yynvtvkhr-Gt6RjzHSvKMosOhFf5sVmWGohKBPMNFhI8WlBlWj7aRauXB0lsvbQk03lf4eZN-2g&redirectUris=https://didroom.com/&grant_type=authorization_code&code_verifier=JYTDgtxcjiNqa3AvJjfubMX6gx98-wCH7iTydBYAeFg"}'
 }
 
-@test "create a GET parameters from a with big and time" {
-    cat <<EOF | save_asset append_different_values.data
+@test "create a GET parameters from a with big, time and numbers" {
+    cat <<EOF | save_asset create_get_parameters.data
 {
     "param1": "value1",
     "param2": "1000",
-    "param3": 2000
+    "param3": 2000,
+    "param4": 3000
 }
 EOF
-    cat <<EOF | zexe append_different_values.zen append_different_values.data
+    cat <<EOF | zexe create_get_parameters.zen create_get_parameters.data
 Scenario 'http': create a GET request concatenating values on a HTTP url
 
-# the parameters are loaded as string dictionary
 Given I have a 'string' named 'param1'
 Given I have a 'integer' named 'param2'
 Given I have a 'time' named 'param3'
+Given I have a 'number' named 'param4'
 
 When I create the 'string dictionary' named 'parameters'
 and I copy 'param1' in 'parameters'
 and I copy 'param2' in 'parameters'
 and I copy 'param3' in 'parameters'
+and I copy 'param4' in 'parameters'
 
 # create the get parameters string
 When I create the http get parameters from 'parameters'
@@ -248,7 +250,40 @@ and I rename 'http_get_parameters' to 'get_parameters_with_percent_endoing'
 
 Then print the 'get_parameters_without_percent_endoing'
 and print the 'get_parameters_with_percent_endoing'
+EOF
+    save_output 'create_get_parameters.json'
+    assert_output '{"get_parameters_with_percent_endoing":"param4=3000&param2=1000&param3=2000&param1=value1","get_parameters_without_percent_endoing":"param4=3000&param2=1000&param3=2000&param1=value1"}'
+}
+
+@test "append to a url strings, big, time and numbers" {
+    cat <<EOF | zexe append_different_values.zen create_get_parameters.data
+Scenario 'http': create a GET request concatenating values on a HTTP url
+
+Given I have a 'string' named 'param1'
+Given I have a 'integer' named 'param2'
+Given I have a 'time' named 'param3'
+Given I have a 'number' named 'param4'
+
+When I set 'string_url' to 'openid-credential-issuer://www.example.com' as 'string'
+and I create the url from 'string_url'
+and I copy 'url' to 'another_url'
+
+# no encoding
+When I append 'param1' as http request to 'url'
+When I append 'param2' as http request to 'url'
+When I append 'param3' as http request to 'url'
+When I append 'param4' as http request to 'url'
+
+# percent encoding
+When I append percent encoding of 'param1' as http request to 'another_url'
+When I append percent encoding of 'param2' as http request to 'another_url'
+When I append percent encoding of 'param3' as http request to 'another_url'
+When I append percent encoding of 'param4' as http request to 'another_url'
+
+
+Then print the 'url'
+and print the 'another_url'
 EOF
     save_output 'append_different_values.json'
-    assert_output '{"get_parameters_with_percent_endoing":"param2=1000&param3=2000&param1=value1","get_parameters_without_percent_endoing":"param2=1000&param3=2000&param1=value1"}'
+    assert_output '{"another_url":"openid-credential-issuer://www.example.com?param1=value1&param2=1000&param3=2000&param4=3000","url":"openid-credential-issuer://www.example.com?param1=value1&param2=1000&param3=2000&param4=3000"}'
 }