[#468] Refactored OAuth scopes' defaults & missing selection handling.

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

diff --git a/lib/pleroma/web/oauth.ex b/lib/pleroma/web/oauth.ex
index 44b83433e847e1bc6c15e31857324c7ba397cbe1..d2835a0ba579c8a5c94b9a79736f07f9b48dd58a 100644 (file)
--- a/lib/pleroma/web/oauth.ex
+++ b/lib/pleroma/web/oauth.ex
@@ -3,9 +3,18 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 
 defmodule Pleroma.Web.OAuth do
-  def parse_scopes(scopes) do
+  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
-    |> to_string()
-    |> String.split([" ", ","])
+    |> String.trim()
+    |> String.split(~r/[\s,]+/)
+    |> parse_scopes(default)
+  end
+
+  def parse_scopes(_, default) do
+    default
   end
 end