diff --git a/app/models/user.rb b/app/models/user.rb index 294bed2..7df23f2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -170,11 +170,6 @@ class User < ActiveRecord::Base end end - TOKEN_VALIDITY = 2.weeks - def private_token_expired? - self.private_token.nil? || (self.private_token_generated_at + TOKEN_VALIDITY < DateTime.now) - end - # Activates the user in the database. def activate return false unless self.person diff --git a/lib/noosfero/api/helpers.rb b/lib/noosfero/api/helpers.rb index 5da1795..dd2cb5d 100644 --- a/lib/noosfero/api/helpers.rb +++ b/lib/noosfero/api/helpers.rb @@ -23,7 +23,6 @@ require_relative '../../find_by_contents' def current_user private_token = (params[PRIVATE_TOKEN_PARAM] || headers['Private-Token']).to_s @current_user ||= User.find_by_private_token(private_token) - @current_user = nil if !@current_user.nil? && @current_user.private_token_expired? @current_user end diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb index 5ddf150..f5de2f3 100644 --- a/test/unit/user_test.rb +++ b/test/unit/user_test.rb @@ -733,17 +733,6 @@ class UserTest < ActiveSupport::TestCase assert user.private_token, 'token' end - should 'check for private token validity' do - user = User.new - assert user.private_token_expired? - - user.generate_private_token! - assert !user.private_token_expired? - - user.private_token_generated_at = DateTime.now - (User::TOKEN_VALIDITY + 1.minute) - assert user.private_token_expired? - end - protected def new_user(options = {}) user = User.new({ :login => 'quire', :email => 'quire@example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options)) -- libgit2 0.21.2