@aigens/aigens-sdk-core 0.0.39 → 0.0.40

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

@@ -42,6 +42,8 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
@@ -80,6 +82,7 @@ public class WebContainerActivity extends BridgeActivity {
         add("payme://");
         add("https://play.google.com");
         add("hsbcpaymepay://");
+        add("mpay://");
     }};
 
     private void debug(Object... msgs) {
@@ -113,7 +116,16 @@ public class WebContainerActivity extends BridgeActivity {
                 if (universalLink != null && (totalUrl.startsWith(universalLink) || universalLink.contains("aigens=true")) && totalUrl.indexOf("redirect=") >= 0) {
                     redirectUrl = totalUrl.split("redirect=")[1];
                 }
+                if (universalLink != null && (totalUrl.startsWith(universalLink) || universalLink.contains("aigens=true")) && totalUrl.indexOf("aigensRedirect/") >= 0) {
+                    redirectUrl = totalUrl.split("aigensRedirect/")[1];
+                }
                 Log.i("getRedirectUrl", totalUrl);
+                if (redirectUrl != null) {
+                    redirectUrl = this.decodeURIComponent(redirectUrl);
+                }
+                if (!redirectUrl.startsWith("http://") && !redirectUrl.startsWith("https://")) {
+                    redirectUrl = "https://" + redirectUrl;
+                }
                 return redirectUrl;
             } else {
                 Log.i("getRedirectUrl", "null");
@@ -447,6 +459,15 @@ public class WebContainerActivity extends BridgeActivity {
         return plugins;
     }
 
+    private String decodeURIComponent(String encodedStr) {
+        String decodedStr = encodedStr;
+        try {
+            decodedStr = URLDecoder.decode(encodedStr, "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            decodedStr = encodedStr;
+        }
+        return decodedStr;
+    }
     private boolean isDevMode() {
         return (this.getApplicationInfo().flags & ApplicationInfo.FLAG_DEBUGGABLE) != 0;
     }
@@ -752,6 +773,7 @@ public class WebContainerActivity extends BridgeActivity {
         @Override
         public void onPageStarted(WebView view, String url, Bitmap favicon) {
 
+//            Log.wtf(TAG, "onPageStarted: "+url );
             debug("onPageStarted", url);
 
             super.onPageStarted(view, url, favicon);

package/android/src/main/java/com/aigens/sdk/plugins/CorePlugin.java

@@ -135,7 +135,9 @@ public class CorePlugin extends Plugin {
             }
         }
 
-        getActivity().finish();
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
 
     }
 
@@ -159,7 +161,9 @@ public class CorePlugin extends Plugin {
             }
         }
 
-        getActivity().finish();
+        if (getActivity() != null) {
+            getActivity().finish();
+        }
 
 
     }

package/ios/Plugin/WebContainerViewController.swift

@@ -18,7 +18,7 @@ import Capacitor
     private var redirectLink = ""
     private var universalLink = ""
     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://"
+        "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://"
     ]
     var addPaddingProtocols: [String] = [
         "https://ap-gateway.mastercard.com",
@@ -33,8 +33,10 @@ import Capacitor
         "https://web-prd.online.octopus.com.hk",
         "http://vmp.eftpay.com.cn",
         "https://wx.tenpay.com",
-
-
+        "https://uatopenapi.macaupay.com.mo",
+        "https://uatpay.macaupass.com",
+        "https://prdpay.macaupass.com",
+        "https://pay.macaupass.com",
     ]
 
     let containerView = WebContainer.webContainer()
@@ -135,10 +137,12 @@ import Capacitor
         }
 
         aigensprint("handleUrlOpened url:\(object)")
-        guard let url = object["url"] as? URL else {
+        guard var url = object["url"] as? URL else {
             return
         }
 
+        url = decodeURIComponent(url);
+
         if universalLink.isEmpty || (!url.absoluteString.starts(with: universalLink) && !universalLink.contains("aigens=true")) {
             return;
         }
@@ -150,6 +154,10 @@ import Capacitor
             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)
         }
 
         webView?.load(rUrl)
