diff options
| author | feld <feld@feld.me> | 2021-06-09 19:04:40 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2021-06-09 19:04:40 +0000 |
| commit | b84873d3df729f76d0571ff7a0df78412b95959c (patch) | |
| tree | 739481b9c3ce2d9bde53b398aba287dfbeee3588 /lib | |
| parent | 3972d7117e061c7c2fb685c57427117ee02d1024 (diff) | |
| parent | 15e2aaa9f6e2201c46d18d8ddead922a2ef3288f (diff) | |
| download | pleroma-b84873d3df729f76d0571ff7a0df78412b95959c.tar.gz | |
Merge branch 'cycles-ci' into 'develop'
Prevent compile-time cycles in CI
See merge request pleroma/pleroma!3420
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/tests/auth_test_controller.ex | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lib/pleroma/tests/auth_test_controller.ex b/lib/pleroma/tests/auth_test_controller.ex index ddf3fea4f..76514948b 100644 --- a/lib/pleroma/tests/auth_test_controller.ex +++ b/lib/pleroma/tests/auth_test_controller.ex @@ -9,7 +9,6 @@ defmodule Pleroma.Tests.AuthTestController do use Pleroma.Web, :controller alias Pleroma.User - alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug alias Pleroma.Web.Plugs.OAuthScopesPlug # Serves only with proper OAuth token (:api and :authenticated_api) @@ -47,10 +46,7 @@ defmodule Pleroma.Tests.AuthTestController do # Via :authenticated_api, serves if token is present and has requested scopes # # Suggested use: as :fallback_oauth_check but open with nil :user for :api on private instances - plug( - :skip_plug, - EnsurePublicOrAuthenticatedPlug when action == :fallback_oauth_skip_publicity_check - ) + plug(:skip_public_check when action == :fallback_oauth_skip_publicity_check) plug( OAuthScopesPlug, @@ -62,11 +58,7 @@ defmodule Pleroma.Tests.AuthTestController do # Via :authenticated_api, serves if :user is set (regardless of token presence and its scopes) # # Suggested use: making an :api endpoint always accessible (e.g. email confirmation endpoint) - plug( - :skip_plug, - [OAuthScopesPlug, EnsurePublicOrAuthenticatedPlug] - when action == :skip_oauth_skip_publicity_check - ) + plug(:skip_auth when action == :skip_oauth_skip_publicity_check) # Via :authenticated_api, always fails with 403 (endpoint is insecure) # Via :api, drops :user if present and serves if public (private instance rejects on no user) |