[Git][noosfero/noosfero][master] 2 commits: api: remove check of expired token

[Leandro Nunes]

Leandro Nunes pushed to branch master at Noosfero / noosfero


Commits:
1323bbe9 by Victor Costa at 2015-12-28T13:02:22Z
api: remove check of expired token

- - - - -
2b9e1360 by Leandro Nunes dos Santos at 2015-12-28T13:06:00Z
Merge branch 'participa/noosfero-remove_token_expired'

- - - - -


3 changed files:

- app/models/user.rb
- lib/noosfero/api/helpers.rb
- test/unit/user_test.rb


Changes:

=====================================
app/models/user.rb
=====================================
--- 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


=====================================
lib/noosfero/api/helpers.rb
=====================================
--- 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
 


=====================================
test/unit/user_test.rb
=====================================
--- 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 at example.com', :password => 'quire', :password_confirmation => 'quire' }.merge(options))



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/e9c353c4c26f973935d2bb3177023d7e27149c2c...2b9e1360b7a945784b7ab0554e9233075f7702e5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151228/586a58af/attachment.html>