diff --git a/app/models/user.rb b/app/models/user.rb index ea0860e..f954e9a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -128,7 +128,8 @@ class User < ActiveRecord::Base end #FIXME make this test - def private_token_expired? + def private_token_expired? + return true if self.private_token_generated_at.nil? self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now) end @@ -354,19 +355,6 @@ class User < ActiveRecord::Base @is_password_required = false end - #FIXME make this test - def generate_private_token! - self.private_token = SecureRandom.hex - self.private_token_generated_at = DateTime.now - save(:validate => false) - end - - #FIXME make this test - def private_token_expired? - self.generate_private_token! if self.private_token.nil? || (self.private_token_generated_at + 2.weeks < DateTime.now) - end - - protected def normalize_email -- libgit2 0.21.2