Merge pull request #1069 from WalletConnect/hotfix/w3i-logout

[W3I] Redirects fix
WalletConnect · Sep 4, 2023 · 49725d0 · 49725d0
2 parents fdbfd82 + 68a6353
commit 49725d0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift b/Example/WalletApp/PresentationLayer/Wallet/Web3Inbox/Web3InboxViewController.swift
@@ -31,7 +31,7 @@ final class Web3InboxViewController: UIViewController {
     }
 
     @objc func refreshTapped() {
-        webView?.reload()
+        Web3Inbox.instance.reload()
     }
 
     @objc func getUrlPressed(_ sender: UIBarItem) {

diff --git a/Sources/Web3Inbox/Web3InboxClient.swift b/Sources/Web3Inbox/Web3InboxClient.swift
@@ -74,6 +74,10 @@ public final class Web3InboxClient {
     public func register(deviceToken: Data) async throws {
         try await notifyClient.register(deviceToken: deviceToken)
     }
+
+    public func reload() {
+        webviewSubscriber.reload(webView)
+    }
 }
 
 // MARK: - Privates

diff --git a/Sources/Web3Inbox/WebView/WebViewRequestSubscriber.swift b/Sources/Web3Inbox/WebView/WebViewRequestSubscriber.swift
@@ -45,6 +45,10 @@ final class WebViewRequestSubscriber: NSObject, WKScriptMessageHandler {
             }
         }
     }
+
+    func reload(_ webView: WKWebView) {
+        webView.load(URLRequest(url: url))
+    }
 }
 
 extension WebViewRequestSubscriber: WKUIDelegate {
@@ -55,25 +59,18 @@ extension WebViewRequestSubscriber: WKUIDelegate {
     func webView(_ webView: WKWebView, requestMediaCapturePermissionFor origin: WKSecurityOrigin, initiatedByFrame frame: WKFrameInfo, type: WKMediaCaptureType, decisionHandler: @escaping (WKPermissionDecision) -> Void) {
         decisionHandler(.grant)
     }
-    
+
     #endif
 }
 
 extension WebViewRequestSubscriber: WKNavigationDelegate {
 
     func webView(_ webView: WKWebView, decidePolicyFor navigationAction: WKNavigationAction, decisionHandler: @escaping (WKNavigationActionPolicy) -> Void) {
 
-        guard
-            let from = webView.url,
-            let to = navigationAction.request.url
-        else { return decisionHandler(.cancel) }
-
-        if from.absoluteString.contains("/login") || to.absoluteString.contains("/login") {
-            decisionHandler(.cancel)
-            webView.load(URLRequest(url: url))
-        } else {
+        if navigationAction.request.url == url {
             decisionHandler(.allow)
+        } else {
+            decisionHandler(.cancel)
         }
     }
 }
-