@aigens/aigens-sdk-core 0.4.2 → 0.4.4

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

@@ -102,6 +102,7 @@ public class WebContainerActivity extends BridgeActivity {
             Uri uri = intent.getData();
             if (uri != null) {
                 String totalUrl = uri.toString();
+                // Log.i("Jason totalUrl", totalUrl);
                 String redirectUrl = null;
                 String universalLink = null;
                 if (perviousIntent != null) {
@@ -113,19 +114,22 @@ public class WebContainerActivity extends BridgeActivity {
                         universalLink = null;
                     }
                 }
-                if (universalLink != null && (totalUrl.startsWith(universalLink) || universalLink.contains("aigens=true") || universalLink.contains("aigens/true")) && totalUrl.indexOf("redirect=") >= 0) {
+                // Log.i("Jason totalUrl", totalUrl+universalLink);
+                if (totalUrl != null && totalUrl.indexOf("redirect=") >= 0) {
                     redirectUrl = totalUrl.split("redirect=")[1];
                 }
-                if (universalLink != null && (totalUrl.startsWith(universalLink) || universalLink.contains("aigens=true") || universalLink.contains("aigens/true")) && totalUrl.indexOf("aigensRedirect/") >= 0) {
+                if (totalUrl != null && totalUrl.indexOf("aigensRedirect/") >= 0) {
                     redirectUrl = totalUrl.split("aigensRedirect/")[1];
                 }
                 // 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;
                 }
+
                 return redirectUrl;
             } else {
                 // Log.i("getRedirectUrl", "null");

package/ios/Plugin/WebContainerViewController.swift

@@ -17,6 +17,7 @@ import Capacitor
     private var isFirstError = true
     private var redirectLink = ""
     private var universalLink = ""
+    private var appScheme = ""
     var externalProtocols: [String] = [
         "octopus://", "alipay://", "alipays://", "alipayhk://", "https://play.google.com", "https://itunes.apple.com", "tel:", "mailto:", "itms-apps://itunes.apple.com", "https://apps.apple.com", "payme://", "weixin://", "hsbcpaymepay://", "mpay://"
     ]
@@ -131,6 +132,20 @@ import Capacitor
         NotificationCenter.default.addObserver(self, selector: #selector(self.handleUrlOpened(notification:)), name: Notification.Name.capacitorOpenURL, object: nil)
     }
 
+    private func isParseUrl(_ url: String) -> Bool {
+
+        if url.contains("aigens=true") || url.contains("aigens/true") {
+            return true;
+        }
+        if !universalLink.isEmpty && url.contains(universalLink) {
+            return true
+        }
+        if !appScheme.isEmpty && url.contains(appScheme) {
+            return true
+        }
+        return false;
+    }
+
     @objc func handleUrlOpened(notification: NSNotification) {
         guard let object = notification.object as? [String: Any?] else {
             return
@@ -143,7 +158,8 @@ import Capacitor
 
         url = decodeURIComponent(url);
 
-        if universalLink.isEmpty || (!url.absoluteString.starts(with: universalLink) && !universalLink.contains("aigens=true") && !universalLink.contains("aigens/true")) {
+
+        if !isParseUrl(url.absoluteString) {
             return;
         }
 
@@ -175,8 +191,7 @@ import Capacitor
 
         url = decodeURIComponent(url);
 
-
-        if universalLink.isEmpty || (!url.absoluteString.starts(with: universalLink) && !universalLink.contains("aigens=true") && !universalLink.contains("aigens/true")) {
+        if !isParseUrl(url.absoluteString) {
             return;
         }
 
@@ -286,6 +301,8 @@ import Capacitor
 
         let member = self.options?["member"] as? Dictionary<String, Any>
         self.universalLink = member?["universalLink"] as? String ?? ""
+        self.appScheme = member?["appScheme"] as? String ?? ""
+
 
         CorePlugin.member = member
         let deeplink = self.options?["deeplink"] as? Dictionary<String, Any>
@@ -380,7 +397,7 @@ extension WebContainerViewController: WKNavigationDelegate {
         }
 
         aigensprint("navURL--:\(navURL)")
-        if !universalLink.isEmpty && (navURL.absoluteString.starts(with: universalLink) || universalLink.contains("aigens=true") || universalLink.contains("aigens/true")) {
+        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://") {

package/package.json

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