@aigens/aigens-sdk-core 5.0.2 → 5.0.4

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

@@ -141,12 +141,20 @@ public class WebContainerActivity extends BridgeActivity {
 
 
 
-    private String getRedirectUrl(Intent intent) {
+    private String getRedirectUrl(Intent intent, String url_) {
         try {
 //            Intent intent = getIntent();
-            Uri uri = intent.getData();
-            if (uri != null) {
-                String totalUrl = uri.toString();
+
+            Uri uri = null;
+            if (intent != null) uri = intent.getData();
+            if (uri != null || url_ != null) {
+
+                String totalUrl = null;
+                if (uri != null) {
+                    totalUrl = uri.toString();
+                }else if (url_ != null && !url_.isEmpty()) {
+                    totalUrl = url_;
+                }
                 // Log.i("Jason totalUrl", totalUrl);
                 String redirectUrl = null;
                 String universalLink = null;
@@ -224,7 +232,7 @@ public class WebContainerActivity extends BridgeActivity {
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
         // System.out.println("OPEN URL: onNewIntent" + intent.toString());
-        String redirectUrl = getRedirectUrl(intent);
+        String redirectUrl = getRedirectUrl(intent, null);
         if (redirectUrl != null) {
             if (this.bridge != null && this.bridge.getWebView() != null) {
                 initLayout(false, true, false);
@@ -235,18 +243,27 @@ public class WebContainerActivity extends BridgeActivity {
 
     }
 
-    private void addChannel() {
+    private void addChannelAndTs() {
+
         if (getIntent() == null) return;
         String url = getIntent().getStringExtra("url");
+
+        Map m = (Map) getIntent().getSerializableExtra("member");
+        boolean withoutAddChannel = false;
+        boolean disableAddTs = false;
+        if (m != null) {
+            withoutAddChannel = (boolean) m.getOrDefault("withoutAddChannel", false);
+            disableAddTs = (boolean) m.getOrDefault("disableAddTs", false);
+        }
+
         if (url != null) {
-            if (!url.contains("&channel=app") && !url.contains("?channel=app")) {
+            if (!url.contains("&channel=app") && !url.contains("?channel=app") && !withoutAddChannel) {
                 String sign = url.contains("?") ? "&" : "?";
                 getIntent().putExtra("url", url + sign + "channel=app");
             }
             String url2 = getIntent().getStringExtra("url");
             String sign2 = url2.contains("?") ? "&" : "?";
-            getIntent().putExtra("url", url2 + sign2 + "ts=" + String.valueOf(System.currentTimeMillis()));
-
+            if (!disableAddTs) getIntent().putExtra("url", url2 + sign2 + "ts=" + String.valueOf(System.currentTimeMillis()));
         }
     }
 
@@ -259,12 +276,12 @@ public class WebContainerActivity extends BridgeActivity {
 
         setContentView(com.aigens.sdk.R.layout.sdk_layout_main);
 
-        addChannel();
+
 
 
         Intent intent = getIntent();
 
-        String redirectUrl = getRedirectUrl(intent);
+        String redirectUrl = getRedirectUrl(intent, null);
         if (redirectUrl != null && !redirectUrl.equals("") && WebContainerActivity.perviousIntent != null) {
             WebContainerActivity.perviousIntent.putExtra("url", redirectUrl);
             intent = WebContainerActivity.perviousIntent;
@@ -273,6 +290,7 @@ public class WebContainerActivity extends BridgeActivity {
         WebContainerActivity.perviousIntent = intent;
         WebContainerActivity.perviousInstanceState = currentInstanceState;
 
+        addChannelAndTs();
 
         this.url = intent.getStringExtra("url");
 
@@ -384,7 +402,8 @@ public class WebContainerActivity extends BridgeActivity {
             "com.aigens.sdk.alipay.AlipayPlugin",
             "com.aigens.sdk.wechat.WechatPlugin",
             "com.aigens.sdk.utils.AigensUtilsPlugin",
-            "com.aigens.sdk.preferences.AigensPreferencesPlugin"
+            "com.aigens.sdk.preferences.AigensPreferencesPlugin",
+            "com.aigens.sdk.adyen.payments.AigensAdyenPaymentsPlugin"
         }, allPlugins);
         addExtraPlugins(intent.getStringArrayExtra("extraClasspaths"), allPlugins);
 
@@ -798,6 +817,15 @@ public class WebContainerActivity extends BridgeActivity {
             return false;
         }
 
+        private String decodeURIComponent(String encodedStr) {
+            String decodedStr = encodedStr;
+            try {
+                decodedStr = URLDecoder.decode(encodedStr, "UTF-8");
+            } catch (UnsupportedEncodingException e) {
+                decodedStr = encodedStr;
+            }
+            return decodedStr;
+        }
         public boolean shouldOverrideUrl(WebView view, String url) {
             if (url.startsWith(WebView.SCHEME_TEL)) {
                 try {
@@ -851,6 +879,17 @@ public class WebContainerActivity extends BridgeActivity {
                 }
             }else if (CorePlugin.coreListener != null && CorePlugin.coreListener.isInterceptedUrl(url, view, activity)) {
                 return true;
+            }else {
+                String url_ = this.decodeURIComponent(url);
+                if (url_.contains("alwayscheck=true") || url_.contains("alwayscheck/true")) {
+                    String redirectUrl = getRedirectUrl(null, url);
+                    if (redirectUrl != null) {
+                        initLayout(false, true, false);
+                        view.loadUrl(redirectUrl);
+                        return true;
+                    }
+                }
+
             }
             return false;
         }

package/ios/Plugin/WebContainerViewController.swift

@@ -58,7 +58,7 @@ import Capacitor
 
         self.becomeFirstResponder()
 
-        addChannel()
+        addChannelAndTs()
         loadWebViewCustom()
         initView()
 
@@ -87,16 +87,21 @@ import Capacitor
         }
         return result
     }
-    private func addChannel() {
+    private func addChannelAndTs() {
+
+        let member = self.options?["member"] as? Dictionary<String, Any>
+        let withoutAddChannel = member?["withoutAddChannel"] as? Bool ?? false
+        let disableAddTs = member?["disableAddTs"] as? Bool ?? false
+
         if let urlString = self.options?["url"] as? String {
-            if !urlString.contains("&channel=app") && !urlString.contains("?channel=app") {
+            if !urlString.contains("&channel=app") && !urlString.contains("?channel=app") && !withoutAddChannel {
                 let sign = urlString.contains("?") ? "&" : "?"
                 self.options?["url"] = urlString + sign + "channel=app"
             }
 
         }
 
-        if let urlString = self.options?["url"] as? String {
+        if let urlString = self.options?["url"] as? String, !disableAddTs {
             let sign = urlString.contains("?") ? "&" : "?"
             let timestamp = Int(Date().timeIntervalSince1970 * 1000)
             self.options?["url"] = urlString + sign + "ts=\(timestamp)"
@@ -185,7 +190,7 @@ import Capacitor
             return false
         }
 
-        if url.contains("aigens=true") || url.contains("aigens/true") {
+        if url.contains("aigens=true") || url.contains("aigens/true") || url.contains("aigensRedirect/") {
             return true;
         }
         if !universalLink.isEmpty && url.contains(universalLink) {
@@ -197,12 +202,25 @@ import Capacitor
         return false;
     }
 
-    private func fromAppUrl(_ url_: URL) {
+    private func isParseUrl2(_ url: String) -> Bool {
+
+        if isExcludedUniversalLink(url) {
+            return false
+        }
+        let contain = url.contains("alwayscheck=true") || url.contains("alwayscheck/true");
+        return contain
+    }
+
+    private func fromAppUrl(_ url_: URL, _ alwayscheck: Bool = false) -> Bool {
         let url = decodeURIComponent(url_);
 
 
-        if !isParseUrl(url.absoluteString) {
-            return;
+        if !alwayscheck && !isParseUrl(url.absoluteString) {
+            return false;
+        }
+
+        if alwayscheck && !isParseUrl2(url.absoluteString) {
+            return false;
         }
 
         let rUrl = URLRequest(url: url)
@@ -229,12 +247,13 @@ import Capacitor
             webContainerView.showError(false)
             let rUrl = URLRequest(url: redirectUrl)
             webView?.load(rUrl)
-            return;
+            return true;
         }
 
         webContainerView.showLoading(true)
         webContainerView.showError(false)
         webView?.load(rUrl)
+        return true;
     }
 
     @objc func handleUrlOpened(notification: NSNotification) {
@@ -492,6 +511,11 @@ extension WebContainerViewController: WKNavigationDelegate {
             return;
         }
 
+        if (fromAppUrl(navURL, true)) {
+            decisionHandler(.cancel)
+            return;
+        }
+
 //        if isParseUrl(navURL.absoluteString) {
 //
 //            if navURL.absoluteString.range(of: "redirect=") != nil, var redirect = navURL.absoluteString.components(separatedBy:"redirect=").last{

package/package.json

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