@aigens/aigens-sdk-core 0.4.3 → 0.4.5

package/android/src/main/java/com/aigens/sdk/WebContainerActivity.java

@@ -124,11 +124,12 @@ public class WebContainerActivity extends BridgeActivity {
                 // Log.i("getRedirectUrl", totalUrl);
                 if (redirectUrl != null) {
                     redirectUrl = this.decodeURIComponent(redirectUrl);
+                     Log.i("Jason redirectUrl", redirectUrl);
                 }
-                if (!redirectUrl.startsWith("http://") && !redirectUrl.startsWith("https://")) {
+                if (redirectUrl != null && !redirectUrl.startsWith("http://") && !redirectUrl.startsWith("https://")) {
                     redirectUrl = "https://" + redirectUrl;
                 }
-                Log.i("Jason redirectUrl", redirectUrl);
+
                 return redirectUrl;
             } else {
                 // Log.i("getRedirectUrl", "null");

package/ios/Plugin/WebContainerViewController.swift

@@ -146,17 +146,8 @@ import Capacitor
         return false;
     }
 
-    @objc func handleUrlOpened(notification: NSNotification) {
-        guard let object = notification.object as? [String: Any?] else {
-            return
-        }
-
-        aigensprint("handleUrlOpened url:\(object)")
-        guard var url = object["url"] as? URL else {
-            return
-        }
-
-        url = decodeURIComponent(url);
+    private func fromAppUrl(_ url_: URL) {
+        let url = decodeURIComponent(url_);
 
 
         if !isParseUrl(url.absoluteString) {
@@ -166,51 +157,59 @@ import Capacitor
         let rUrl = URLRequest(url: url)
 
         let newUrl = url;
-        if newUrl.absoluteString.range(of: "redirect=") != nil, let redirect = newUrl.absoluteString.components(separatedBy:"redirect=").last, !redirect.isEmpty {
-            aigensprint("handleUniversalLink has -- redirect:\(redirect)")
-            webContainerView.showLoading(true)
-            webContainerView.showError(false)
-        }else if newUrl.absoluteString.range(of: "aigensRedirect/") != nil, let redirect = newUrl.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty {
-            aigensprint("handleUniversalLink has -- aigensRedirect:\(redirect)")
+        var redirectUrl: String? = nil;
+        if newUrl.absoluteString.range(of: "redirect=") != nil, var redirect = newUrl.absoluteString.components(separatedBy:"redirect=").last, !redirect.isEmpty {
+            if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
+                redirect = "https://" + redirect
+            }
+            redirectUrl = redirect;
+            aigensprint("handleUniversalLink has -- redirect:\(redirect)");
+        }else if newUrl.absoluteString.range(of: "aigensRedirect/") != nil, var redirect = newUrl.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty {
+            if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
+                redirect = "https://" + redirect
+            }
+            redirectUrl = redirect;
+            aigensprint("handleUniversalLink has -- aigensRedirect:\(redirect)");
+        }
+
+        if let redirect = redirectUrl, let redirectUrl = URL(string: redirect) {
+            self.redirectLink = redirect
             webContainerView.showLoading(true)
             webContainerView.showError(false)
+            let rUrl = URLRequest(url: redirectUrl)
+            webView?.load(rUrl)
+            return;
         }
 
+        webContainerView.showLoading(true)
+        webContainerView.showError(false)
         webView?.load(rUrl)
     }
 
-    @objc func handleUniversalLink(notification: NSNotification) {
+    @objc func handleUrlOpened(notification: NSNotification) {
         guard let object = notification.object as? [String: Any?] else {
             return
         }
 
-        aigensprint("handleUniversalLink url:\(object)")
+        aigensprint("handleUrlOpened url:\(object)")
         guard var url = object["url"] as? URL else {
             return
         }
 
-        url = decodeURIComponent(url);
+        fromAppUrl(url);
+    }
 
-        if !isParseUrl(url.absoluteString) {
-            return;
+    @objc func handleUniversalLink(notification: NSNotification) {
+        guard let object = notification.object as? [String: Any?] else {
+            return
         }
 
-
-        let rUrl = URLRequest(url: url)
-
-        let newUrl = url;
-        if newUrl.absoluteString.range(of: "redirect=") != nil, let redirect = newUrl.absoluteString.components(separatedBy:"redirect=").last, !redirect.isEmpty {
-            aigensprint("handleUniversalLink has -- redirect:\(redirect)")
-            webContainerView.showLoading(true)
-            webContainerView.showError(false)
-        }else if newUrl.absoluteString.range(of: "aigensRedirect/") != nil, let redirect = newUrl.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty {
-            aigensprint("handleUniversalLink has -- aigensRedirect:\(redirect)")
-            webContainerView.showLoading(true)
-            webContainerView.showError(false)
+        aigensprint("handleUniversalLink url:\(object)")
+        guard var url = object["url"] as? URL else {
+            return
         }
 
-
-        webView?.load(rUrl)
+        fromAppUrl(url);
 
     }
     private func initView(){
@@ -397,41 +396,6 @@ extension WebContainerViewController: WKNavigationDelegate {
         }
 
         aigensprint("navURL--:\(navURL)")
-        if isParseUrl(navURL.absoluteString) {
-
-            if navURL.absoluteString.range(of: "redirect=") != nil, var redirect = navURL.absoluteString.components(separatedBy:"redirect=").last{
-                if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
-                    redirect = "https://" + redirect
-                }
-                if let redirectUrl = URL(string: redirect) {
-                    self.redirectLink = redirect
-                    aigensprint("navURL-- redirect:\(redirect)")
-                    webContainerView.showLoading(true)
-                    webContainerView.showError(false)
-                    let rUrl = URLRequest(url: redirectUrl)
-                    webView.load(rUrl)
-                    decisionHandler(.cancel)
-                    return;
-                }
-            }
-
-            if navURL.absoluteString.range(of: "aigensRedirect/") != nil, var redirect = navURL.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty{
-                if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
-                    redirect = "https://" + redirect
-                }
-                if let redirectUrl = URL(string: redirect) {
-                    self.redirectLink = redirect
-                    aigensprint("navURL-- aigensRedirect:\(redirect)")
-                    webContainerView.showLoading(true)
-                    webContainerView.showError(false)
-                    let rUrl = URLRequest(url: redirectUrl)
-                    webView.load(rUrl)
-                    decisionHandler(.cancel)
-                    return;
-                }
-            }
-
-        }
 
         var isCanOpen = false
         if externalProtocols.count > 0 {
@@ -453,6 +417,43 @@ extension WebContainerViewController: WKNavigationDelegate {
             return;
         }
 
+//        if isParseUrl(navURL.absoluteString) {
+//
+//            if navURL.absoluteString.range(of: "redirect=") != nil, var redirect = navURL.absoluteString.components(separatedBy:"redirect=").last{
+//                if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
+//                    redirect = "https://" + redirect
+//                }
+//                if let redirectUrl = URL(string: redirect) {
+//                    self.redirectLink = redirect
+//                    aigensprint("navURL-- redirect:\(redirect)")
+//                    webContainerView.showLoading(true)
+//                    webContainerView.showError(false)
+//                    let rUrl = URLRequest(url: redirectUrl)
+//                    webView.load(rUrl)
+//                    decisionHandler(.cancel)
+//                    return;
+//                }
+//            }
+//
+//            if navURL.absoluteString.range(of: "aigensRedirect/") != nil, var redirect = navURL.absoluteString.components(separatedBy:"aigensRedirect/").last, !redirect.isEmpty{
+//                if !redirect.starts(with: "http://") && !redirect.starts(with: "https://") {
+//                    redirect = "https://" + redirect
+//                }
+//                if let redirectUrl = URL(string: redirect) {
+//                    self.redirectLink = redirect
+//                    aigensprint("navURL-- aigensRedirect:\(redirect)")
+//                    webContainerView.showLoading(true)
+//                    webContainerView.showError(false)
+//                    let rUrl = URLRequest(url: redirectUrl)
+//                    webView.load(rUrl)
+//                    decisionHandler(.cancel)
+//                    return;
+//                }
+//            }
+//
+//        }
+
+
 
         // first, give plugins the chance to handle the decision
 //        for pluginObject in bridge.plugins {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aigens/aigens-sdk-core",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "Aigens Order.Place Core Plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",