diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-06 13:59:10 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2020-12-06 13:59:10 +0300 |
| commit | e9859b68fcb9c38b2ec27a45ffe0921e8d78b5e1 (patch) | |
| tree | 36bd43aaa4c9e1185e26d9c5b3ab26335b0c84da /lib/pleroma/web.ex | |
| parent | d50a3345ae7873f8a8744eba8a3eb755e2b8dfdc (diff) | |
[#3112] Ensured presence and consistency of :user and :token assigns (EnsureUserTokenAssignsPlug). Refactored auth info dropping functions.
Diffstat (limited to 'lib/pleroma/web.ex')
| -rw-r--r-- | lib/pleroma/web.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web.ex b/lib/pleroma/web.ex index 6ed19d3dd..3ca20455d 100644 --- a/lib/pleroma/web.ex +++ b/lib/pleroma/web.ex @@ -20,6 +20,7 @@ defmodule Pleroma.Web do below. """ + alias Pleroma.Helpers.AuthHelper alias Pleroma.Web.Plugs.EnsureAuthenticatedPlug alias Pleroma.Web.Plugs.EnsurePublicOrAuthenticatedPlug alias Pleroma.Web.Plugs.ExpectAuthenticatedCheckPlug @@ -75,7 +76,7 @@ defmodule Pleroma.Web do defp maybe_drop_authentication_if_oauth_check_ignored(conn) do if PlugHelper.plug_called?(conn, ExpectPublicOrAuthenticatedCheckPlug) and not PlugHelper.plug_called_or_skipped?(conn, OAuthScopesPlug) do - OAuthScopesPlug.drop_auth_info(conn) + AuthHelper.drop_auth_info(conn) else conn end |