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, 30 deletions

diff --git a/lib/pleroma/web/oauth/oauth_view.ex b/lib/pleroma/web/oauth/oauth_view.ex
deleted file mode 100644
index f55247ebd..000000000
--- a/lib/pleroma/web/oauth/oauth_view.ex
+++ /dev/null
@@ -1,30 +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.OAuthView do
-  use Pleroma.Web, :view
-  import Phoenix.HTML.Form
-
-  alias Pleroma.Web.OAuth.Token.Utils
-
-  def render("token.json", %{token: token} = opts) do
-    response = %{
-      token_type: "Bearer",
-      access_token: token.token,
-      refresh_token: token.refresh_token,
-      expires_in: expires_in(),
-      scope: Enum.join(token.scopes, " "),
-      created_at: Utils.format_created_at(token)
-    }
-
-    if user = opts[:user] do
-      response
-      |> Map.put(:me, user.ap_id)
-    else
-      response
-    end
-  end
-
-  defp expires_in, do: Pleroma.Config.get([:oauth2, :token_expires_in], 600)
-end