moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

No need to filter out Mix.env() from the API routes.

This commit is contained in:
Mark Felder 2021-02-25 13:04:08 -06:00
parent 1552179792
commit 2da71a526f
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/pleroma/web.ex
View File

@ -28,8 +28,6 @@ defmodule Pleroma.Web do
alias Pleroma.Web.Plugs.OAuthScopesPlug alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.PlugHelper alias Pleroma.Web.Plugs.PlugHelper
@mix_env Mix.env()
def controller do def controller do
quote do quote do
use Phoenix.Controller, namespace: Pleroma.Web use Phoenix.Controller, namespace: Pleroma.Web
@ -238,11 +236,7 @@ def base_url do
def get_api_routes do def get_api_routes do
Pleroma.Web.Router.__routes__() Pleroma.Web.Router.__routes__()
|> Enum.reject(fn |> Enum.reject(fn r -> r.plug == Pleroma.Web.Fallback.RedirectController end)
r ->
r.plug == Pleroma.Web.Fallback.RedirectController or
String.starts_with?(r.path, "/#{@mix_env}")
end)
|> Enum.map(fn r -> |> Enum.map(fn r ->
r.path r.path
|> String.split("/", trim: true) |> String.split("/", trim: true)

1
test/pleroma/web/plugs/frontend_static_plug_test.exs
View File

@ -96,6 +96,7 @@ test "api routes are detected correctly" do
"auth", "auth",
"embed", "embed",
"proxy", "proxy",
"test",
"user_exists", "user_exists",
"check_password" "check_password"
] ]