alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[#114] User.Info: renamed `confirmation_update` to `confirmation_changeset`.

This commit is contained in:
Ivan Tashkinov 2018-12-19 16:27:16 +03:00
parent 59fc5d15df
commit 968d7490b6
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/user.ex
View File

@ -191,7 +191,7 @@ def register_changeset(struct, params \\ %{}, opts \\ []) do
|> validate_format(:email, @email_regex) |> validate_format(:email, @email_regex)
|> validate_length(:bio, max: 1000) |> validate_length(:bio, max: 1000)
|> validate_length(:name, min: 1, max: 100) |> validate_length(:name, min: 1, max: 100)
|> put_change(:info, User.Info.confirmation_change(%User.Info{}, confirmation_status)) |> put_change(:info, User.Info.confirmation_changeset(%User.Info{}, confirmation_status))
if changeset.valid? do if changeset.valid? do
hashed = Pbkdf2.hashpwsalt(changeset.changes[:password]) hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])

10
lib/pleroma/user/info.ex
View File

@ -143,21 +143,21 @@ def profile_update(info, params) do
]) ])
end end
def confirmation_change(info, :confirmed) do def confirmation_changeset(info, :confirmed) do
confirmation_change(info, %{ confirmation_changeset(info, %{
confirmation_pending: false, confirmation_pending: false,
confirmation_token: nil confirmation_token: nil
}) })
end end
def confirmation_change(info, :unconfirmed) do def confirmation_changeset(info, :unconfirmed) do
confirmation_change(info, %{ confirmation_changeset(info, %{
confirmation_pending: true, confirmation_pending: true,
confirmation_token: :crypto.strong_rand_bytes(32) |> Base.url_encode64() confirmation_token: :crypto.strong_rand_bytes(32) |> Base.url_encode64()
}) })
end end
def confirmation_change(info, params) do def confirmation_changeset(info, params) do
cast(info, params, [:confirmation_pending, :confirmation_token]) cast(info, params, [:confirmation_pending, :confirmation_token])
end end

2
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View File

@ -376,7 +376,7 @@ def password_reset(conn, params) do
def confirm_email(conn, %{"token" => token}) do def confirm_email(conn, %{"token" => token}) do
with %User{} = user <- User.get_by_confirmation_token(token), with %User{} = user <- User.get_by_confirmation_token(token),
true <- user.local, true <- user.local,
info_change <- User.Info.confirmation_change(user.info, :confirmed), info_change <- User.Info.confirmation_changeset(user.info, :confirmed),
changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change), changeset <- Changeset.change(user) |> Changeset.put_embed(:info, info_change),
{:ok, _} <- User.update_and_set_cache(changeset) do {:ok, _} <- User.update_and_set_cache(changeset) do
conn conn

2
test/web/oauth/oauth_controller_test.exs
View File

@ -116,7 +116,7 @@ test "rejects token exchange with invalid client credentials" do
test "rejects token exchange for valid credentials belonging to unconfirmed user" do test "rejects token exchange for valid credentials belonging to unconfirmed user" do
password = "testpassword" password = "testpassword"
user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password)) user = insert(:user, password_hash: Comeonin.Pbkdf2.hashpwsalt(password))
info_change = Pleroma.User.Info.confirmation_change(user.info, :unconfirmed) info_change = Pleroma.User.Info.confirmation_changeset(user.info, :unconfirmed)
{:ok, user} = {:ok, user} =
user user

4
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -876,7 +876,7 @@ test "it returns 500 when user is not local", %{conn: conn, user: user} do
describe "GET /api/account/confirm_email/:token" do describe "GET /api/account/confirm_email/:token" do
setup do setup do
user = insert(:user) user = insert(:user)
info_change = User.Info.confirmation_change(user.info, :unconfirmed) info_change = User.Info.confirmation_changeset(user.info, :unconfirmed)
{:ok, user} = {:ok, user} =
user user
@ -908,7 +908,7 @@ test "it confirms the user account", %{conn: conn, user: user} do
describe "POST /api/account/resend_confirmation_email" do describe "POST /api/account/resend_confirmation_email" do
setup do setup do
user = insert(:user) user = insert(:user)
info_change = User.Info.confirmation_change(user.info, :unconfirmed) info_change = User.Info.confirmation_changeset(user.info, :unconfirmed)
{:ok, user} = {:ok, user} =
user user