Rebase on latest master, make sure tests pass

xerions · Feb 14, 2018 · 84dd479 · 84dd479
1 parent b9e7e31
commit 84dd479
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 76 deletions.
diff --git a/lib/phoenix_swagger/conn_validator.ex b/lib/phoenix_swagger/conn_validator.ex
@@ -68,12 +68,31 @@ defmodule PhoenixSwagger.ConnValidator do
       for parameter <- schema.schema["parameters"],
           parameter["type"] != nil,
           parameter["in"] in ["query", "path"] do
-        {parameter["type"], parameter["name"], conn.params[parameter["name"]], parameter["required"]}
+        {parameter["type"], parameter["name"], get_param_value(conn.params, parameter["name"]), parameter["required"]}
       end
     validate_query_params(parameters)
   end
 
-  defp validate_body_params(path, conn), do: Validator.validate(path, conn.body_params)
+  defp get_in_nested(params = nil, _), do: params
+  defp get_in_nested(params, nil), do: params
+  defp get_in_nested(params, nested_map) when map_size(nested_map) == 1 do
+    [{key, child_nested_map}] = Map.to_list(nested_map)
+
+    get_in_nested(params[key], child_nested_map)
+  end
+
+  defp get_param_value(params, nested_name) when is_binary(nested_name) do
+    nested_map = Plug.Conn.Query.decode(nested_name)
+    get_in_nested(params, nested_map)
+  end
+
+  defp validate_body_params(path, conn) do
+    case Validator.validate(path, conn.body_params) do
+      :ok -> :ok
+      {:error, [{error, error_path} | _], _path} -> {:error, error, error_path}
+      {:error, error, error_path} ->  {:error, error, error_path}
+    end
+  end
 
   defp equal_paths?([], []), do: true
   defp equal_paths?([head | orig_path_rest], [head | req_path_rest]), do: equal_paths?(orig_path_rest, req_path_rest)

diff --git a/lib/phoenix_swagger/plug/validate_plug.ex b/lib/phoenix_swagger/plug/validate_plug.ex
@@ -49,78 +49,4 @@ defmodule PhoenixSwagger.Plug.Validate do
     |> send_resp(status, Poison.encode!(response))
     |> halt()
   end
-
-  defp validate_boolean(_name, value, parameters) when value in ["true", "false"] do
-    validate_query_params(parameters)
-  end
-  defp validate_boolean(name, _value, _parameters) do
-    {:error, "Type mismatch. Expected Boolean but got String.", "#/#{name}"}
-  end
-
-  defp validate_integer(name, value, parameters) do
-    _ = String.to_integer(value)
-    validate_query_params(parameters)
-  rescue ArgumentError ->
-      {:error, "Type mismatch. Expected Integer but got String.", "#/#{name}"}
-  end
-
-  defp validate_query_params([]), do: :ok
-  defp validate_query_params([{_type, _name, nil, false} | parameters]) do
-    validate_query_params(parameters)
-  end
-  defp validate_query_params([{_type, name, nil, true} | _]) do
-    {:error, "Required property #{name} was not present.", "#"}
-  end
-  defp validate_query_params([{"string", _name, _val, _} | parameters]) do
-    validate_query_params(parameters)
-  end
-  defp validate_query_params([{"integer", name, val, _} | parameters]) do
-    validate_integer(name, val, parameters)
-  end
-  defp validate_query_params([{"boolean", name, val, _} | parameters]) do
-    validate_boolean(name, val, parameters)
-  end
-  defp validate_query_params(path, conn) do
-    [{_path, _basePath, schema}] = :ets.lookup(@table, path)
-    parameters =
-      for parameter <- schema.schema["parameters"],
-          parameter["type"] != nil,
-          parameter["in"] in ["query", "path"] do
-        {parameter["type"], parameter["name"], get_param_value(conn.params, parameter["name"]), parameter["required"]}
-      end
-    validate_query_params(parameters)
-  end
-
-  defp get_in_nested(params = nil, _), do: params
-  defp get_in_nested(params, nil), do: params
-  defp get_in_nested(params, nested_map) when map_size(nested_map) == 1 do
-    [{key, child_nested_map}] = Map.to_list(nested_map)
-
-    get_in_nested(params[key], child_nested_map)
-  end
-
-  defp get_param_value(params, nested_name) when is_binary(nested_name) do
-    nested_map = Plug.Conn.Query.decode(nested_name)
-    get_in_nested(params, nested_map)
-  end
-
-  defp validate_body_params(path, conn) do
-    case Validator.validate(path, conn.body_params) do
-      :ok -> :ok
-      {:error, [{error, error_path} | _], _path} -> {:error, error, error_path}
-      {:error, error, error_path} ->  {:error, error, error_path}
-    end
-  end
-
-  defp equal_paths?([], []), do: true
-  defp equal_paths?([head | orig_path_rest], [head | req_path_rest]), do: equal_paths?(orig_path_rest, req_path_rest)
-  defp equal_paths?(["{" <> _ | orig_path_rest], [_ | req_path_rest]), do: equal_paths?(orig_path_rest, req_path_rest)
-  defp equal_paths?(_, _), do: false
-
-  # It is pretty safe to strip request path by base path. They can't be
-  # non-equal. In this way, the router even will not execute this plug.
-  defp remove_base_path(path, []), do: path
-  defp remove_base_path([_path | rest], [_base_path | base_path_rest]) do
-    remove_base_path(rest, base_path_rest)
-  end
 end