AppController: test creating with and without a user
This commit is contained in:
parent
fa35e24a5e
commit
2e4a1c56c3
2 changed files with 33 additions and 8 deletions
|
@ -28,15 +28,9 @@ defmodule Pleroma.Web.MastodonAPI.AppController do
|
|||
defdelegate open_api_operation(action), to: Pleroma.Web.ApiSpec.AppOperation
|
||||
|
||||
@doc "POST /api/v1/apps"
|
||||
def create(%{assigns: %{user: user}, body_params: params} = conn, _params) do
|
||||
def create(%{body_params: params} = conn, _params) do
|
||||
scopes = Scopes.fetch_scopes(params, ["read"])
|
||||
|
||||
user_id =
|
||||
with %User{id: id} <- user do
|
||||
id
|
||||
else
|
||||
_ -> nil
|
||||
end
|
||||
user_id = get_user_id(conn)
|
||||
|
||||
app_attrs =
|
||||
params
|
||||
|
@ -50,6 +44,9 @@ defmodule Pleroma.Web.MastodonAPI.AppController do
|
|||
end
|
||||
end
|
||||
|
||||
defp get_user_id(%{assigns: %{user: %User{id: user_id}}}), do: user_id
|
||||
defp get_user_id(_conn), do: nil
|
||||
|
||||
@doc """
|
||||
GET /api/v1/apps/verify_credentials
|
||||
Gets compact non-secret representation of the app. Supports app tokens and user tokens.
|
||||
|
|
|
@ -35,6 +35,33 @@ defmodule Pleroma.Web.MastodonAPI.AppControllerTest do
|
|||
end
|
||||
|
||||
test "creates an oauth app", %{conn: conn} do
|
||||
app_attrs = build(:oauth_app)
|
||||
|
||||
conn =
|
||||
conn
|
||||
|> put_req_header("content-type", "application/json")
|
||||
|> post("/api/v1/apps", %{
|
||||
client_name: app_attrs.client_name,
|
||||
redirect_uris: app_attrs.redirect_uris
|
||||
})
|
||||
|
||||
[app] = Repo.all(App)
|
||||
|
||||
expected = %{
|
||||
"name" => app.client_name,
|
||||
"website" => app.website,
|
||||
"client_id" => app.client_id,
|
||||
"client_secret" => app.client_secret,
|
||||
"id" => app.id |> to_string(),
|
||||
"redirect_uri" => app.redirect_uris,
|
||||
"vapid_key" => Push.vapid_config() |> Keyword.get(:public_key)
|
||||
}
|
||||
|
||||
assert expected == json_response_and_validate_schema(conn, 200)
|
||||
assert app.user_id == nil
|
||||
end
|
||||
|
||||
test "creates an oauth app with a user", %{conn: conn} do
|
||||
user = insert(:user)
|
||||
app_attrs = build(:oauth_app)
|
||||
|
||||
|
@ -60,5 +87,6 @@ defmodule Pleroma.Web.MastodonAPI.AppControllerTest do
|
|||
}
|
||||
|
||||
assert expected == json_response_and_validate_schema(conn, 200)
|
||||
assert app.user_id == user.id
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in a new issue