Include default pow controller routes and messsages in extension cont…

…rollers
pow-auth · Mar 15, 2019 · a283fd2 · a283fd2
1 parent 1a12d97
commit a283fd2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/lib/pow/extension/phoenix/controllers/controller_callbacks/base.ex b/lib/pow/extension/phoenix/controllers/controller_callbacks/base.ex
@@ -13,7 +13,7 @@ defmodule Pow.Extension.Phoenix.ControllerCallbacks.Base do
         end
       end
   """
-  alias Pow.{Config, Extension.Phoenix.Controller.Base}
+  alias Pow.{Config, Extension.Phoenix.Controller.Base, Phoenix.Controller}
 
   @callback before_process(atom(), atom(), any(), Config.t()) :: any()
   @callback before_respond(atom(), atom(), any(), Config.t()) :: any()
@@ -23,9 +23,11 @@ defmodule Pow.Extension.Phoenix.ControllerCallbacks.Base do
     quote do
       @behaviour unquote(__MODULE__)
 
-      import Base, only: [__define_helper_methods__: 1]
+      require Base
+      require Controller
 
-      __define_helper_methods__(unquote(config))
+      Base.__define_helper_methods__(unquote(config))
+      Controller.__define_helper_methods__()
 
       @before_compile unquote(__MODULE__)
     end

diff --git a/lib/pow/phoenix/controllers/controller.ex b/lib/pow/phoenix/controllers/controller.ex
@@ -58,6 +58,13 @@ defmodule Pow.Phoenix.Controller do
 
       defp pow_layout(conn, _config), do: ViewHelpers.layout(conn)
 
+      unquote(__MODULE__).__define_helper_methods__()
+    end
+  end
+
+  @doc false
+  defmacro __define_helper_methods__() do
+    quote do
       @doc """
       See `Pow.Phoenix.Controller.messages/2` for more.