Check for Phoenix.View when setting up controller

pow-auth · Aug 30, 2023 · 9e84cab · 9e84cab
1 parent c76f3d6
commit 9e84cab
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## v1.0.32 (TBA)
+
+## Bug fixes
+
+- [`Pow.Phoenix.Controller`] Now uses `Phoenix.View` when it's available with `:namespace` option to prevent upgrade issues
+
 ## v1.0.31 (2023-06-09)
 
 ## Bug fixes

diff --git a/lib/pow/phoenix/controllers/controller.ex b/lib/pow/phoenix/controllers/controller.ex
@@ -34,16 +34,14 @@ defmodule Pow.Phoenix.Controller do
   defmacro __using__(config) do
     quote do
       use Phoenix.Controller, (
-        # Credo will complain about unless statement but we want this first
-        # credo:disable-for-next-line
-        unless Pow.dependency_vsn_match?(:phoenix, "< 1.7.0") do
+        # TODO: Remove when Phoenix 1.7 is required
+        if Code.ensure_loaded?(Phoenix.View) do
+          [namespace: Pow.Phoenix]
+        else
           [
             layouts: [html: Pow.Phoenix.Layouts],
             formats: [:html]
           ]
-        else
-          # TODO: Remove when Phoenix 1.7 is required
-          [namespace: Pow.Phoenix]
         end)
 
       import unquote(__MODULE__), only: [require_authenticated: 2, require_not_authenticated: 2, put_no_cache_header: 2]