Merge pull request #595 from wordpress-mobile/issue/wc-3962-allow-login-override

Restore Allowing UI Overrides for Login Errors

Author: shiki

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.37.0"
+  s.version       = "1.38.0-beta.1"
 
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
   s.description   = <<-DESC

WordPressAuthenticator/Unified Auth/View Related/Get Started/GetStartedViewController.swift

@@ -408,7 +408,22 @@ private extension GetStartedViewController {
                 // username instead.
                 self.showSelfHostedWithError(error)
         } else {
-            self.displayError(error as NSError, sourceTag: self.sourceTag)
+            guard let authenticationDelegate = WordPressAuthenticator.shared.delegate,
+                  authenticationDelegate.shouldHandleError(error) else {
+                self.displayError(error as NSError, sourceTag: self.sourceTag)
+                return
+            }
+
+            /// Hand over control to the host app.
+            authenticationDelegate.handleError(error) { customUI in
+                // Setting the rightBarButtonItems of the custom UI before pushing the view controller
+                // and resetting the navigationController's navigationItem after the push seems to be the
+                // only combination that gets the Help button to show up.
+                customUI.navigationItem.rightBarButtonItems = self.navigationItem.rightBarButtonItems
+                self.navigationController?.navigationItem.rightBarButtonItems = self.navigationItem.rightBarButtonItems
+
+                self.navigationController?.pushViewController(customUI, animated: true)
+            }
         }
     }