meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Code cleanup.

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@13682 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2014-11-30 16:39:20 +00:00
parent f1308e64af
commit 62cf53384d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/models/token.rb
View File

@ -22,7 +22,8 @@ class Token < ActiveRecord::Base
before_create :delete_previous_tokens, :generate_new_token
@@validity_time = 1.day
cattr_accessor :validity_time
self.validity_time = 1.day
def generate_new_token
self.value = Token.generate_token_value
@ -30,12 +31,12 @@ class Token < ActiveRecord::Base
# Return true if token has expired
def expired?
return Time.now > self.created_on + @@validity_time
return Time.now > self.created_on + self.class.validity_time
end
# Delete all expired tokens
def self.destroy_expired
Token.delete_all ["action NOT IN (?) AND created_on < ?", ['feeds', 'api'], Time.now - @@validity_time]
Token.where("action NOT IN (?) AND created_on < ?", ['feeds', 'api'], Time.now - validity_time).delete_all
end
# Returns the active user who owns the key for the given action
@ -78,7 +79,7 @@ class Token < ActiveRecord::Base
# Removes obsolete tokens (same user and action)
def delete_previous_tokens
if user
Token.delete_all(['user_id = ? AND action = ?', user.id, action])
Token.where(:user_id => user.id, :action => action).delete_all
end
end
end