Merge remote-tracking branch 'origin/develop' into global-status-expiration

[akkoma] / lib / pleroma / web / oauth.ex

diff --git a/lib/pleroma/web/oauth.ex b/lib/pleroma/web/oauth.ex
index f3bac33c83409865ceca9b9dde7ef646be3e2a60..2f1b8708d54af29210c1b2fd1d8578058531181a 100644 (file)
--- a/lib/pleroma/web/oauth.ex
+++ b/lib/pleroma/web/oauth.ex
@@ -1,28 +1,6 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OAuth do
-  @authenticator Application.get_env(
-                   :pleroma,
-                   Pleroma.Web.AuthenticatorAdapter,
-                   Pleroma.Web.Authenticator
-                 )
-
-  def authenticator, do: @authenticator
-
-  def parse_scopes(scopes, _default) when is_list(scopes) do
-    Enum.filter(scopes, &(&1 not in [nil, ""]))
-  end
-
-  def parse_scopes(scopes, default) when is_binary(scopes) do
-    scopes
-    |> String.trim()
-    |> String.split(~r/[\s,]+/)
-    |> parse_scopes(default)
-  end
-
-  def parse_scopes(_, default) do
-    default
-  end
 end