lib/generators/authkit/templates/app/models/user.rb in authkit-0.0.1 vs lib/generators/authkit/templates/app/models/user.rb in authkit-0.2.1

- old
+ new

@@ -30,24 +30,24 @@ # Confirm emails check for existing emails for uniqueness as a convenience validate :confirmation_email_uniqueness, if: :confirmation_email_set? def self.user_from_token(token) - verifier = ActiveSupport::MessageVerifier.new(Rails.application.config.secret_token) + verifier = ActiveSupport::MessageVerifier.new(Rails.application.config.secret_key_base) id = verifier.verify(token) - User.find_by_id(id) + User.where(id: id).first rescue ActiveSupport::MessageVerifier::InvalidSignature nil end # The tokens created by this method have unique indexes but they are digests of the # id which is unique. Because of this we shouldn't see a conflict. If we do, however # we want the ActiveRecord::StatementInvalid or ActiveRecord::RecordNotUnique exeception # to bubble up. def set_token(field) return unless self.persisted? - verifier = ActiveSupport::MessageVerifier.new(Rails.application.config.secret_token) + verifier = ActiveSupport::MessageVerifier.new(Rails.application.config.secret_key_base) self.send("#{field}_created_at=", Time.now) self.send("#{field}=", verifier.generate(self.id)) self.save end @@ -86,9 +86,14 @@ self.last_sign_in_at = self.current_sign_in_at self.last_sign_in_ip = self.current_sign_in_ip self.current_sign_in_at = Time.now self.current_sign_in_ip = ip self.save + end + + def send_welcome + # TODO: insert your mailer logic here + true end def clear_remember_token self.remember_token = nil self.remember_token_created_at = nil