Delete previous tokens when creating a new one.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2778 e93f8b46-1217-0410-a6f0-8f06a7374b81

Delete previous tokens when creating a new one.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2778 e93f8b46-1217-0410-a6f0-8f06a7374b81
6da0542a · Jean-Philippe Lang · 62e58f26 · 6da0542a · 6da0542a
Commit 6da0542a authored Jun 02, 2009 by Jean-Philippe Lang
Hide whitespace changes
Inline Side-by-side

Showing with 22 additions and 4 deletions

token.rb app/models/token.rb +11 -2

token_test.rb test/unit/token_test.rb +11 -2

No files found.
--- a/app/models/token.rb
+++ b/app/models/token.rb
-# redMine - project management software
+# Redmine - project management software
-# Copyright (C) 2006  Jean-Philippe Lang
+# Copyright (C) 2006-2009  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,6 +19,8 @@ class Token < ActiveRecord::Base
  belongs_to :user
  validates_uniqueness_of :value
+  before_create :delete_previous_tokens
  @@validity_time = 1.day
  def before_create
@@ -39,4 +41,11 @@ private
  def self.generate_token_value
    ActiveSupport::SecureRandom.hex(20)
  end
+  # Removes obsolete tokens (same user and action)
+  def delete_previous_tokens
+    if user
+      Token.delete_all(['user_id = ? AND action = ?', user.id, action])
+    end
+  end
 end
--- a/test/unit/token_test.rb
+++ b/test/unit/token_test.rb
-# redMine - project management software
+# Redmine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2009  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -26,4 +26,13 @@ class TokenTest < Test::Unit::TestCase
    assert_equal 40, token.value.length
    assert !token.expired?
  end
+  def test_create_should_remove_existing_tokens
+    user = User.find(1)
+    t1 = Token.create(:user => user, :action => 'autologin')
+    t2 = Token.create(:user => user, :action => 'autologin')
+    assert_not_equal t1.value, t2.value
+    assert !Token.exists?(t1.id)
+    assert  Token.exists?(t2.id)
+  end
 end