aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/controller.ex
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-06-09 02:20:00 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2021-06-09 02:20:00 +0000
commit53cf801c3000b1e20a1d42b56be82032d42782e9 (patch)
treec176d5ff3baec3a395304091e61fcd783f98ce75 /lib/pleroma/web/twitter_api/controller.ex
parenteba3c7b42feb6aa3d1c7a92dc9bbf0ac6cac641f (diff)
parent45b7325b9ef8110b424df3541b321c9a220f886c (diff)
downloadpleroma-53cf801c3000b1e20a1d42b56be82032d42782e9.tar.gz
Merge branch 'cycles-plug-deps' into 'develop'
Refactor skipped plugs into Pleroma.Web functions See merge request pleroma/pleroma!3463
Diffstat (limited to 'lib/pleroma/web/twitter_api/controller.ex')
-rw-r--r--lib/pleroma/web/twitter_api/controller.ex7
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/pleroma/web/twitter_api/controller.ex b/lib/pleroma/web/twitter_api/controller.ex
index e32713311..1e78ff2c1 100644
--- a/lib/pleroma/web/twitter_api/controller.ex
+++ b/lib/pleroma/web/twitter_api/controller.ex
@@ -7,17 +7,12 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
alias Pleroma.User
alias Pleroma.Web.OAuth.Token
- alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.TwitterAPI.TokenView
require Logger
- plug(
- :skip_plug,
- [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] when action == :confirm_email
- )
-
+ plug(:skip_auth when action == :confirm_email)
plug(:skip_plug, OAuthScopesPlug when action in [:oauth_tokens, :revoke_token])
action_fallback(:errors)