aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/admin_api
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-12-20 13:28:36 +0000
committerkaniini <nenolod@gmail.com>2018-12-20 13:28:36 +0000
commit2e2030ada8b9aa00936057d47260cd03d01d92be (patch)
tree9fb353e3eaccb1dbd82738cf44ae5015100f6711 /lib/pleroma/web/admin_api
parent8de3138de07c0447ea3bc015ff71db25f8f9c931 (diff)
parent851db74f1ca533f27f72f1341571948b15d2f561 (diff)
downloadpleroma-2e2030ada8b9aa00936057d47260cd03d01d92be.tar.gz
Merge branch '114_email_confirmation' into 'develop'
[#114] Email confirmation See merge request pleroma/pleroma!546
Diffstat (limited to 'lib/pleroma/web/admin_api')
-rw-r--r--lib/pleroma/web/admin_api/admin_api_controller.ex10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex
index 4d73cf219..683310168 100644
--- a/lib/pleroma/web/admin_api/admin_api_controller.ex
+++ b/lib/pleroma/web/admin_api/admin_api_controller.ex
@@ -1,6 +1,6 @@
defmodule Pleroma.Web.AdminAPI.AdminAPIController do
use Pleroma.Web, :controller
- alias Pleroma.{User, Repo}
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.Relay
import Pleroma.Web.ControllerHelper, only: [json_response: 3]
@@ -26,7 +26,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
conn,
%{"nickname" => nickname, "email" => email, "password" => password}
) do
- new_user = %{
+ user_data = %{
nickname: nickname,
name: nickname,
email: email,
@@ -35,11 +35,11 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
bio: "."
}
- User.register_changeset(%User{}, new_user)
- |> Repo.insert!()
+ changeset = User.register_changeset(%User{}, user_data, confirmed: true)
+ {:ok, user} = User.register(changeset)
conn
- |> json(new_user.nickname)
+ |> json(user.nickname)
end
def tag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) do