sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove toggle_confirmation; require explicit state change

Browse source 
Also cosmetic changes to make the code clearer
This commit is contained in:
Mark Felder 2020-10-13 16:07:36 -05:00 committed by Mark Felder
parent d36182c088
commit 2c0fe2ea9e
11 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/mix/tasks/pleroma/user.ex
View file

@ -213,7 +213,7 @@ def run(["set", nickname | rest]) do
user =
case Keyword.get(options, :confirmed) do
nil -> user
value -> set_confirmed(user, value)
value -> set_confirmation(user, value)
end
user =
@ -373,7 +373,7 @@ def run(["confirm_all"]) do
|> Pleroma.Repo.chunk_stream(500, :batches)
|> Stream.each(fn users ->
users
|> Enum.each(fn user -> User.need_confirmation(user, false) end)
|> Enum.each(fn user -> User.set_confirmation(user, true) end)
end)
|> Stream.run()
end
@ -391,7 +391,7 @@ def run(["unconfirm_all"]) do
|> Pleroma.Repo.chunk_stream(500, :batches)
|> Stream.each(fn users ->
users
|> Enum.each(fn user -> User.need_confirmation(user, true) end)
|> Enum.each(fn user -> User.set_confirmation(user, false) end)
end)
|> Stream.run()
end
@ -454,8 +454,8 @@ defp set_locked(user, value) do
user
end
defp set_confirmed(user, value) do
{:ok, user} = User.need_confirmation(user, !value)
defp set_confirmation(user, value) do
{:ok, user} = User.set_confirmation(user, value)
shell_info("Confirmation status of #{user.nickname}: #{user.is_confirmed}")
user

32
lib/pleroma/user.ex
View file

