remove trailing white-spaces from app/models/token.rb.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@6508 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
e86f9711b9
commit
04fe3babc1
@ -1,16 +1,16 @@
|
|||||||
# Redmine - project management software
|
# Redmine - project management software
|
||||||
# Copyright (C) 2006-2009 Jean-Philippe Lang
|
# Copyright (C) 2006-2011 Jean-Philippe Lang
|
||||||
#
|
#
|
||||||
# This program is free software; you can redistribute it and/or
|
# This program is free software; you can redistribute it and/or
|
||||||
# modify it under the terms of the GNU General Public License
|
# modify it under the terms of the GNU General Public License
|
||||||
# as published by the Free Software Foundation; either version 2
|
# as published by the Free Software Foundation; either version 2
|
||||||
# of the License, or (at your option) any later version.
|
# of the License, or (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This program is distributed in the hope that it will be useful,
|
# This program is distributed in the hope that it will be useful,
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
@ -18,30 +18,30 @@
|
|||||||
class Token < ActiveRecord::Base
|
class Token < ActiveRecord::Base
|
||||||
belongs_to :user
|
belongs_to :user
|
||||||
validates_uniqueness_of :value
|
validates_uniqueness_of :value
|
||||||
|
|
||||||
before_create :delete_previous_tokens
|
before_create :delete_previous_tokens
|
||||||
|
|
||||||
@@validity_time = 1.day
|
@@validity_time = 1.day
|
||||||
|
|
||||||
def before_create
|
def before_create
|
||||||
self.value = Token.generate_token_value
|
self.value = Token.generate_token_value
|
||||||
end
|
end
|
||||||
|
|
||||||
# Return true if token has expired
|
# Return true if token has expired
|
||||||
def expired?
|
def expired?
|
||||||
return Time.now > self.created_on + @@validity_time
|
return Time.now > self.created_on + @@validity_time
|
||||||
end
|
end
|
||||||
|
|
||||||
# Delete all expired tokens
|
# Delete all expired tokens
|
||||||
def self.destroy_expired
|
def self.destroy_expired
|
||||||
Token.delete_all ["action <> 'feeds' AND created_on < ?", Time.now - @@validity_time]
|
Token.delete_all ["action <> 'feeds' AND created_on < ?", Time.now - @@validity_time]
|
||||||
end
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def self.generate_token_value
|
def self.generate_token_value
|
||||||
ActiveSupport::SecureRandom.hex(20)
|
ActiveSupport::SecureRandom.hex(20)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Removes obsolete tokens (same user and action)
|
# Removes obsolete tokens (same user and action)
|
||||||
def delete_previous_tokens
|
def delete_previous_tokens
|
||||||
if user
|
if user
|
||||||
|
Loading…
x
Reference in New Issue
Block a user