Handle redirect for JetpackConnectionWebViewModel to detect completion

itsmeichigo · itsmeichigo · commit 5b7a934979fe · 2022-09-27T13:49:01.000+07:00
diff --git a/WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackConnectionWebViewModel.swift b/WooCommerce/Classes/Authentication/Navigation Exceptions/JetpackConnectionWebViewModel.swift
@@ -27,7 +27,14 @@ final class JetpackConnectionWebViewModel: AuthenticatedWebViewModel {
     }
 
     func handleRedirect(for url: URL?) {
-        // No-op
+        guard let path = url?.absoluteString else {
+            return
+        }
+        // When the web view navigates to the site address or Jetpack plans page,
+        // we can assume that the setup has completed.
+        if path.hasPrefix(siteURL) || path.hasPrefix(Constants.plansPage) {
+            handleSetupCompletion()
+        }
     }
 
     func decidePolicy(for navigationURL: URL) async -> WKNavigationActionPolicy {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,14 @@ final class JetpackConnectionWebViewModel: AuthenticatedWebViewModel {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func handleRedirect(for url: URL?) {`
`30`		`- // No-op`
	`30`	`+ guard let path = url?.absoluteString else {`
	`31`	`+ return`
	`32`	`+ }`
	`33`	`+ // When the web view navigates to the site address or Jetpack plans page,`
	`34`	`+ // we can assume that the setup has completed.`
	`35`	`+ if path.hasPrefix(siteURL) \|\| path.hasPrefix(Constants.plansPage) {`
	`36`	`+ handleSetupCompletion()`
	`37`	`+ }`
`31`	`38`	`}`
`32`	`39`
`33`	`40`	`func decidePolicy(for navigationURL: URL) async -> WKNavigationActionPolicy {`