moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deprecated calls to get_flash/2

This commit is contained in:
Mark Felder 2023-05-31 13:36:21 -04:00
parent 6e1ea2eafc
commit e3110cb34e
6 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web.ex
View File

@ -136,7 +136,7 @@ def view do
namespace: Pleroma.Web namespace: Pleroma.Web
# Import convenience functions from controllers # Import convenience functions from controllers
import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1] import Phoenix.Controller, only: [get_csrf_token: 0, view_module: 1]
import Pleroma.Web.ErrorHelpers import Pleroma.Web.ErrorHelpers
import Pleroma.Web.Gettext import Pleroma.Web.Gettext

8
lib/pleroma/web/templates/o_auth/mfa/recovery.html.eex
View File

@ -1,8 +1,8 @@
<%= if get_flash(@conn, :info) do %> <%= if Phoenix.Flash.get(@flash, :info) do %>
<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p> <p class="alert alert-info" role="alert"><%= Phoenix.Flash.get(@flash, :info) %></p>
<% end %> <% end %>
<%= if get_flash(@conn, :error) do %> <%= if Phoenix.Flash.get(@flash, :error) do %>
<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p> <p class="alert alert-danger" role="alert"><%= Phoenix.Flash.get(@flash, :error) %></p>
<% end %> <% end %>
<h2><%= Gettext.dpgettext("static_pages", "mfa recover page title", "Two-factor recovery") %></h2> <h2><%= Gettext.dpgettext("static_pages", "mfa recover page title", "Two-factor recovery") %></h2>

8
lib/pleroma/web/templates/o_auth/mfa/totp.html.eex
View File

@ -1,8 +1,8 @@
<%= if get_flash(@conn, :info) do %> <%= if Phoenix.Flash.get(@flash, :info) do %>
<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p> <p class="alert alert-info" role="alert"><%= Phoenix.Flash.get(@flash, :info) %></p>
<% end %> <% end %>
<%= if get_flash(@conn, :error) do %> <%= if Phoenix.Flash.get(@flash, :error) do %>
<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p> <p class="alert alert-danger" role="alert"><%= Phoenix.Flash.get(@flash, :error) %></p>
<% end %> <% end %>
<h2><%= Gettext.dpgettext("static_pages", "mfa auth page title", "Two-factor authentication") %></h2> <h2><%= Gettext.dpgettext("static_pages", "mfa auth page title", "Two-factor authentication") %></h2>

8
lib/pleroma/web/templates/o_auth/o_auth/register.html.eex
View File

@ -1,8 +1,8 @@
<%= if get_flash(@conn, :info) do %> <%= if Phoenix.Flash.get(@flash, :info) do %>
<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p> <p class="alert alert-info" role="alert"><%= Phoenix.Flash.get(@flash, :info) %></p>
<% end %> <% end %>
<%= if get_flash(@conn, :error) do %> <%= if Phoenix.Flash.get(@flash, :error) do %>
<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p> <p class="alert alert-danger" role="alert"><%= Phoenix.Flash.get(@flash, :error) %></p>
<% end %> <% end %>
<h2><%= Gettext.dpgettext("static_pages", "oauth register page title", "Registration Details") %></h2> <h2><%= Gettext.dpgettext("static_pages", "oauth register page title", "Registration Details") %></h2>

8
lib/pleroma/web/templates/o_auth/o_auth/show.html.eex
View File

@ -1,8 +1,8 @@
<%= if get_flash(@conn, :info) do %> <%= if Phoenix.Flash.get(@flash, :info) do %>
<p class="alert alert-info" role="alert"><%= get_flash(@conn, :info) %></p> <p class="alert alert-info" role="alert"><%= Phoenix.Flash.get(@flash, :info) %></p>
<% end %> <% end %>
<%= if get_flash(@conn, :error) do %> <%= if Phoenix.Flash.get(@flash, :error) do %>
<p class="alert alert-danger" role="alert"><%= get_flash(@conn, :error) %></p> <p class="alert alert-danger" role="alert"><%= Phoenix.Flash.get(@flash, :error) %></p>
<% end %> <% end %>
<%= form_for @conn, Routes.o_auth_path(@conn, :authorize), [as: "authorization"], fn f -> %> <%= form_for @conn, Routes.o_auth_path(@conn, :authorize), [as: "authorization"], fn f -> %>

6
test/pleroma/web/o_auth/o_auth_controller_test.exs
View File

@ -186,7 +186,7 @@ test "on authentication error, GET /oauth/<provider>/callback redirects to `redi
assert html_response(conn, 302) assert html_response(conn, 302)
assert redirected_to(conn) == app.redirect_uris assert redirected_to(conn) == app.redirect_uris
assert get_flash(conn, :error) == "Failed to authenticate: (error description)." assert conn.assigns.flash["error"] == "Failed to authenticate: (error description)."
end end
test "GET /oauth/registration_details renders registration details form", %{ test "GET /oauth/registration_details renders registration details form", %{
@ -307,7 +307,7 @@ test "with invalid params, POST /oauth/register?op=register renders registration
|> post("/oauth/register", bad_params) |> post("/oauth/register", bad_params)
assert html_response(conn, 403) =~ ~r/name="op" type="submit" value="register"/ assert html_response(conn, 403) =~ ~r/name="op" type="submit" value="register"/
assert get_flash(conn, :error) == "Error: #{bad_param} has already been taken." assert conn.assigns.flash["error"] == "Error: #{bad_param} has already been taken."
end end
end end
@ -398,7 +398,7 @@ test "with invalid params, POST /oauth/register?op=connect renders registration_
|> post("/oauth/register", params) |> post("/oauth/register", params)
assert html_response(conn, 401) =~ ~r/name="op" type="submit" value="connect"/ assert html_response(conn, 401) =~ ~r/name="op" type="submit" value="connect"/
assert get_flash(conn, :error) == "Invalid Username/Password" assert conn.assigns.flash["error"] == "Invalid Username/Password"
end end
end end