TF-2667 Write unit test for Domain & MailAddress class

core/lib/utils/mail/domain.dart

@@ -1,33 +1,39 @@
+import 'dart:io';
+
+import 'package:core/utils/app_logger.dart';
 import 'package:equatable/equatable.dart';
 
 class Domain with EquatableMixin {
-  static final RegExp _dashMatcher = RegExp(r"[-_]");
-  static final RegExp _digitMatcher = RegExp(r"[0-9]");
-  static final RegExp _partCharMatcher = RegExp(r"[a-zA-Z0-9\-._]");
+  static final RegExp _dashMatcher = RegExp(r'[-_]');
+  static final RegExp _digitMatcher = RegExp(r'\d');
+  static final RegExp _partCharMatcher = RegExp(r'[A-Za-z0-9_\-.]');
 
   static final Domain localhost = Domain.of('localhost');
   static const int maximumDomainLength = 253;
 
   static String _removeBrackets(String domainName) {
-    if (!(domainName.startsWith("[") && domainName.endsWith("]"))) {
+    if (!(domainName.startsWith('[') && domainName.endsWith(']'))) {
       return domainName;
     }
     return domainName.substring(1, domainName.length - 1);
   }
 
-  static Domain of(String domain) {
-    assert(
-      domain.length <= maximumDomainLength,
-      'Domain name length should not exceed $maximumDomainLength characters'
-    );
+  static bool _allCharactersMatchRegex(String input, RegExp regex) {
+    for (int i = 0; i < input.length; i++) {
+      if (!regex.hasMatch(input[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
 
-    String domainWithoutBrackets = _removeBrackets(domain);
-    assert(
-      _partCharMatcher
-        .allMatches(domainWithoutBrackets)
-        .every((match) => match.group(0) != null),
-      'Domain parts ASCII chars must be a-z A-Z 0-9 - or _'
-    );
+  static Domain of(String? domain) {
+    assert(domain != null, 'Domain can not be null');
+    assert(domain!.isNotEmpty, 'Domain can not be empty');
+    assert(domain!.length <= maximumDomainLength, 'Domain name length should not exceed $maximumDomainLength characters');
+
+    String domainWithoutBrackets = _removeBrackets(domain!);
+    assert(_allCharactersMatchRegex(domainWithoutBrackets, _partCharMatcher), 'Domain parts ASCII chars must be a-z A-Z 0-9 - or _');
 
     int pos = 0;
     int nextDot = domainWithoutBrackets.indexOf('.');
@@ -42,17 +48,15 @@ class Domain with EquatableMixin {
     }
     _assertValidPart(domainWithoutBrackets, pos, domainWithoutBrackets.length);
     _assertValidLastPart(domainWithoutBrackets, pos);
+
     return Domain._(domainWithoutBrackets);
   }
 
   static void _assertValidPart(String domainPart, int begin, int end) {
     assert(begin != end, "Domain part should not be empty");
-    assert(!_dashMatcher.hasMatch(domainPart[begin]),
-        "Domain part should not start with '-' or '_'");
-    assert(!_dashMatcher.hasMatch(domainPart[end - 1]),
-        "Domain part should not end with '-' or '_'");
-    assert(
-        end - begin <= 63, "Domain part should not not exceed 63 characters");
+    assert(!_dashMatcher.hasMatch(domainPart[begin]), "Domain part should not start with '-' or '_'");
+    assert(!_dashMatcher.hasMatch(domainPart[end - 1]), "Domain part should not end with '-' or '_'");
+    assert(end - begin <= 63, "Domain part should not not exceed 63 characters");
   }
 
   static void _assertValidLastPart(String domainPart, int pos) {
@@ -63,9 +67,10 @@ class Domain with EquatableMixin {
 
   static bool _validIPAddress(String value) {
     try {
-      Uri.parseIPv6Address(value);
+      InternetAddress(value);
       return true;
     } catch (e) {
+      logError('Domain::validIPAddress: Exception = $e');
       return false;
     }
   }
@@ -73,16 +78,11 @@ class Domain with EquatableMixin {
   final String domainName;
   final String normalizedDomainName;
 
-  Domain._(this.domainName)
-      : normalizedDomainName = _removeBrackets(domainName.toLowerCase());
+  Domain._(this.domainName) : normalizedDomainName = _removeBrackets(domainName.toLowerCase());
 
-  String name() {
-    return domainName;
-  }
+  String name() => domainName;
 
-  String asString() {
-    return normalizedDomainName;
-  }
+  String asString() => normalizedDomainName;
 
   @override
   bool operator ==(Object other) {
@@ -104,4 +104,4 @@ class Domain with EquatableMixin {
 
   @override
   List<Object?> get props => [domainName];
-}
+}

core/lib/utils/mail/mail_address.dart

@@ -25,19 +25,15 @@ class MailAddress with EquatableMixin {
 
   MailAddress({required this.localPart, required this.domain});
 
-  String asString() {
-    return '$localPart@${domain.asString()}';
-  }
-
-  String asPrettyString() {
-    return '<${asString()}>';
-  }
-
-  static MailAddress validate(String address) {
+  factory MailAddress.validateAddress(String address) {
+    log('MailAddress::validate: Address = $address');
     String localPart;
     Domain domain;
 
     address = address.trim();
+    if (address.isEmpty) {
+      throw AddressException('Addresses should not be empty');
+    }
     int pos = 0;
 
     // Test if mail address has source routing information (RFC-821) and get rid of it!!
@@ -96,7 +92,7 @@ class MailAddress with EquatableMixin {
         throw AddressException('No domain found at position ${pos + 1} in "$address"');
       }
     } catch (e) {
-      log('MailAddress::validate: Exception = $e');
+      logError('MailAddress::validate: Exception = $e');
       if (e is AddressException) {
         rethrow;
       } else {
@@ -114,11 +110,38 @@ class MailAddress with EquatableMixin {
 
     domain = _createDomain(domainSB.toString());
 
-    log('MailAddress::validate: localPart = $localPart | domain = $domain');
-
     return MailAddress(localPart: localPart, domain: domain);
   }
 
+  factory MailAddress.validateLocalPartAndDomain({required String localPart, required dynamic domain}) {
+    if (domain is Domain) {
+      return MailAddress.validateAddress('$localPart@${domain.name()}');
+    } else {
+      return MailAddress.validateAddress('$localPart@$domain');
+    }
+  }
+
+  String asString() {
+    return '$localPart@${domain.asString()}';
+  }
+
+  String asPrettyString() {
+    return '<${asString()}>';
+  }
+
+  Domain getDomain() {
+    return domain;
+  }
+
+  String getLocalPart() {
+    return localPart;
+  }
+
+  @override
+  String toString() {
+    return '$localPart@${domain.asString()}';
+  }
+
   static bool _haveDoubleDot(String localPart) {
     return localPart.contains('..');
   }