Merge branch 'master' into overpass

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

diff --git a/app/models/access_token.rb b/app/models/access_token.rb
index b773310ceb59374bb95647f5989492869fcea6ef..3aa6f9daf7fddfd587f5ae6f81b77942b9755d00 100644 (file)
--- a/app/models/access_token.rb
+++ b/app/models/access_token.rb
@@ -1,5 +1,11 @@
-class AccessToken<OauthToken
-  validates_presence_of :user
+class AccessToken < OauthToken
+  belongs_to :user
+  belongs_to :client_application
+
+  scope :valid, -> { where(:invalidated_at => nil) }
+
+  validates_presence_of :user, :secret
+
   before_create :set_authorized_at
   
 protected 
@@ -7,4 +13,4 @@ protected
   def set_authorized_at
     self.authorized_at = Time.now
   end
-end
\ No newline at end of file
+end