Merge remote-tracking branch 'upstream/pull/5410'

[rails.git] / lib / oauth.rb

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
 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
   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
 
   class Scope
     attr_reader :name


@@ -16,10 +19,9 @@ module Oauth
     end
   end
 
     end
   end
 

-  def self.scopes(oauth2: false, privileged: false)
+  def self.scopes(privileged: false)

     scopes = SCOPES
     scopes += PRIVILEGED_SCOPES if privileged
     scopes = SCOPES
     scopes += PRIVILEGED_SCOPES if privileged

-    scopes += OAUTH2_SCOPES if oauth2

     scopes.collect { |s| Scope.new(s) }
   end
 end
     scopes.collect { |s| Scope.new(s) }
   end
 end