diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-06-17 15:38:10 -0500 |
| commit | 3a03d9b65f96099e7c7a831469532c2cec7294c6 (patch) | |
| tree | 46d84731c3a53157117fc4c8141fdf6b3d7b8b25 /lib/pleroma/web/masto_fe_controller.ex | |
| parent | a704d5499c03cb5609ea38a5f2ef06095ced3ef3 (diff) | |
| parent | a8adc300d4cfc88ef19f1977e32068437ed4ad00 (diff) | |
| download | pleroma-nsfw-api-mrf.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into nsfw-api-mrfnsfw-api-mrf
Diffstat (limited to 'lib/pleroma/web/masto_fe_controller.ex')
| -rw-r--r-- | lib/pleroma/web/masto_fe_controller.ex | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/lib/pleroma/web/masto_fe_controller.ex b/lib/pleroma/web/masto_fe_controller.ex index e788ab37a..d2460f51d 100644 --- a/lib/pleroma/web/masto_fe_controller.ex +++ b/lib/pleroma/web/masto_fe_controller.ex @@ -8,13 +8,12 @@ defmodule Pleroma.Web.MastoFEController do alias Pleroma.User alias Pleroma.Web.MastodonAPI.AuthController alias Pleroma.Web.OAuth.Token - alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug alias Pleroma.Web.Plugs.OAuthScopesPlug plug(OAuthScopesPlug, %{scopes: ["write:accounts"]} when action == :put_settings) # Note: :index action handles attempt of unauthenticated access to private instance with redirect - plug(:skip_plug, EnsurePublicOrAuthenticatedPlug when action == :index) + plug(:skip_public_check when action == :index) plug( OAuthScopesPlug, @@ -22,10 +21,7 @@ defmodule Pleroma.Web.MastoFEController do when action == :index ) - plug( - :skip_plug, - [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] when action == :manifest - ) + plug(:skip_auth when action == :manifest) @doc "GET /web/*path" def index(conn, _params) do |