Merge remote-tracking branch 'openstreetmap/pull/1122'

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

diff --git a/app/models/oauth_nonce.rb b/app/models/oauth_nonce.rb
index 3ae50d3a4ba6ad4e06ee49f55f941bacc8b6953e..4d615dd5defcba96a238bf6cfbab81d55ff6b875 100644 (file)
--- a/app/models/oauth_nonce.rb
+++ b/app/models/oauth_nonce.rb
@@ -1,10 +1,8 @@
 # Simple store of nonces. The OAuth Spec requires that any given pair of nonce and timestamps are unique.
 # Thus you can use the same nonce with a different timestamp and viceversa.
 class OauthNonce < ActiveRecord::Base
 # Simple store of nonces. The OAuth Spec requires that any given pair of nonce and timestamps are unique.
 # Thus you can use the same nonce with a different timestamp and viceversa.
 class OauthNonce < ActiveRecord::Base

-  validates_presence_of :nonce, :timestamp
-  validates_uniqueness_of :nonce, :scope => :timestamp
-
-  attr_accessible :nonce, :timestamp
+  validates :timestamp, :presence => true
+  validates :nonce, :presence => true, :uniqueness => { :scope => :timestamp }

 
   # Remembers a nonce and it's associated timestamp. It returns false if it has already been used
   def self.remember(nonce, timestamp)
 
   # Remembers a nonce and it's associated timestamp. It returns false if it has already been used
   def self.remember(nonce, timestamp)