Detect invalid WP site and return error (#841)

CHANGELOG.md

@@ -42,7 +42,7 @@ _None._
 
 ### Bug Fixes
 
-_None._
+- Detect invalid WordPress site address. [#841]
 
 ### Internal Changes
 

WordPressAuthenticator/Services/WordPressComBlogService.swift

@@ -42,6 +42,10 @@ class WordPressComBlogService {
             }
 
             let site = WordPressComSiteInfo(remote: response)
+            guard site.url != Constants.wordPressBlogURL else {
+                failure(ServiceError.invalidWordPressAddress)
+                return
+            }
             success(site)
         }, failure: { error in
             let result = error ?? ServiceError.unknown
@@ -53,8 +57,12 @@ class WordPressComBlogService {
 // MARK: - Nested Types
 //
 extension WordPressComBlogService {
+    enum Constants {
+        static let wordPressBlogURL = "https://wordpress.com/blog"
+    }
 
     enum ServiceError: Error {
         case unknown
+        case invalidWordPressAddress
     }
 }

WordPressAuthenticator/Unified Auth/View Related/Site Address/SiteAddressViewController.swift

@@ -541,12 +541,19 @@ private extension SiteAddressViewController {
             self.presentNextControllerIfPossible(siteInfo: siteInfo)
         }
 
-        service.fetchUnauthenticatedSiteInfoForAddress(for: baseSiteUrl, success: successBlock, failure: { [weak self] _ in
+        service.fetchUnauthenticatedSiteInfoForAddress(for: baseSiteUrl, success: successBlock, failure: { [weak self] error in
             self?.configureViewLoading(false)
             guard let self = self else {
                 return
             }
-            self.presentNextControllerIfPossible(siteInfo: nil)
+
+            if self.authenticationDelegate.shouldHandleError(error) {
+                self.authenticationDelegate.handleError(error) { [weak self] customUI in
+                    self?.navigationController?.pushViewController(customUI, animated: true)
+                }
+            } else {
+                self.displayError(message: Localization.invalidURL)
+            }
         })
     }