@@ -161,10 +169,13 @@ import Capacitor
         }
 
         aigensprint("handleUniversalLink url:\(object)")
-        guard let url = object["url"] as? URL else {
+        guard var url = object["url"] as? URL else {
             return
         }
 
+        url = decodeURIComponent(url);
+
+
         if universalLink.isEmpty || (!url.absoluteString.starts(with: universalLink) && !universalLink.contains("aigens=true")) {
             return;
         }
@@ -177,6 +188,10 @@ import Capacitor
             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)
         }
 
 
@@ -238,6 +253,16 @@ import Capacitor
 
     }
 
+    private func decodeURIComponent(_ url: URL) -> URL {
+        let str = url.absoluteString
+        let urlStr = str.removingPercentEncoding ?? str
+        return URL(string: urlStr) ?? url
+    }
+
+    private func decodeURIComponent(_ str: String) -> String {
+        return str.removingPercentEncoding ?? str
+    }
+
     public final func loadWebViewCustom() {
 
         //let bridge = self.bridge
@@ -245,6 +270,13 @@ import Capacitor
 
 
         let urlString = self.options?["url"] as? String;
+//        urlString = "https://payment2.pizzahut.com.hk/v3/Payment/Completed?TransId=N224A2306130302&Code=4F19FC65-E099-4339-ADF4-3986EF539233"
+//        urlString = "https://payment2.pizzahut.com.hk/v3/Payment/UserCancel?TransId=N224A2306130301&Code=44D4B103-4962-432E-A323-086D46F8BB6F"
+//        urlString = "https://payment2.pizzahut.com.hk/v3/Payment/Completed?TransId=A224A2306131102&Code=104A53FB-053E-4FC1-870E-29D7B39AE2C5"
+
+//        urlString = "https%3a%2f%2fpayment2.pizzahut.com.hk%2fv3%2fPayment%2fCompleted%3fTransId%3dA224A2306131102%26Code%3d104A53FB-053E-4FC1-870E-29D7B39AE2C5";
+//
+//        urlString = decodeURIComponent(urlString!)
 
         if(urlString == nil){
             return;
@@ -343,15 +375,36 @@ extension WebContainerViewController: WKNavigationDelegate {
         aigensprint("navURL--:\(navURL)")
         if !universalLink.isEmpty && (navURL.absoluteString.starts(with: universalLink) || universalLink.contains("aigens=true")) {
 
-            if navURL.absoluteString.range(of: "redirect=") != nil, let redirect = navURL.absoluteString.components(separatedBy:"redirect=").last, 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: "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;
+                }
             }
 
         }
@@ -431,12 +484,20 @@ extension WebContainerViewController: WKNavigationDelegate {
             if (bg && bg[0]) {
                 bg[0].style.paddingTop = "\(UIDevice.xp_statusBarHeight())px";
             }
+
+            let app = document.querySelector('body>#app');
+            if (app && window) {
+               if (window.getComputedStyle(app).position == 'absolute') {
+                    app.style.top = "\(UIDevice.xp_statusBarHeight())px";
+                }
+            }
+
             """)
         }
 
         webContainerView.showLoading(false)
         webContainerView.showError(false)
-        CAPLog.print("⚡️  WebView loaded")
+        CAPLog.print("⚡️  WebView loaded:\(webView.url)")
     }
 
     // The force unwrap is part of the protocol declaration, so we should keep it.
@@ -547,7 +608,7 @@ extension UIDevice {
         } else {
             statusBarHeight = UIApplication.shared.statusBarFrame.height
         }
-        print("navURL-- height:\(statusBarHeight)")
+        CAPLog.print("navURL-- height:\(statusBarHeight)")
         return statusBarHeight
     }
 

package/package.json

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