Rolled back the URL validation logic.

wordpress-mobile · May 3, 2019 · 4a6e12e · 4a6e12e
1 parent 945564d
commit 4a6e12e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/WordPressAuthenticator/Model/LoginFields+Validation.swift b/WordPressAuthenticator/Model/LoginFields+Validation.swift
@@ -14,7 +14,11 @@ extension LoginFields {
     /// Returns *true* if the siteURL contains a valid URL. False otherwise.
     ///
     func validateSiteForSignin() -> Bool {
-        return siteAddress.isValidURL()
+        guard let url = URL(string: NSURL.idnEncodedURL(siteAddress)) else {
+            return false
+        }
+
+        return !url.absoluteString.isEmpty
     }
 
     /// Returns *true* if the credentials required for account creation have been provided.

diff --git a/WordPressAuthenticatorTests/Model/LoginFieldsValidationTests.swift b/WordPressAuthenticatorTests/Model/LoginFieldsValidationTests.swift
@@ -32,7 +32,7 @@ class LoginFieldsValidationTests: XCTestCase {
         XCTAssertFalse(loginFields.validateSiteForSignin(), "Empty site should not validate.")
 
         loginFields.siteAddress = "hostname"
-        XCTAssertFalse(loginFields.validateSiteForSignin(), "Since we want to validate simple mistakes, to use a hostname you'll need an http:// or https:// prefix.")
+        XCTAssertTrue(loginFields.validateSiteForSignin(), "Hostnames should validate.")
 
         loginFields.siteAddress = "http://hostname"
         XCTAssert(loginFields.validateSiteForSignin(), "Since we want to validate simple mistakes, to use a hostname you'll need an http:// or https:// prefix.")