Merge remote-tracking branch 'origin/develop' into matrixmatrix

1 files changed, 0 insertions, 120 deletions

diff --git a/lib/pleroma/plugs/oauth_plug.ex b/lib/pleroma/plugs/oauth_plug.ex
deleted file mode 100644
index 6fa71ef47..000000000
--- a/lib/pleroma/plugs/oauth_plug.ex
+++ /dev/null
@@ -1,120 +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.OAuthPlug do
-  import Plug.Conn
-  import Ecto.Query
-
-  alias Pleroma.Repo
-  alias Pleroma.User
-  alias Pleroma.Web.OAuth.App
-  alias Pleroma.Web.OAuth.Token
-
-  @realm_reg Regex.compile!("Bearer\:?\s+(.*)$", "i")
-
-  def init(options), do: options
-
-  def call(%{assigns: %{user: %User{}}} = conn, _), do: conn
-
-  def call(%{params: %{"access_token" => access_token}} = conn, _) do
-    with {:ok, user, token_record} <- fetch_user_and_token(access_token) do
-      conn
-      |> assign(:token, token_record)
-      |> assign(:user, user)
-    else
-      _ ->
-        # token found, but maybe only with app
-        with {:ok, app, token_record} <- fetch_app_and_token(access_token) do
-          conn
-          |> assign(:token, token_record)
-          |> assign(:app, app)
-        else
-          _ -> conn
-        end
-    end
-  end
-
-  def call(conn, _) do
-    case fetch_token_str(conn) do
-      {:ok, token} ->
-        with {:ok, user, token_record} <- fetch_user_and_token(token) do
-          conn
-          |> assign(:token, token_record)
-          |> assign(:user, user)
-        else
-          _ ->
-            # token found, but maybe only with app
-            with {:ok, app, token_record} <- fetch_app_and_token(token) do
-              conn
-              |> assign(:token, token_record)
-              |> assign(:app, app)
-            else
-              _ -> conn
-            end
-        end
-
-      _ ->
-        conn
-    end
-  end
-
-  # Gets user by token
-  #
-  @spec fetch_user_and_token(String.t()) :: {:ok, User.t(), Token.t()} | nil
-  defp fetch_user_and_token(token) do
-    query =
-      from(t in Token,
-        where: t.token == ^token,
-        join: user in assoc(t, :user),
-        preload: [user: user]
-      )
-
-    # credo:disable-for-next-line Credo.Check.Readability.MaxLineLength
-    with %Token{user: user} = token_record <- Repo.one(query) do
-      {:ok, user, token_record}
-    end
-  end
-
-  @spec fetch_app_and_token(String.t()) :: {:ok, App.t(), Token.t()} | nil
-  defp fetch_app_and_token(token) do
-    query =
-      from(t in Token, where: t.token == ^token, join: app in assoc(t, :app), preload: [app: app])
-
-    with %Token{app: app} = token_record <- Repo.one(query) do
-      {:ok, app, token_record}
-    end
-  end
-
-  # Gets token from session by :oauth_token key
-  #
-  @spec fetch_token_from_session(Plug.Conn.t()) :: :no_token_found | {:ok, String.t()}
-  defp fetch_token_from_session(conn) do
-    case get_session(conn, :oauth_token) do
-      nil -> :no_token_found
-      token -> {:ok, token}
-    end
-  end
-
-  # Gets token from headers
-  #
-  @spec fetch_token_str(Plug.Conn.t()) :: :no_token_found | {:ok, String.t()}
-  defp fetch_token_str(%Plug.Conn{} = conn) do
-    headers = get_req_header(conn, "authorization")
-
-    with :no_token_found <- fetch_token_str(headers),
-         do: fetch_token_from_session(conn)
-  end
-
-  @spec fetch_token_str(Keyword.t()) :: :no_token_found | {:ok, String.t()}
-  defp fetch_token_str([]), do: :no_token_found
-
-  defp fetch_token_str([token | tail]) do
-    trimmed_token = String.trim(token)
-
-    case Regex.run(@realm_reg, trimmed_token) do
-      [_, match] -> {:ok, String.trim(match)}
-      _ -> fetch_token_str(tail)
-    end
-  end
-end