@ -704,11 +704,11 @@ def register_changeset(struct, params \\ %{}, opts \\ []) do
reason_limit = Config.get([:instance, :registration_reason_length], 500)
params = Map.put_new(params, :accepts_chat_messages, true)
need_confirmation? =
if is_nil(opts[:need_confirmation]) do
Config.get([:instance, :account_activation_required])
confirmed? =
if is_nil(opts[:confirmed]) do
!Config.get([:instance, :account_activation_required])
else
opts[:need_confirmation]
opts[:confirmed]
end
need_approval? =
@ -719,7 +719,7 @@ def register_changeset(struct, params \\ %{}, opts \\ []) do
end
struct
|> confirmation_changeset(need_confirmation: need_confirmation?)
|> confirmation_changeset(set_confirmation: confirmed?)
|> approval_changeset(need_approval: need_approval?)
|> cast(params, [
:bio,
@ -1643,7 +1643,7 @@ def confirm(users) when is_list(users) do
end
def confirm(%User{is_confirmed: false} = user) do
with chg <- confirmation_changeset(user, need_confirmation: false),
with chg <- confirmation_changeset(user, set_confirmation: true),
{:ok, user} <- update_and_set_cache(chg) do
post_register_action(user)
{:ok, user}
@ -2138,10 +2138,10 @@ def touch_last_digest_emailed_at(user) do
updated_user
end
@spec need_confirmation(User.t(), boolean()) :: {:ok, User.t()} | {:error, Changeset.t()}
def need_confirmation(%User{} = user, bool) do
@spec set_confirmation(User.t(), boolean()) :: {:ok, User.t()} | {:error, Changeset.t()}
def set_confirmation(%User{} = user, bool) do
user
|> confirmation_changeset(need_confirmation: bool)
|> confirmation_changeset(set_confirmation: bool)
|> update_and_set_cache()
end
@ -2309,18 +2309,18 @@ def mastodon_settings_update(user, settings) do
end
@spec confirmation_changeset(User.t(), keyword()) :: Changeset.t()
def confirmation_changeset(user, need_confirmation: need_confirmation?) do
def confirmation_changeset(user, set_confirmation: confirmed?) do
params =
if need_confirmation? do
%{
is_confirmed: false,
confirmation_token: :crypto.strong_rand_bytes(32) |> Base.url_encode64()
}
else
if confirmed? do
%{
is_confirmed: true,
confirmation_token: nil
}
else
%{
is_confirmed: false,
confirmation_token: :crypto.strong_rand_bytes(32) |> Base.url_encode64()
}
end
cast(user, params, [:is_confirmed, :confirmation_token])

2
lib/pleroma/web/auth/pleroma_authenticator.ex
View file

@ -84,7 +84,7 @@ def create_from_registration(
password_confirmation: random_password
},
external: true,
need_confirmation: false
confirmed: true
)
|> Repo.insert(),
{:ok, _} <-

4
priv/repo/migrations/20201231185546_confirm_logged_in_users.exs
View file

@ -11,9 +11,9 @@ defmodule Pleroma.Repo.Migrations.ConfirmLoggedInUsers do
def up do
User
|> where([u], u.confirmation_pending == true)
|> where([u], u.is_confirmed == false)
|> join(:inner, [u], t in Token, on: t.user_id == u.id)
|> Repo.update_all(set: [confirmation_pending: false])
|> Repo.update_all(set: [is_confirmed: true])
end
def down do

7
test/mix/tasks/pleroma/user_test.exs
View file

@ -436,13 +436,6 @@ test "invite is revoked" do
assert_received {:mix_shell, :info, [message]}
assert message =~ "Invite for token #{invite.token} was revoked."
end
test "it prints an error message when invite is not exist" do
Mix.Tasks.Pleroma.User.run(["revoke_invite", "foo"])
assert_received {:mix_shell, :error, [message]}
assert message =~ "No invite found"
end
end
describe "running delete_activities" do

8
test/pleroma/repo/migrations/confirm_logged_in_users_test.exs
View file

@ -14,12 +14,12 @@ defmodule Pleroma.Repo.Migrations.ConfirmLoggedInUsersTest do
test "up/0 confirms unconfirmed but previously-logged-in users", %{migration: migration} do
insert_list(25, :oauth_token)
Repo.update_all(User, set: [confirmation_pending: true])
insert_list(5, :user, confirmation_pending: true)
Repo.update_all(User, set: [is_confirmed: false])
insert_list(5, :user, is_confirmed: false)
count =
User
|> where(confirmation_pending: true)
|> where(is_confirmed: false)
|> Repo.aggregate(:count)
assert count == 30
@ -28,7 +28,7 @@ test "up/0 confirms unconfirmed but previously-logged-in users", %{migration: mi
count =
User
|> where(confirmation_pending: true)
|> where(is_confirmed: false)
|> Repo.aggregate(:count)
assert count == 5

2
test/pleroma/user_test.exs
View file

@ -666,7 +666,7 @@ test "it creates unconfirmed user" do
end
test "it creates confirmed user if :confirmed option is given" do
changeset = User.register_changeset(%User{}, @full_user_data, need_confirmation: false)
changeset = User.register_changeset(%User{}, @full_user_data, confirmed: true)
assert changeset.valid?
{:ok, user} = Repo.insert(changeset)

7
test/pleroma/web/admin_api/controllers/admin_api_controller_test.exs
View file

@ -906,8 +906,11 @@ test "it confirms emails of two users", %{conn: conn, admin: admin} do
assert ret_conn.status == 200
assert User.get_by_id(first_user.id).is_confirmed
assert User.get_by_id(second_user.id).is_confirmed
first_user = User.get_by_id(first_user.id)
second_user = User.get_by_id(second_user.id)
assert first_user.is_confirmed
assert second_user.is_confirmed
log_entry = Repo.one(ModerationLog)

2
test/pleroma/web/o_auth/o_auth_controller_test.exs
View file

@ -928,7 +928,7 @@ test "rejects token exchange for valid credentials belonging to unconfirmed user
{:ok, user} =
insert(:user, password_hash: Pleroma.Password.Pbkdf2.hash_pwd_salt(password))
|> User.confirmation_changeset(need_confirmation: true)
|> User.confirmation_changeset(set_confirmation: false)
|> User.update_and_set_cache()
refute Pleroma.User.account_status(user) == :active

2
test/pleroma/web/pleroma_api/controllers/account_controller_test.exs
View file

@ -17,7 +17,7 @@ defmodule Pleroma.Web.PleromaAPI.AccountControllerTest do
setup do
{:ok, user} =
insert(:user)
|> User.confirmation_changeset(need_confirmation: true)
|> User.confirmation_changeset(set_confirmation: false)
|> User.update_and_set_cache()
refute user.is_confirmed

2
test/pleroma/web/twitter_api/controller_test.exs
View file

@ -64,7 +64,7 @@ test "with credentials, with params" do
setup do
{:ok, user} =
insert(:user)
|> User.confirmation_changeset(need_confirmation: true)
|> User.confirmation_changeset(set_confirmation: false)
|> Repo.update()
refute user.is_confirmed