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

[rails.git] / app / models / oauth2_application.rb

diff --git a/app/models/oauth2_application.rb b/app/models/oauth2_application.rb
index 16576152026328a3c750c43b62eb172ee358d7d6..834f1ded54393b6d8587f5fbc241f6980bee3b9a 100644 (file)
--- a/app/models/oauth2_application.rb
+++ b/app/models/oauth2_application.rb
@@ -1,8 +1,37 @@
+# == Schema Information
+#
+# Table name: oauth_applications
+#
+#  id           :bigint(8)        not null, primary key
+#  owner_type   :string           not null
+#  owner_id     :bigint(8)        not null
+#  name         :string           not null
+#  uid          :string           not null
+#  secret       :string           not null
+#  redirect_uri :text             not null
+#  scopes       :string           default(""), not null
+#  confidential :boolean          default(TRUE), not null
+#  created_at   :datetime         not null
+#  updated_at   :datetime         not null
+#
+# Indexes
+#
+#  index_oauth_applications_on_owner_type_and_owner_id  (owner_type,owner_id)
+#  index_oauth_applications_on_uid                      (uid) UNIQUE
+#
+# Foreign Keys
+#
+#  fk_rails_...  (owner_id => users.id)
+#

 class Oauth2Application < Doorkeeper::Application
   belongs_to :owner, :polymorphic => true
 
   validate :allowed_scopes
 
 class Oauth2Application < Doorkeeper::Application
   belongs_to :owner, :polymorphic => true
 
   validate :allowed_scopes
 

+  def authorized_scopes_for(user)
+    authorized_tokens.where(:resource_owner_id => user).sum(Doorkeeper::OAuth::Scopes.new, &:scopes)
+  end
+

   private
 
   def allowed_scopes
   private
 
   def allowed_scopes