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

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

diff --git a/app/models/access_token.rb b/app/models/access_token.rb
index 1f172c5f009b547e51f71388f02356f21603197c..f690c97542472dfa4fdbc54b5826e5dea4cf2d37 100644 (file)
--- a/app/models/access_token.rb
+++ b/app/models/access_token.rb
@@ -2,14 +2,14 @@ class AccessToken < OauthToken
   belongs_to :user
   belongs_to :client_application
 
-  scope :valid, where(:invalidated_at => nil)
+  scope :valid, -> { where(:invalidated_at => nil) }
 
-  validates_presence_of :user
+  validates :user, :secret, :presence => true
 
   before_create :set_authorized_at
-  
-protected 
-  
+
+  protected
+
   def set_authorized_at
     self.authorized_at = Time.now
   end