Align host validation with Profile

Author: PetarSimonovic

app/models/school_email_domain.rb

@@ -18,14 +18,25 @@ def validate_domain
     value = "http://#{value}" unless %r{\A[a-z][a-z0-9+\-.]*://}i.match?(value)
     uri = URI.parse(value)
     host = uri.host&.delete_suffix('.')
-    return if host.blank?
+
+    validate_host(host)
+  rescue URI::InvalidURIError
+    errors.add(:domain, :invalid)
+  end
+
+  def validate_host(host)
+    accounts_host_format =
+      /\A\s*(?:[A-Za-z0-9](?:[A-Za-z0-9-]{0,61}[A-Za-z0-9])?\.)+[A-Za-z]{2,63}\s*\z/i
+
+    unless host&.match?(accounts_host_format)
+      errors.add(:domain, :invalid)
+      return
+    end
 
     if PublicSuffix.valid?(host)
       self.domain = host
     else
       errors.add(:domain, :invalid)
     end
-  rescue URI::InvalidURIError
-    errors.add(:domain, :invalid)
   end
 end

spec/models/school_email_domain_spec.rb

@@ -143,9 +143,11 @@
   context 'with an invalid domain' do
     it { is_expected.not_to allow_value('').for(:domain) }
     it { is_expected.not_to allow_value('   ').for(:domain) }
+    it { is_expected.not_to allow_value('http://').for(:domain) }
     it { is_expected.not_to allow_value('edu').for(:domain) }
     it { is_expected.not_to allow_value('com').for(:domain) }
     it { is_expected.not_to allow_value('co.uk').for(:domain) }
     it { is_expected.not_to allow_value('http://invalid uri').for(:domain) }
+    it { is_expected.not_to allow_value('-wrong.edu').for(:domain) }
   end
 end