pleroma

commit: b9ebb55d2aabdf4c99b05efab9d4ad31b25f888d
parent: 10b0e55acffeeff5842421c12b3b26feb35336de
Author: lain <lain@soykaf.club>
Date:   Thu,  6 Aug 2020 16:54:32 +0000

Merge branch '2025-oauth-login-default-to-all-scopes' into 'develop'

[#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes

Closes #2025

See merge request pleroma/pleroma!2855
Diffstat:
M
lib/pleroma/web/oauth/oauth_controller.ex
7
+++++++

1 file changed, 7 insertions(+), 0 deletions(-)
diff --git a/lib/pleroma/web/oauth/oauth_controller.ex b/lib/pleroma/web/oauth/oauth_controller.ex
@@ -76,6 +76,13 @@ defmodule Pleroma.Web.OAuth.OAuthController do
     available_scopes = (app && app.scopes) || []
     scopes = Scopes.fetch_scopes(params, available_scopes)
 
+    scopes =
+      if scopes == [] do
+        available_scopes
+      else
+        scopes
+      end
+
     # Note: `params` might differ from `conn.params`; use `@params` not `@conn.params` in template
     render(conn, Authenticator.auth_template(), %{
       response_type: params["response_type"],