aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Strizhakov <alex.strizhakov@gmail.com>2020-06-24 10:01:40 +0300
committerAlexander Strizhakov <alex.strizhakov@gmail.com>2020-10-13 16:43:54 +0300
commite2332d92ceae60cf333b9ad930f80410daf6615e (patch)
tree8268c3ca04177b57e6519cd37738962306e2e474
parent96d320bdfecdb147cfbd7e74156f546885821915 (diff)
downloadpleroma-e2332d92ceae60cf333b9ad930f80410daf6615e.tar.gz
LegacyAuthenticationPlug module name
-rw-r--r--docs/dev.md2
-rw-r--r--lib/pleroma/web/plugs/legacy_authentication_plug.ex2
-rw-r--r--lib/pleroma/web/router.ex2
-rw-r--r--test/pleroma/web/plugs/legacy_authentication_plug_test.exs2
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/dev.md b/docs/dev.md
index 085d66760..e3e04c8eb 100644
--- a/docs/dev.md
+++ b/docs/dev.md
@@ -16,7 +16,7 @@ This document contains notes and guidelines for Pleroma developers.
## [HTTP Basic Authentication](https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Authorization)
-* With HTTP Basic Auth, OAuth scopes check is _not_ performed for any action (since password is provided during the auth, requester is able to obtain a token with full permissions anyways). `Pleroma.Plugs.AuthenticationPlug` and `Pleroma.Plugs.LegacyAuthenticationPlug` both call `Pleroma.Web.Plugs.OAuthScopesPlug.skip_plug(conn)` when password is provided.
+* With HTTP Basic Auth, OAuth scopes check is _not_ performed for any action (since password is provided during the auth, requester is able to obtain a token with full permissions anyways). `Pleroma.Plugs.AuthenticationPlug` and `Pleroma.Web.Plugs.LegacyAuthenticationPlug` both call `Pleroma.Web.Plugs.OAuthScopesPlug.skip_plug(conn)` when password is provided.
## Auth-related configuration, OAuth consumer mode etc.
diff --git a/lib/pleroma/web/plugs/legacy_authentication_plug.ex b/lib/pleroma/web/plugs/legacy_authentication_plug.ex
index a770816e1..2a54d0b59 100644
--- a/lib/pleroma/web/plugs/legacy_authentication_plug.ex
+++ b/lib/pleroma/web/plugs/legacy_authentication_plug.ex
@@ -2,7 +2,7 @@
# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
-defmodule Pleroma.Plugs.LegacyAuthenticationPlug do
+defmodule Pleroma.Web.Plugs.LegacyAuthenticationPlug do
import Plug.Conn
alias Pleroma.User
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 2deb4bbbb..11a8e509c 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -29,7 +29,7 @@ defmodule Pleroma.Web.Router do
plug(Pleroma.Plugs.BasicAuthDecoderPlug)
plug(Pleroma.Web.Plugs.UserFetcherPlug)
plug(Pleroma.Web.Plugs.SessionAuthenticationPlug)
- plug(Pleroma.Plugs.LegacyAuthenticationPlug)
+ plug(Pleroma.Web.Plugs.LegacyAuthenticationPlug)
plug(Pleroma.Plugs.AuthenticationPlug)
end
diff --git a/test/pleroma/web/plugs/legacy_authentication_plug_test.exs b/test/pleroma/web/plugs/legacy_authentication_plug_test.exs
index a0e1a7909..0a2f6f22f 100644
--- a/test/pleroma/web/plugs/legacy_authentication_plug_test.exs
+++ b/test/pleroma/web/plugs/legacy_authentication_plug_test.exs
@@ -7,7 +7,7 @@ defmodule Pleroma.Web.Plugs.LegacyAuthenticationPlugTest do
import Pleroma.Factory
- alias Pleroma.Plugs.LegacyAuthenticationPlug
+ alias Pleroma.Web.Plugs.LegacyAuthenticationPlug
alias Pleroma.Web.Plugs.OAuthScopesPlug
alias Pleroma.Web.Plugs.PlugHelper
alias Pleroma.User