Add user registration to TwAPI.
This commit is contained in:
parent
40706b4c4f
commit
b1edd94baa
|
@ -1,7 +1,7 @@
|
||||||
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
|
||||||
alias Pleroma.{User, Activity, Repo, Object}
|
alias Pleroma.{User, Activity, Repo, Object}
|
||||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
|
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
|
||||||
|
|
||||||
import Ecto.Query
|
import Ecto.Query
|
||||||
|
|
||||||
|
@ -227,6 +227,28 @@ defp add_conversation_id(activity) do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def register_user(params) do
|
||||||
|
params = %{
|
||||||
|
nickname: params["nickname"],
|
||||||
|
name: params["fullname"],
|
||||||
|
bio: params["bio"],
|
||||||
|
email: params["email"],
|
||||||
|
password: params["password"],
|
||||||
|
password_confirmation: params["confirm"]
|
||||||
|
}
|
||||||
|
|
||||||
|
changeset = User.register_changeset(%User{}, params)
|
||||||
|
|
||||||
|
with {:ok, user} <- Repo.insert(changeset) do
|
||||||
|
{:ok, UserRepresenter.to_map(user)}
|
||||||
|
else
|
||||||
|
{:error, changeset} ->
|
||||||
|
errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, opts} -> msg end)
|
||||||
|
|> Poison.encode!
|
||||||
|
{:error, %{error: errors}}
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
defp activities_to_statuses(activities, opts) do
|
defp activities_to_statuses(activities, opts) do
|
||||||
Enum.map(activities, fn(activity) ->
|
Enum.map(activities, fn(activity) ->
|
||||||
activity_to_status(activity, opts)
|
activity_to_status(activity, opts)
|
||||||
|
|
|
@ -3,7 +3,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPITest do
|
||||||
alias Pleroma.Builders.{UserBuilder, ActivityBuilder}
|
alias Pleroma.Builders.{UserBuilder, ActivityBuilder}
|
||||||
alias Pleroma.Web.TwitterAPI.TwitterAPI
|
alias Pleroma.Web.TwitterAPI.TwitterAPI
|
||||||
alias Pleroma.{Activity, User, Object, Repo}
|
alias Pleroma.{Activity, User, Object, Repo}
|
||||||
alias Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter
|
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
|
||||||
alias Pleroma.Web.ActivityPub.ActivityPub
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
@ -220,6 +220,37 @@ test "it retweets a status and returns the retweet" do
|
||||||
assert status == ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user})
|
assert status == ActivityRepresenter.to_map(updated_activity, %{user: activity_user, for: user})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "it registers a new user and returns the user." do
|
||||||
|
data = %{
|
||||||
|
"nickname" => "lain",
|
||||||
|
"email" => "lain@wired.jp",
|
||||||
|
"fullname" => "lain iwakura",
|
||||||
|
"bio" => "close the world.",
|
||||||
|
"password" => "bear",
|
||||||
|
"confirm" => "bear"
|
||||||
|
}
|
||||||
|
|
||||||
|
{:ok, user} = TwitterAPI.register_user(data)
|
||||||
|
|
||||||
|
fetched_user = Repo.get_by(User, nickname: "lain")
|
||||||
|
assert user == UserRepresenter.to_map(fetched_user)
|
||||||
|
end
|
||||||
|
|
||||||
|
test "it returns the error on registration problems" do
|
||||||
|
data = %{
|
||||||
|
"nickname" => "lain",
|
||||||
|
"email" => "lain@wired.jp",
|
||||||
|
"fullname" => "lain iwakura",
|
||||||
|
"bio" => "close the world.",
|
||||||
|
"password" => "bear"
|
||||||
|
}
|
||||||
|
|
||||||
|
{:error, error_object} = TwitterAPI.register_user(data)
|
||||||
|
|
||||||
|
assert is_binary(error_object[:error])
|
||||||
|
refute Repo.get_by(User, nickname: "lain")
|
||||||
|
end
|
||||||
|
|
||||||
setup do
|
setup do
|
||||||
Supervisor.terminate_child(Pleroma.Supervisor, ConCache)
|
Supervisor.terminate_child(Pleroma.Supervisor, ConCache)
|
||||||
Supervisor.restart_child(Pleroma.Supervisor, ConCache)
|
Supervisor.restart_child(Pleroma.Supervisor, ConCache)
|
||||||
|
|
Loading…
Reference in New Issue