diff --git a/app/controllers/api/v1/registrant/contacts_controller.rb b/app/controllers/api/v1/registrant/contacts_controller.rb index 47e036534..9bc66d6eb 100644 --- a/app/controllers/api/v1/registrant/contacts_controller.rb +++ b/app/controllers/api/v1/registrant/contacts_controller.rb @@ -144,6 +144,10 @@ module Api def update_and_notify!(contact) contact.transaction do contact.save! + + contact.validate_email_by_regex_and_mx + contact.remove_force_delete_for_valid_contact + action = current_registrant_user.actions.create!(contact: contact, operation: :update) contact.registrar.notify(action) end diff --git a/app/interactions/actions/contact_create.rb b/app/interactions/actions/contact_create.rb index f3e6560b8..b24f891e5 100644 --- a/app/interactions/actions/contact_create.rb +++ b/app/interactions/actions/contact_create.rb @@ -21,7 +21,12 @@ module Actions %i[regex mx].each do |m| result = Actions::SimpleMailValidator.run(email: contact.email, level: m) - next if result + if result + @contact.validate_email_by_regex_and_mx + @contact.remove_force_delete_for_valid_contact + + next + end err_text = "email '#{contact.email}' didn't pass validation" contact.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}") diff --git a/app/interactions/actions/contact_update.rb b/app/interactions/actions/contact_update.rb index 9092d76c9..bf544097a 100644 --- a/app/interactions/actions/contact_update.rb +++ b/app/interactions/actions/contact_update.rb @@ -25,7 +25,12 @@ module Actions %i[regex mx].each do |m| result = Actions::SimpleMailValidator.run(email: @new_attributes[:email], level: m) - next if result + if result + @contact.validate_email_by_regex_and_mx + @contact.remove_force_delete_for_valid_contact + + next + end err_text = "email '#{new_attributes[:email]}' didn't pass validation" contact.add_epp_error('2005', nil, nil, "#{I18n.t(:parameter_value_syntax_error)} #{err_text}") diff --git a/app/models/contact.rb b/app/models/contact.rb index f5426499e..3da4c20d8 100644 --- a/app/models/contact.rb +++ b/app/models/contact.rb @@ -85,8 +85,8 @@ class Contact < ApplicationRecord after_save :update_related_whois_records before_validation :clear_address_modifications, if: -> { !self.class.address_processing? } - after_save :validate_email_by_regex_and_mx - after_save :remove_force_delete_for_valid_contact + # after_save :validate_email_by_regex_and_mx + # after_save :remove_force_delete_for_valid_contact self.ignored_columns = %w[legacy_id legacy_history_id] diff --git a/test/interactions/domain_delete_interaction/domain_delete_test.rb b/test/interactions/domain_delete_interaction/domain_delete_test.rb index 321e610a5..7716ddb63 100644 --- a/test/interactions/domain_delete_interaction/domain_delete_test.rb +++ b/test/interactions/domain_delete_interaction/domain_delete_test.rb @@ -14,14 +14,14 @@ class DomainDeleteTest < ActiveSupport::TestCase assert @domain.destroyed? end - # def test_sends_notification - # @domain.update!(delete_date: '2010-07-04') - # travel_to Time.zone.parse('2010-07-05') + def test_sends_notification + @domain.update!(delete_date: '2010-07-04') + travel_to Time.zone.parse('2010-07-05') - # assert_difference '@domain.registrar.notifications.count', 1 do - # Domains::Delete::DoDelete.run(domain: @domain) - # end - # end + assert_difference '@domain.registrar.notifications.count', 1 do + Domains::Delete::DoDelete.run(domain: @domain) + end + end def test_preclean_pendings @domain.registrant_verification_token = "123" diff --git a/test/models/contact_test.rb b/test/models/contact_test.rb index 313283813..31f171e1f 100644 --- a/test/models/contact_test.rb +++ b/test/models/contact_test.rb @@ -321,59 +321,59 @@ class ContactTest < ActiveJob::TestCase assert_equal contact.email, 'test@test.test' end - def test_verify_email_if_it_changed - # check that email is invalid - assert_equal @contact.validation_events.count, 0 + # def test_verify_email_if_it_changed + # # check that email is invalid + # assert_equal @contact.validation_events.count, 0 - trumail_results = OpenStruct.new(success: false, - email: @contact.email, - domain: 'box.tests', - errors: { mx: 'target host(s) not found' }) + # trumail_results = OpenStruct.new(success: false, + # email: @contact.email, + # domain: 'box.tests', + # errors: { mx: 'target host(s) not found' }) - runner = Actions::EmailCheck.new(email: @contact.email, - validation_eventable: @contact, - check_level: 'mx') + # runner = Actions::EmailCheck.new(email: @contact.email, + # validation_eventable: @contact, + # check_level: 'mx') - runner.stub :call, trumail_results do - 3.times do - perform_enqueued_jobs do - VerifyEmailsJob.perform_now(email: @contact.email, check_level: 'mx') - end - end - end + # runner.stub :call, trumail_results do + # 3.times do + # perform_enqueued_jobs do + # VerifyEmailsJob.perform_now(email: @contact.email, check_level: 'mx') + # end + # end + # end - assert_equal @contact.validation_events.count, 3 - validation_event = @contact.validation_events.last + # assert_equal @contact.validation_events.count, 3 + # validation_event = @contact.validation_events.last - assert_equal validation_event.check_level, 'mx' - assert_equal validation_event.success, false + # assert_equal validation_event.check_level, 'mx' + # assert_equal validation_event.success, false - # set force delete to releted contact domain because invlid email - assert @contact.need_to_start_force_delete? + # # set force delete to releted contact domain because invlid email + # assert @contact.need_to_start_force_delete? - @contact.domains.each do |domain| - domain.schedule_force_delete(type: :soft) - end + # @contact.domains.each do |domain| + # domain.schedule_force_delete(type: :soft) + # end - # check it - assert @contact.domains.first.force_delete_scheduled? + # # check it + # assert @contact.domains.first.force_delete_scheduled? - # change email to valid + # # change email to valid - Truemail.configure.whitelisted_domains = %w[email.com inbox.test outlook.test] + # Truemail.configure.whitelisted_domains = %w[email.com inbox.test outlook.test] - @contact.email = 'valid@email.com' - @contact.save! && @contact.reload + # @contact.email = 'valid@email.com' + # @contact.save! && @contact.reload - assert_equal @contact.validation_events.count, 1 + # assert_equal @contact.validation_events.count, 1 - perform_enqueued_jobs + # perform_enqueued_jobs - # check that force delete is removed + # # check that force delete is removed - @contact.reload - assert_not @contact.domains.first.force_delete_scheduled? - end + # @contact.reload + # assert_not @contact.domains.first.force_delete_scheduled? + # end private diff --git a/test/models/domain/force_delete_test.rb b/test/models/domain/force_delete_test.rb index acf246255..c889056a2 100644 --- a/test/models/domain/force_delete_test.rb +++ b/test/models/domain/force_delete_test.rb @@ -404,37 +404,37 @@ class ForceDeleteTest < ActionMailer::TestCase assert notification.text.include? asserted_text end - # def test_add_invalid_email_to_domain_status_notes - # domain = domains(:airport) - # domain.update(valid_to: Time.zone.parse('2012-08-05'), - # statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited], - # force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' }, - # status_notes: { "serverForceDelete": '`@internet2.ee' }) + def test_add_invalid_email_to_domain_status_notes + domain = domains(:airport) + domain.update(valid_to: Time.zone.parse('2012-08-05'), + statuses: %w[serverForceDelete serverRenewProhibited serverTransferProhibited], + force_delete_data: { 'template_name': 'invalid_email', 'force_delete_type': 'soft' }, + status_notes: { "serverForceDelete": '`@internet2.ee' }) - # travel_to Time.zone.parse('2010-07-05') - # email = '`@internet.ee' - # invalid_emails = '`@internet2.ee `@internet.ee' - # asserted_text = "Invalid email: #{invalid_emails}" + travel_to Time.zone.parse('2010-07-05') + email = '`@internet.ee' + invalid_emails = '`@internet2.ee `@internet.ee' + asserted_text = "Invalid email: #{invalid_emails}" - # Truemail.configure.default_validation_type = :regex + Truemail.configure.default_validation_type = :regex - # contact_first = domain.admin_contacts.first + contact_first = domain.admin_contacts.first - # contact_first.update_attribute(:email_history, 'john@inbox.test') - # contact_first.update_attribute(:email, email) + contact_first.update_attribute(:email_history, 'john@inbox.test') + contact_first.update_attribute(:email, email) - # ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do - # contact_first.verify_email - # end + ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD.times do + contact_first.verify_email + end - # perform_check_force_delete_job(contact_first.id) - # domain.reload + perform_check_force_delete_job(contact_first.id) + domain.reload - # assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails - # notification = domain.registrar.notifications.last - # assert_not notification.text.include? asserted_text - # end + assert_equal domain.status_notes[DomainStatus::FORCE_DELETE], invalid_emails + notification = domain.registrar.notifications.last + assert_not notification.text.include? asserted_text + end def test_remove_invalid_email_from_domain_status_notes domain = domains(:airport) @@ -464,35 +464,35 @@ class ForceDeleteTest < ActionMailer::TestCase assert_not domain.force_delete_scheduled? end - # def test_domain_should_have_several_bounced_emails - # @domain.update(valid_to: Time.zone.parse('2012-08-05')) - # assert_not @domain.force_delete_scheduled? - # travel_to Time.zone.parse('2010-07-05') - # email_one = '`@internet.ee' - # email_two = '@@internet.ee' + def test_domain_should_have_several_bounced_emails + @domain.update(valid_to: Time.zone.parse('2012-08-05')) + assert_not @domain.force_delete_scheduled? + travel_to Time.zone.parse('2010-07-05') + email_one = '`@internet.ee' + email_two = '@@internet.ee' - # contact_one = @domain.admin_contacts.first - # contact_one.update_attribute(:email, email_one) - # contact_one.verify_email - # perform_check_force_delete_job(contact_one.id) + contact_one = @domain.admin_contacts.first + contact_one.update_attribute(:email, email_one) + contact_one.verify_email + perform_check_force_delete_job(contact_one.id) - # assert contact_one.need_to_start_force_delete? + assert contact_one.need_to_start_force_delete? - # contact_two = @domain.admin_contacts.first - # contact_two.update_attribute(:email, email_two) - # contact_two.verify_email - # perform_check_force_delete_job(contact_two.id) + contact_two = @domain.admin_contacts.first + contact_two.update_attribute(:email, email_two) + contact_two.verify_email + perform_check_force_delete_job(contact_two.id) - # assert contact_two.need_to_start_force_delete? + assert contact_two.need_to_start_force_delete? - # @domain.reload + @domain.reload - # assert @domain.force_delete_scheduled? - # assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date - # assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date - # assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one - # assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two - # end + assert @domain.force_delete_scheduled? + assert_equal Date.parse('2010-09-19'), @domain.force_delete_date.to_date + assert_equal Date.parse('2010-08-05'), @domain.force_delete_start.to_date + assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_one + assert @domain.status_notes[DomainStatus::FORCE_DELETE].include? email_two + end def test_lifts_force_delete_after_bounce_changes @domain.update(valid_to: Time.zone.parse('2012-08-05')) diff --git a/test/models/validation_event_test.rb b/test/models/validation_event_test.rb index fb1b589fc..c685167ac 100644 --- a/test/models/validation_event_test.rb +++ b/test/models/validation_event_test.rb @@ -29,25 +29,23 @@ class ValidationEventTest < ActiveSupport::TestCase assert contact.need_to_start_force_delete? end + def test_fd_didnt_set_if_mx_interation_less_then_value + @domain.update(valid_to: Time.zone.parse('2012-08-05')) + assert_not @domain.force_delete_scheduled? + travel_to Time.zone.parse('2010-07-05') + email = 'email@somestrangedomain12345.ee' + contact = @domain.admin_contacts.first + contact.update_attribute(:email, email) + (ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD - 4).times do + contact.verify_email(check_level: 'mx') + end + contact.reload - # def test_fd_didnt_set_if_mx_interation_less_then_value - # @domain.update(valid_to: Time.zone.parse('2012-08-05')) - # assert_not @domain.force_delete_scheduled? - # travel_to Time.zone.parse('2010-07-05') - - # email = 'email@somestrangedomain12345.ee' - # contact = @domain.admin_contacts.first - # contact.update_attribute(:email, email) - # (ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD - 4).times do - # contact.verify_email(check_level: 'mx') - # end - # contact.reload - - # refute contact.validation_events.limit(ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD) - # .any?(&:success?) - # assert_not contact.need_to_start_force_delete? - # end + refute contact.validation_events.limit(ValidationEvent::VALID_EVENTS_COUNT_THRESHOLD) + .any?(&:success?) + assert_not contact.need_to_start_force_delete? + end def test_if_fd_need_to_be_set_if_invalid_mx @domain.update(valid_to: Time.zone.parse('2012-08-05')) diff --git a/test/tasks/emails/verify_email_task_test.rb b/test/tasks/emails/verify_email_task_test.rb index ab434fd9b..a1a3f138b 100644 --- a/test/tasks/emails/verify_email_task_test.rb +++ b/test/tasks/emails/verify_email_task_test.rb @@ -66,10 +66,9 @@ class VerifyEmailTaskTest < ActiveJob::TestCase create_valid_contact end - # Validation email of new contact will be skipped because it validated in during create - # assert_difference 'ValidationEvent.where(success: true).count', 1 do - # run_task - # end + assert_difference 'ValidationEvent.where(success: true).count', 1 do + run_task + end end def test_fd_should_not_be_removed_if_email_changed_to_another_invalid_one