Upgrade to rails 3.1.0

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

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index c45a3d569e0bdc8f7f2af78c9c7cef5dd0a3c160..376ad76443453b391644f0e075117f87d25bbd62 100644 (file)
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -1,8 +1,12 @@
 class OauthToken < ActiveRecord::Base
   belongs_to :client_application
   belongs_to :user
 class OauthToken < ActiveRecord::Base
   belongs_to :client_application
   belongs_to :user

+
+  scope :authorized, where("authorized_at IS NOT NULL and invalidated_at IS NULL")
+

   validates_uniqueness_of :token
   validates_presence_of :client_application, :token, :secret
   validates_uniqueness_of :token
   validates_presence_of :client_application, :token, :secret

+

   before_validation :generate_keys, :on => :create
   
   def self.find_token(token_key)
   before_validation :generate_keys, :on => :create
   
   def self.find_token(token_key)