Download as
Browse Code »

Commit 8a3a71500d90fe3c99a102beff10e84afc32fe45

Authored by Evandro Junior
1 parent 78d45848
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Removes 2 duplicates methods and fixes 1

Showing 1 changed file with 2 additions and 14 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @8a3a715
@@ -128,7 +128,8 @@ class User < ActiveRecord::Base @@ -128,7 +128,8 @@ class User < ActiveRecord::Base
128 end 128 end
129 129
130 #FIXME make this test 130 #FIXME make this test
131 - def private_token_expired? 131 + def private_token_expired?
  132 + return true if self.private_token_generated_at.nil?
132 self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now) 133 self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now)
133 end 134 end
134 135
@@ -354,19 +355,6 @@ class User &lt; ActiveRecord::Base @@ -354,19 +355,6 @@ class User &lt; ActiveRecord::Base
354 @is_password_required = false 355 @is_password_required = false
355 end 356 end
356 357
357 - #FIXME make this test  
358 - def generate_private_token!  
359 - self.private_token = SecureRandom.hex  
360 - self.private_token_generated_at = DateTime.now  
361 - save(:validate => false)  
362 - end  
363 -  
364 - #FIXME make this test  
365 - def private_token_expired?  
366 - self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now)  
367 - end  
368 -  
369 -  
370 protected 358 protected
371 359
372 def normalize_email 360 def normalize_email