Some fixes to 0.5.1

Author: danschultzer

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 * Require ExOauth2Provider v0.5.1
 * Pass configuration to all ExOauth2Provider methods
+* Removed `ExOauth2Provider.Config.native_redirect_uri/1` call in templates in favor of using assigns
 
 ## v0.5.0 (2019-05-08)
 

lib/phoenix_oauth2_provider/controller.ex

@@ -76,10 +76,10 @@ defmodule PhoenixOauth2Provider.Controller do
 
   @doc false
   def __action_params__(conn, config, :api), do: [conn, conn.params, config]
-  def __action_params__(conn, config, _any), do: [conn, conn.params, current_resource_owner(conn), config]
+  def __action_params__(conn, config, _any), do: [conn, conn.params, current_resource_owner(conn, config), config]
 
-  defp current_resource_owner(conn) do
-    resource_owner_key = Config.current_resource_owner([])
+  defp current_resource_owner(conn, config) do
+    resource_owner_key = Config.current_resource_owner(config)
 
     case Map.get(conn.assigns, resource_owner_key) do
       nil            -> raise "Resource owner was not found with :#{resource_owner_key} assigns"

lib/phoenix_oauth2_provider/controllers/application_controller.ex

@@ -5,6 +5,8 @@ defmodule PhoenixOauth2Provider.ApplicationController do
   alias ExOauth2Provider.Applications
   alias Plug.Conn
 
+  plug :assign_native_redirect_uri when action in [:new, :create, :edit, :update]
+
   @spec index(Conn.t(), map(), map(), keyword()) :: Conn.t()
   def index(conn, _params, resource_owner, config) do
     applications = Applications.get_applications_for(resource_owner, config)
@@ -49,7 +51,7 @@ defmodule PhoenixOauth2Provider.ApplicationController do
     application = get_application_for!(resource_owner, uid, config)
     changeset   = Applications.change_application(application, %{}, config)
 
-    render(conn, "edit.html", application: application, changeset: changeset)
+    render(conn, "edit.html", changeset: changeset)
   end
 
   @spec update(Conn.t(), map(), map(), keyword()) :: Conn.t()
@@ -63,7 +65,7 @@ defmodule PhoenixOauth2Provider.ApplicationController do
         |> redirect(to: Routes.oauth_application_path(conn, :show, application))
 
       {:error, %Ecto.Changeset{} = changeset} ->
-        render(conn, "edit.html", application: application, changeset: changeset)
+        render(conn, "edit.html", changeset: changeset)
     end
   end
 
@@ -82,4 +84,10 @@ defmodule PhoenixOauth2Provider.ApplicationController do
   defp get_application_for!(resource_owner, uid, config) do
     Applications.get_application_for!(resource_owner, uid, config)
   end
+
+  defp assign_native_redirect_uri(conn, _opts) do
+    native_redirect_uri = ExOauth2Provider.Config.native_redirect_uri(conn.private[:phoenix_oauth2_provider_config])
+
+    Conn.assign(conn, :native_redirect_uri, native_redirect_uri)
+  end
 end

lib/phoenix_oauth2_provider/views/application_view.ex

@@ -27,9 +27,9 @@ defmodule PhoenixOauth2Provider.ApplicationView do
     <%%= textarea f, :redirect_uri %>
     <%%= error_tag f, :redirect_uri %>
     <span class="help-block">Use one line per URI</span>
-  <%%= unless is_nil(ExOauth2Provider.Config.native_redirect_uri([])) do %>
+  <%%= if is_nil(@native_redirect_uri) do %>
       <span class="help-block">
-        Use <code><%%= ExOauth2Provider.Config.native_redirect_uri([]) %></code> for local tests
+        Use <code><%%= @native_redirect_uri %></code> for local tests
       </span>
   <%% end %>