MastodonAPI: Add GET /api/v1/apps/verify_credentials See merge request pleroma/pleroma!981tags/v1.1.4
@@ -18,6 +18,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do | |||
alias Pleroma.Web.ActivityPub.Visibility | |||
alias Pleroma.Web.CommonAPI | |||
alias Pleroma.Web.MastodonAPI.AccountView | |||
alias Pleroma.Web.MastodonAPI.AppView | |||
alias Pleroma.Web.MastodonAPI.FilterView | |||
alias Pleroma.Web.MastodonAPI.ListView | |||
alias Pleroma.Web.MastodonAPI.MastodonAPI | |||
@@ -51,16 +52,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do | |||
with cs <- App.register_changeset(%App{}, app_attrs), | |||
false <- cs.changes[:client_name] == @local_mastodon_name, | |||
{:ok, app} <- Repo.insert(cs) do | |||
res = %{ | |||
id: app.id |> to_string, | |||
name: app.client_name, | |||
client_id: app.client_id, | |||
client_secret: app.client_secret, | |||
redirect_uri: app.redirect_uris, | |||
website: app.website | |||
} | |||
json(conn, res) | |||
conn | |||
|> put_view(AppView) | |||
|> render("show.json", %{app: app}) | |||
end | |||
end | |||
@@ -132,6 +126,14 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do | |||
json(conn, account) | |||
end | |||
def verify_app_credentials(%{assigns: %{user: _user, token: token}} = conn, _) do | |||
with %Token{app: %App{} = app} <- Repo.preload(token, :app) do | |||
conn | |||
|> put_view(AppView) | |||
|> render("short.json", %{app: app}) | |||
end | |||
end | |||
def user(%{assigns: %{user: for_user}} = conn, %{"id" => nickname_or_id}) do | |||
with %User{} = user <- User.get_cached_by_nickname_or_id(nickname_or_id), | |||
true <- User.auth_active?(user) || user.id == for_user.id || User.superuser?(for_user) do | |||
@@ -0,0 +1,41 @@ | |||
# Pleroma: A lightweight social networking server | |||
# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/> | |||
# SPDX-License-Identifier: AGPL-3.0-only | |||
defmodule Pleroma.Web.MastodonAPI.AppView do | |||
use Pleroma.Web, :view | |||
alias Pleroma.Web.OAuth.App | |||
@vapid_key :web_push_encryption | |||
|> Application.get_env(:vapid_details, []) | |||
|> Keyword.get(:public_key) | |||
def render("show.json", %{app: %App{} = app}) do | |||
%{ | |||
id: app.id |> to_string, | |||
name: app.client_name, | |||
client_id: app.client_id, | |||
client_secret: app.client_secret, | |||
redirect_uri: app.redirect_uris, | |||
website: app.website | |||
} | |||
|> with_vapid_key() | |||
end | |||
def render("short.json", %{app: %App{website: webiste, client_name: name}}) do | |||
%{ | |||
name: name, | |||
website: webiste | |||
} | |||
|> with_vapid_key() | |||
end | |||
defp with_vapid_key(data) do | |||
if @vapid_key do | |||
Map.put(data, "vapid_key", @vapid_key) | |||
else | |||
data | |||
end | |||
end | |||
end |
@@ -328,6 +328,7 @@ defmodule Pleroma.Web.Router do | |||
get("/instance", MastodonAPIController, :masto_instance) | |||
get("/instance/peers", MastodonAPIController, :peers) | |||
post("/apps", MastodonAPIController, :create_app) | |||
get("/apps/verify_credentials", MastodonAPIController, :verify_app_credentials) | |||
get("/custom_emojis", MastodonAPIController, :custom_emojis) | |||
get("/statuses/:id/card", MastodonAPIController, :status_card) | |||
@@ -14,7 +14,9 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do | |||
alias Pleroma.Web.ActivityPub.ActivityPub | |||
alias Pleroma.Web.CommonAPI | |||
alias Pleroma.Web.MastodonAPI.FilterView | |||
alias Pleroma.Web.OAuth.App | |||
alias Pleroma.Web.OStatus | |||
alias Pleroma.Web.Push | |||
alias Pleroma.Web.TwitterAPI.TwitterAPI | |||
import Pleroma.Factory | |||
import ExUnit.CaptureLog | |||
@@ -332,6 +334,53 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIControllerTest do | |||
assert id == to_string(user.id) | |||
end | |||
test "apps/verify_credentials", %{conn: conn} do | |||
token = insert(:oauth_token) | |||
conn = | |||
conn | |||
|> assign(:user, token.user) | |||
|> assign(:token, token) | |||
|> get("/api/v1/apps/verify_credentials") | |||
app = Repo.preload(token, :app).app | |||
expected = %{ | |||
"name" => app.client_name, | |||
"website" => app.website, | |||
"vapid_key" => Push.vapid_config() |> Keyword.get(:public_key) | |||
} | |||
assert expected == json_response(conn, 200) | |||
end | |||
test "creates an oauth app", %{conn: conn} do | |||
user = insert(:user) | |||
app_attrs = build(:oauth_app) | |||
conn = | |||
conn | |||
|> assign(:user, user) | |||
|> 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(conn, 200) | |||
end | |||
test "get a status", %{conn: conn} do | |||
activity = insert(:note_activity) | |||