LegacyAuthenticationPlug module name

diff --git a/docs/dev.md b/docs/dev.md
index 085d66760f7bc679528d064a20232df87525594e..e3e04c8ebc1fc6acc35b3f1aab6b7f8f6d4bb343 100644 (file)
--- 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 a770816e1386e555f34fa9bf90431be369937e8f..2a54d0b5905c2a88841bce78015a2c3debc84415 100644 (file)
--- 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 2deb4bbbb6d2ceaf321da4983fccd520732d2c87..11a8e509cf369aa2b7bac2ce87b502549828a320 100644 (file)
--- 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 a0e1a7909aebe389c8ffe3e3bcbfe8780948717b..0a2f6f22f427d8729269e1e5046e9040fdc02bb8 100644 (file)
--- 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