Download as
Browse Code »

Commit 1def090dc48c94c2722a2f97f0a86f5a89acb6ee

Authored by AntonioTerceiro
1 parent 114c4651
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

ActionItem9: minor doc work 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@194 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 1 changed file with 6 additions and 1 deletions   Show diff stats
app/models/user.rb
  Diff comments   View file @1def090
@@ -41,10 +41,12 @@ class User < ActiveRecord::Base @@ -41,10 +41,12 @@ class User < ActiveRecord::Base
41 self.class.encrypt(password, salt) 41 self.class.encrypt(password, salt)
42 end 42 end
43 43
  44 + # returns +true+ if the +password+ is the correct one for the user
44 def authenticated?(password) 45 def authenticated?(password)
45 crypted_password == encrypt(password) 46 crypted_password == encrypt(password)
46 end 47 end
47 48
  49 + # tells if the user has an authentication cookie
48 def remember_token? 50 def remember_token?
49 remember_token_expires_at && Time.now.utc < remember_token_expires_at 51 remember_token_expires_at && Time.now.utc < remember_token_expires_at
50 end 52 end
@@ -56,6 +58,7 @@ class User &lt; ActiveRecord::Base @@ -56,6 +58,7 @@ class User &lt; ActiveRecord::Base
56 save(false) 58 save(false)
57 end 59 end
58 60
  61 + # throws the auth cookie away
59 def forget_me 62 def forget_me
60 self.remember_token_expires_at = nil 63 self.remember_token_expires_at = nil
61 self.remember_token = nil 64 self.remember_token = nil
@@ -87,7 +90,9 @@ class User &lt; ActiveRecord::Base @@ -87,7 +90,9 @@ class User &lt; ActiveRecord::Base
87 self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record? 90 self.salt = Digest::SHA1.hexdigest("--#{Time.now.to_s}--#{login}--") if new_record?
88 self.crypted_password = encrypt(password) 91 self.crypted_password = encrypt(password)
89 end 92 end
90 - 93 +
  94 + # auxiliary method to test if a password must be supplied (i.e. returns
  95 + # +true+ when creating an user without supplying a password)
91 def password_required? 96 def password_required?
92 crypted_password.blank? || !password.blank? 97 crypted_password.blank? || !password.blank?
93 end 98 end