aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-16 11:01:24 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-16 11:01:24 +0200
commit5dac3727f10d65eea284da56fe4b0db5cab53f1f (patch)
tree306e901d826bec343567616ec01bf0c44631e82f
parentb1edd94baa64a18223ae2cc731231ba4314fd0d3 (diff)
downloadpleroma-5dac3727f10d65eea284da56fe4b0db5cab53f1f.tar.gz
Add registration to the TwAPI controller.
-rw-r--r--lib/pleroma/web/router.ex1
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex11
-rw-r--r--test/web/twitter_api/twitter_api_controller_test.exs38
3 files changed, 50 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 7bb3c9763..2749be5e9 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -26,6 +26,7 @@ defmodule Pleroma.Web.Router do
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation
get "/statusnet/config", TwitterAPI.Controller, :config
+ post "/account/register", TwitterAPI.Controller, :register
end
scope "/api", Pleroma.Web do
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index a4d8a1d14..fa26bb3e9 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -131,6 +131,17 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, response)
end
+ def register(conn, params) do
+ with {:ok, user} <- TwitterAPI.register_user(params) do
+ conn
+ |> json_reply(200, Poison.encode!(user))
+ else
+ {:error, errors} ->
+ conn
+ |> json_reply(400, Poison.encode!(errors))
+ end
+ end
+
defp json_reply(conn, status, json) do
conn
|> put_resp_content_type("application/json")
diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs
index 0eb1b60c5..3bc4eb700 100644
--- a/test/web/twitter_api/twitter_api_controller_test.exs
+++ b/test/web/twitter_api/twitter_api_controller_test.exs
@@ -216,6 +216,44 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
end
end
+ describe "POST /api/account/register" do
+ test "it creates a new user", %{conn: conn} do
+ data = %{
+ "nickname" => "lain",
+ "email" => "lain@wired.jp",
+ "fullname" => "lain iwakura",
+ "bio" => "close the world.",
+ "password" => "bear",
+ "confirm" => "bear"
+ }
+
+ conn = conn
+ |> post("/api/account/register", data)
+
+ user = json_response(conn, 200)
+
+ fetched_user = Repo.get_by(User, nickname: "lain")
+ assert user == UserRepresenter.to_map(fetched_user)
+ end
+
+ test "it returns errors on a problem", %{conn: conn} do
+ data = %{
+ "email" => "lain@wired.jp",
+ "fullname" => "lain iwakura",
+ "bio" => "close the world.",
+ "password" => "bear",
+ "confirm" => "bear"
+ }
+
+ conn = conn
+ |> post("/api/account/register", data)
+
+ errors = json_response(conn, 400)
+
+ assert is_binary(errors["error"])
+ end
+ end
+
defp valid_user(_context) do
{ :ok, user } = UserBuilder.insert(%{nickname: "lambda", ap_id: "lambda"})
[user: user]