mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-24 09:00:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'authenticated-profile-fetching' into 'develop'

Browse source 
Allow profile fetching for authenticated users only.

Closes #54

See merge request pleroma/pleroma!7
This commit is contained in:
lambda 2017-11-07 18:58:22 +00:00
commit d761b1543a
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/pleroma/web/router.ex
View file

@ -138,7 +138,6 @@ defmodule Pleroma.Web.Router do
get "/search", TwitterAPI.Controller, :search get "/search", TwitterAPI.Controller, :search
get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline
get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end end
scope "/api", Pleroma.Web do scope "/api", Pleroma.Web do
@ -176,6 +175,8 @@ defmodule Pleroma.Web.Router do
get "/statuses/followers", TwitterAPI.Controller, :followers get "/statuses/followers", TwitterAPI.Controller, :followers
get "/statuses/friends", TwitterAPI.Controller, :friends get "/statuses/friends", TwitterAPI.Controller, :friends
get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end end
pipeline :ostatus do pipeline :ostatus do

6
test/web/twitter_api/twitter_api_controller_test.exs
View file

@ -405,11 +405,13 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do
describe "GET /api/externalprofile/show" do describe "GET /api/externalprofile/show" do
test "it returns the user", %{conn: conn} do test "it returns the user", %{conn: conn} do
user = insert(:user) user = insert(:user)
other_user = insert(:user)
conn = conn conn = conn
|> get("/api/externalprofile/show", %{profileurl: user.ap_id}) |> assign(:user, user)
|> get("/api/externalprofile/show", %{profileurl: other_user.ap_id})
assert json_response(conn, 200) == UserView.render("show.json", %{user: user}) assert json_response(conn, 200) == UserView.render("show.json", %{user: other_user})
end end
end end