sjw/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma.git synced 2024-11-16 07:26:28 +01:00
Code Issues Releases Wiki Activity

Remove ConfirmUserPlug

Browse Source
This commit is contained in:
Alex Gleason 2021-01-08 07:47:55 -06:00
parent 7b8dbaff31
commit 1b98cd8610
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
3 changed files with 0 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/pleroma/web/plugs/confirm_user_plug.ex
View File

@ -1,30 +0,0 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.ConfirmUserPlug do
@moduledoc """
If a user has ever been granted an OAuth token, they are eligible to become
confirmed, regardless of the account_activation_required setting. This plug
will confirm a user if found.
"""
alias Pleroma.User
import Plug.Conn
def init(opts), do: opts
def call(%{assigns: %{user: %User{confirmation_pending: true} = user}} = conn, _opts) do
with {:ok, user} <- confirm_user(user) do
assign(conn, :user, user)
end
end
def call(conn, _opts), do: conn
defp confirm_user(%User{} = user) do
user
|> User.confirmation_changeset(need_confirmation: false)
|> User.update_and_set_cache()
end
end

1
lib/pleroma/web/router.ex
View File

@ -56,7 +56,6 @@ defmodule Pleroma.Web.Router do
plug(Pleroma.Web.Plugs.UserEnabledPlug)
plug(Pleroma.Web.Plugs.SetUserSessionIdPlug)
plug(Pleroma.Web.Plugs.EnsureUserTokenAssignsPlug)
plug(Pleroma.Web.Plugs.ConfirmUserPlug)
end
pipeline :base_api do

30
test/pleroma/web/plugs/confirm_user_plug_test.exs
View File

@ -1,30 +0,0 @@
# Pleroma: A lightweight social networking server
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.Plugs.ConfirmUserPlugTest do
use Pleroma.Web.ConnCase, async: true
alias Pleroma.User
alias Pleroma.Web.Plugs.ConfirmUserPlug
import Pleroma.Factory
test "it confirms an unconfirmed user", %{conn: conn} do
%User{id: user_id} = user = insert(:user, confirmation_pending: true)
conn =
conn
|> assign(:user, user)
|> ConfirmUserPlug.call(%{})
assert %Plug.Conn{assigns: %{user: %User{id: ^user_id, confirmation_pending: false}}} = conn
assert %User{confirmation_pending: false} = User.get_by_id(user_id)
end
test "it does nothing without an unconfirmed user", %{conn: conn} do
assert conn == ConfirmUserPlug.call(conn, %{})
user = insert(:user, confirmation_pending: false)
conn = assign(conn, :user, user)
assert conn == ConfirmUserPlug.call(conn, %{})
end
end