hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'fix/api-fallback' into 'develop'

Browse source 
Do not fallback to index.html for /api/* routes

Closes #920

See merge request pleroma/pleroma!1182
This commit is contained in:
kaniini 2019-05-22 04:05:41 +00:00
commit ab6e15622b
4 changed files with 62 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -710,6 +710,7 @@ defmodule Pleroma.Web.Router do
scope "/", Fallback do
get("/registration/:token", RedirectController, :registration_page)
get("/:maybe_nickname_or_id", RedirectController, :redirector_with_meta)
get("/api*path", RedirectController, :api_not_implemented)
get("/*path", RedirectController, :redirector)
options("/*path", RedirectController, :empty)
@ -721,6 +722,12 @@ defmodule Fallback.RedirectController do
alias Pleroma.User
alias Pleroma.Web.Metadata
def api_not_implemented(conn, _params) do
conn
|> put_status(404)
|> json(%{error: "Not implemented"})
end
def redirector(conn, _params, code \\ 200) do
conn
|> put_resp_content_type("text/html")