logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 96d320bdfecdb147cfbd7e74156f546885821915
parent a6d8cef33e9ac91c373d0ac4c96a42bd941fe6b2
Author: Alexander Strizhakov <alex.strizhakov@gmail.com>
Date:   Wed, 24 Jun 2020 09:59:21 +0300

OAuthPlug module name

Diffstat:

Mlib/pleroma/web/plugs/o_auth_plug.ex2+-
Mlib/pleroma/web/router.ex4++--
Mtest/pleroma/web/plugs/o_auth_plug_test.exs2+-
3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/pleroma/web/plugs/o_auth_plug.ex b/lib/pleroma/web/plugs/o_auth_plug.ex @@ -2,7 +2,7 @@ # Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/> # SPDX-License-Identifier: AGPL-3.0-only -defmodule Pleroma.Plugs.OAuthPlug do +defmodule Pleroma.Web.Plugs.OAuthPlug do import Plug.Conn import Ecto.Query diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex @@ -12,7 +12,7 @@ defmodule Pleroma.Web.Router do pipeline :oauth do plug(:fetch_session) - plug(Pleroma.Plugs.OAuthPlug) + plug(Pleroma.Web.Plugs.OAuthPlug) plug(Pleroma.Web.Plugs.UserEnabledPlug) end @@ -25,7 +25,7 @@ defmodule Pleroma.Web.Router do end pipeline :authenticate do - plug(Pleroma.Plugs.OAuthPlug) + plug(Pleroma.Web.Plugs.OAuthPlug) plug(Pleroma.Plugs.BasicAuthDecoderPlug) plug(Pleroma.Web.Plugs.UserFetcherPlug) plug(Pleroma.Web.Plugs.SessionAuthenticationPlug) diff --git a/test/pleroma/web/plugs/o_auth_plug_test.exs b/test/pleroma/web/plugs/o_auth_plug_test.exs @@ -5,7 +5,7 @@ defmodule Pleroma.Web.Plugs.OAuthPlugTest do use Pleroma.Web.ConnCase, async: true - alias Pleroma.Plugs.OAuthPlug + alias Pleroma.Web.Plugs.OAuthPlug import Pleroma.Factory @session_opts [