Update some more queries to use AREL in place of deprecated methods

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

diff --git a/app/models/oauth_token.rb b/app/models/oauth_token.rb
index f64ec53dbaf4869712d0b2bd1abc1f19a1dd1870..376ad76443453b391644f0e075117f87d25bbd62 100644 (file)
--- a/app/models/oauth_token.rb
+++ b/app/models/oauth_token.rb
@@ -1,9 +1,13 @@
 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
-  before_validation_on_create :generate_keys
+
+  before_validation :generate_keys, :on => :create
   
   def self.find_token(token_key)
     token = OauthToken.find_by_token(token_key, :include => :client_application)