Remove Oauth::OAUTH2_SCOPES

After OAuth1 was removed, all scopes are OAuth2 scopes. Former OAuth2-only scopes now can be combined with the rest.

diff --git a/app/views/oauth2_applications/_form.html.erb b/app/views/oauth2_applications/_form.html.erb
index 51267c069e3e80f486c803093c46ba197fa7d60a..7fde3e0e7f19d57aa0ca9b2a4ca0d7a43e49e3b4 100644 (file)
--- a/app/views/oauth2_applications/_form.html.erb
+++ b/app/views/oauth2_applications/_form.html.erb
@@ -3,5 +3,5 @@
 <%= f.form_group :confidential do %>
   <%= f.check_box :confidential %>
 <% end %>
-<%= f.collection_check_boxes :scopes, Oauth.scopes(:oauth2 => true, :privileged => current_user.administrator?), :name, :description %>
+<%= f.collection_check_boxes :scopes, Oauth.scopes(:privileged => current_user.administrator?), :name, :description %>
 <%= f.primary %>

diff --git a/config/initializers/doorkeeper.rb b/config/initializers/doorkeeper.rb
index c1d4e2f783127b92ee028c6bebf2c2841efd3dbf..a2df9167f420d37da6f3ab263dbf98efaddc4701 100644 (file)
--- a/config/initializers/doorkeeper.rb
+++ b/config/initializers/doorkeeper.rb
@@ -225,7 +225,7 @@ Doorkeeper.configure do
   # https://doorkeeper.gitbook.io/guides/ruby-on-rails/scopes
 
   # default_scopes  :public
-  optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES, *Oauth::OAUTH2_SCOPES)
+  optional_scopes(*Oauth::SCOPES, *Oauth::PRIVILEGED_SCOPES)
 
   # Allows to restrict only certain scopes for grant_type.
   # By default, all the scopes will be available for all the grant types.

diff --git a/lib/oauth.rb b/lib/oauth.rb
index a8f49762112a739ccb351ff130dd71bc678ba6e5..679c564a63223e500afecac1a4a19b62dd458b2a 100644 (file)
--- a/lib/oauth.rb
+++ b/lib/oauth.rb
@@ -1,8 +1,11 @@
 module Oauth
-  SCOPES = %w[read_prefs write_prefs write_diary write_api read_gpx write_gpx write_notes].freeze
+  SCOPES = %w[
+    read_prefs write_prefs write_diary
+    write_api read_gpx write_gpx write_notes write_redactions
+    consume_messages send_messages openid
+  ].freeze
   PRIVILEGED_SCOPES = %w[read_email skip_authorization].freeze
   MODERATOR_SCOPES = %w[write_redactions].freeze
-  OAUTH2_SCOPES = %w[write_redactions consume_messages send_messages openid].freeze
 
   class Scope
     attr_reader :name
@@ -16,10 +19,9 @@ module Oauth
     end
   end
 
-  def self.scopes(oauth2: false, privileged: false)
+  def self.scopes(privileged: false)
     scopes = SCOPES
     scopes += PRIVILEGED_SCOPES if privileged
-    scopes += OAUTH2_SCOPES if oauth2
     scopes.collect { |s| Scope.new(s) }
   end
 end