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

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

diff --git a/app/models/oauth_nonce.rb b/app/models/oauth_nonce.rb
index 0952f068edc6b9a9d2525206e1fd5069c8ff7516..86463f297226e11dce96bcc55af1ffd31e92342e 100644 (file)
--- a/app/models/oauth_nonce.rb
+++ b/app/models/oauth_nonce.rb
@@ -2,7 +2,7 @@
 #
 # Table name: oauth_nonces
 #
-#  id         :integer          not null, primary key
+#  id         :bigint           not null, primary key
 #  nonce      :string
 #  timestamp  :integer
 #  created_at :datetime
@@ -15,15 +15,17 @@
 
 # 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
+class OauthNonce < ApplicationRecord
   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)
     return false if Time.now.to_i - timestamp.to_i > 86400
+
     oauth_nonce = OauthNonce.create(:nonce => nonce, :timestamp => timestamp.to_i)
     return false if oauth_nonce.new_record?
+
     oauth_nonce
   end
 end