Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances

# Conflicts:
#	lib/pleroma/web/feed/user_controller.ex
#	lib/pleroma/web/o_status/o_status_controller.ex
#	lib/pleroma/web/router.ex
#	lib/pleroma/web/static_fe/static_fe_controller.ex

1 files changed, 0 insertions, 26 deletions

diff --git a/lib/pleroma/web/oauth/token/strategy/revoke.ex b/lib/pleroma/web/oauth/token/strategy/revoke.ex
deleted file mode 100644
index 069c1ee21..000000000
--- a/lib/pleroma/web/oauth/token/strategy/revoke.ex
+++ /dev/null
@@ -1,26 +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.Web.OAuth.Token.Strategy.Revoke do
-  @moduledoc """
-  Functions for dealing with revocation.
-  """
-
-  alias Pleroma.Repo
-  alias Pleroma.Web.OAuth.App
-  alias Pleroma.Web.OAuth.Token
-
-  @doc "Finds and revokes access token for app and by token"
-  @spec revoke(App.t(), map()) :: {:ok, Token.t()} | {:error, :not_found | Ecto.Changeset.t()}
-  def revoke(%App{} = app, %{"token" => token} = _attrs) do
-    with {:ok, token} <- Token.get_by_token(app, token),
-         do: revoke(token)
-  end
-
-  @doc "Revokes access token"
-  @spec revoke(Token.t()) :: {:ok, Token.t()} | {:error, Ecto.Changeset.t()}
-  def revoke(%Token{} = token) do
-    Repo.delete(token)
-  end
-end