Merge branch 'release/2.2.0' into 'stable'v2.2.0

Release/2.2.0

See merge request pleroma/secteam/pleroma!19

1 files changed, 0 insertions, 41 deletions

diff --git a/lib/pleroma/plugs/ensure_authenticated_plug.ex b/lib/pleroma/plugs/ensure_authenticated_plug.ex
deleted file mode 100644
index 3fe550806..000000000
--- a/lib/pleroma/plugs/ensure_authenticated_plug.ex
+++ /dev/null
@@ -1,41 +0,0 @@
-# Pleroma: A lightweight social networking server
-# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
-# SPDX-License-Identifier: AGPL-3.0-only
-
-defmodule Pleroma.Plugs.EnsureAuthenticatedPlug do
-  import Plug.Conn
-  import Pleroma.Web.TranslationHelpers
-
-  alias Pleroma.User
-
-  use Pleroma.Web, :plug
-
-  def init(options) do
-    options
-  end
-
-  @impl true
-  def perform(
-        %{
-          assigns: %{
-            auth_credentials: %{password: _},
-            user: %User{multi_factor_authentication_settings: %{enabled: true}}
-          }
-        } = conn,
-        _
-      ) do
-    conn
-    |> render_error(:forbidden, "Two-factor authentication enabled, you must use a access token.")
-    |> halt()
-  end
-
-  def perform(%{assigns: %{user: %User{}}} = conn, _) do
-    conn
-  end
-
-  def perform(conn, _) do
-    conn
-    |> render_error(:forbidden, "Invalid credentials.")
-    |> halt()
-  end
-end