From 0bd2d402a78597c60808a05ea4653be1bdbb8b87 Mon Sep 17 00:00:00 2001
From: Pedro Paulo Abdenor <pedro.abdenor@trustly.com>
Date: Wed, 4 Oct 2023 10:11:21 -0300
Subject: [PATCH] In-app browser integration

---
 android-app/.idea/misc.xml                    |  3 +-
 android-app/app/src/main/AndroidManifest.xml  | 21 +-----
 .../inappbrowserandroid/MainActivity.kt       | 14 ++--
 .../inappbrowserandroid/TrustlyConstants.kt   |  2 +-
 .../TrustlyWebChromeClientRedirectActivity.kt | 18 -----
 .../webchromeclient/TrustlyWebView.kt         | 67 -------------------
 .../WebChromeClientActivity.kt                | 55 ---------------
 .../webviewclient/CustomTabActivity.kt        | 24 +++++++
 .../TrustlyWebViewClientRedirectActivity.kt   |  2 +-
 .../webviewclient/WebViewClientActivity.kt    | 50 --------------
 .../app/src/main/res/layout/activity_main.xml | 14 +---
 .../app/src/main/res/values/strings.xml       |  3 +-
 .../in-app-browser-ios/ViewController.swift   | 66 +-----------------
 13 files changed, 40 insertions(+), 299 deletions(-)
 delete mode 100644 android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebChromeClientRedirectActivity.kt
 delete mode 100644 android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebView.kt
 delete mode 100644 android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/WebChromeClientActivity.kt
 create mode 100644 android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/CustomTabActivity.kt
 delete mode 100644 android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/WebViewClientActivity.kt

diff --git a/android-app/.idea/misc.xml b/android-app/.idea/misc.xml
index 773fe0f..4412b1a 100644
--- a/android-app/.idea/misc.xml
+++ b/android-app/.idea/misc.xml
@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17_PREVIEW" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/android-app/app/src/main/AndroidManifest.xml b/android-app/app/src/main/AndroidManifest.xml
index 9be17b0..cbbfb32 100644
--- a/android-app/app/src/main/AndroidManifest.xml
+++ b/android-app/app/src/main/AndroidManifest.xml
@@ -27,9 +27,9 @@
             android:exported="true" />
         <!-- WebViewClient -->
         <activity
-            android:name=".webviewclient.WebViewClientActivity"
+            android:name=".webviewclient.CustomTabActivity"
             android:exported="true"
-            android:label="@string/webview_client" />
+            android:label="@string/custom_tabs" />
         <activity
             android:name=".webviewclient.TrustlyWebViewClientRedirectActivity"
             android:exported="true">
@@ -42,23 +42,6 @@
                 <data android:scheme="web-view-client-redirect" />
             </intent-filter>
         </activity>
-        <!-- WebChromeClient -->
-        <activity
-            android:name=".webchromeclient.WebChromeClientActivity"
-            android:exported="true"
-            android:label="@string/webchrome_client" />
-        <activity
-            android:name=".webchromeclient.TrustlyWebChromeClientRedirectActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="web-chrome-client-redirect" />
-            </intent-filter>
-        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/MainActivity.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/MainActivity.kt
index f178b70..e7194aa 100644
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/MainActivity.kt
+++ b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/MainActivity.kt
@@ -4,8 +4,7 @@ import android.content.Intent
 import android.os.Bundle
 import android.widget.Button
 import androidx.appcompat.app.AppCompatActivity
-import net.trustly.inappbrowserandroid.webchromeclient.WebChromeClientActivity
-import net.trustly.inappbrowserandroid.webviewclient.WebViewClientActivity
+import net.trustly.inappbrowserandroid.webviewclient.CustomTabActivity
 
 class MainActivity : AppCompatActivity() {
 
@@ -13,14 +12,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        val webViewClientButton = findViewById<Button>(R.id.webViewClientButton)
-        webViewClientButton.setOnClickListener {
-            startActivity(Intent(this, WebViewClientActivity::class.java))
-        }
-
-        val webViewChromeButton = findViewById<Button>(R.id.webViewChromeButton)
-        webViewChromeButton.setOnClickListener {
-            startActivity(Intent(this, WebChromeClientActivity::class.java))
+        val customTabButton = findViewById<Button>(R.id.customTabsButton)
+        customTabButton.setOnClickListener {
+            startActivity(Intent(this, CustomTabActivity::class.java))
         }
     }
 
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/TrustlyConstants.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/TrustlyConstants.kt
index a76d1b0..e053415 100644
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/TrustlyConstants.kt
+++ b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/TrustlyConstants.kt
@@ -2,7 +2,7 @@ package net.trustly.inappbrowserandroid
 
 object TrustlyConstants {
 
-    const val TRUSTLY_URL = "http://localhost:3000?integrationContext=InAppBrowser&urlScheme="
+    const val TRUSTLY_URL = "http://10.200.206.238:3001?integrationContext=FullInAppBrowser&urlScheme="
     const val OAUTH_LOGIN_PATH = "/oauth/login"
     const val TRUSTLY_PROCEED_TO_CHOOSE_ACCOUNT_SCRIPT = "javascript:window.Trustly.proceedToChooseAccount();"
 
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebChromeClientRedirectActivity.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebChromeClientRedirectActivity.kt
deleted file mode 100644
index 0fef99b..0000000
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebChromeClientRedirectActivity.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package net.trustly.inappbrowserandroid.webchromeclient
-
-import android.content.Intent
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-
-class TrustlyWebChromeClientRedirectActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        Intent(this, WebChromeClientActivity::class.java).apply {
-            addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
-        }.run { startActivity(this) }
-        finish()
-    }
-
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebView.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebView.kt
deleted file mode 100644
index fcb60e5..0000000
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/TrustlyWebView.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package net.trustly.inappbrowserandroid.webchromeclient
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.net.Uri
-import android.util.AttributeSet
-import android.view.ViewGroup
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import android.widget.LinearLayout
-import android.widget.RelativeLayout
-import androidx.browser.customtabs.CustomTabsIntent
-import net.trustly.inappbrowserandroid.TrustlyConstants
-
-@SuppressLint("SetJavaScriptEnabled")
-class TrustlyWebView : LinearLayout {
-
-    var webView: WebView = WebView(context!!)
-
-    constructor(context: Context?) : super(context, null)
-
-    constructor(context: Context?, attrs: AttributeSet) : super(context, attrs, 0)
-
-    constructor(context: Context?, attrs: AttributeSet, defStyleAttr: Int) : super(
-        context,
-        attrs,
-        defStyleAttr
-    )
-
-    init {
-        with(webView) {
-            this.settings.apply {
-                javaScriptEnabled = true
-                domStorageEnabled = true
-            }
-
-            this.layoutParams =
-                RelativeLayout.LayoutParams(
-                    ViewGroup.LayoutParams.MATCH_PARENT,
-                    ViewGroup.LayoutParams.MATCH_PARENT
-                )
-
-            this.webViewClient = object : WebViewClient() {
-                override fun shouldOverrideUrlLoading(
-                    view: WebView,
-                    request: WebResourceRequest
-                ): Boolean {
-                    val url = request.url.toString()
-                    if (url.contains(TrustlyConstants.OAUTH_LOGIN_PATH))
-                        launchUrl(view.context, url)
-                    return true
-                }
-            }
-        }
-    }
-
-    fun proceedToChooseAccount() {
-        webView.loadUrl(TrustlyConstants.TRUSTLY_PROCEED_TO_CHOOSE_ACCOUNT_SCRIPT)
-    }
-
-    private fun launchUrl(context: Context, url: String) {
-        val customTabsIntent = CustomTabsIntent.Builder().build()
-        customTabsIntent.launchUrl(context, Uri.parse(url))
-    }
-
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/WebChromeClientActivity.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/WebChromeClientActivity.kt
deleted file mode 100644
index 902169c..0000000
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webchromeclient/WebChromeClientActivity.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package net.trustly.inappbrowserandroid.webchromeclient
-
-import android.annotation.SuppressLint
-import android.os.Bundle
-import android.os.Message
-import android.webkit.WebChromeClient
-import android.webkit.WebView
-import android.webkit.WebView.WebViewTransport
-import net.trustly.inappbrowserandroid.TrustlyConstants
-import net.trustly.inappbrowserandroid.WebViewBaseActivity
-
-class WebChromeClientActivity : WebViewBaseActivity() {
-
-    private lateinit var trustlyWebView: TrustlyWebView
-
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        trustlyWebView = TrustlyWebView(this)
-
-        webView.settings.apply {
-            javaScriptCanOpenWindowsAutomatically = true
-            javaScriptEnabled = true
-            domStorageEnabled = true
-            setSupportMultipleWindows(true)
-        }
-
-        webView.webChromeClient = object : WebChromeClient() {
-            override fun onCreateWindow(
-                view: WebView,
-                isDialog: Boolean,
-                isUserGesture: Boolean,
-                resultMsg: Message
-            ): Boolean {
-                return if (view.hitTestResult.type == 0) {
-                    //window.open
-                    webView.addView(trustlyWebView)
-                    val transport = resultMsg.obj as WebViewTransport
-                    transport.webView = trustlyWebView.webView
-                    resultMsg.sendToTarget()
-                    true
-                } else false
-            }
-        }
-        webView.loadUrl(TrustlyConstants.TRUSTLY_URL + "web-chrome-client-redirect")
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        trustlyWebView.proceedToChooseAccount()
-    }
-
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/CustomTabActivity.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/CustomTabActivity.kt
new file mode 100644
index 0000000..6deaf57
--- /dev/null
+++ b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/CustomTabActivity.kt
@@ -0,0 +1,24 @@
+package net.trustly.inappbrowserandroid.webviewclient
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.net.Uri
+import android.os.Bundle
+import androidx.browser.customtabs.CustomTabsIntent
+import net.trustly.inappbrowserandroid.TrustlyConstants
+import net.trustly.inappbrowserandroid.WebViewBaseActivity
+
+class CustomTabActivity : WebViewBaseActivity() {
+
+    @SuppressLint("SetJavaScriptEnabled")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        launchUrl(this@CustomTabActivity, TrustlyConstants.TRUSTLY_URL + "web-view-client-redirect")
+    }
+
+    private fun launchUrl(context: Context, url: String) {
+        val customTabsIntent = CustomTabsIntent.Builder().build()
+        customTabsIntent.launchUrl(context, Uri.parse(url))
+    }
+
+}
\ No newline at end of file
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/TrustlyWebViewClientRedirectActivity.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/TrustlyWebViewClientRedirectActivity.kt
index f529482..158e190 100644
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/TrustlyWebViewClientRedirectActivity.kt
+++ b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/TrustlyWebViewClientRedirectActivity.kt
@@ -9,7 +9,7 @@ class TrustlyWebViewClientRedirectActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        Intent(this, WebViewClientActivity::class.java).apply {
+        Intent(this, CustomTabActivity::class.java).apply {
             addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
         }.run { startActivity(this) }
         finish()
diff --git a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/WebViewClientActivity.kt b/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/WebViewClientActivity.kt
deleted file mode 100644
index f0f36fb..0000000
--- a/android-app/app/src/main/java/net/trustly/inappbrowserandroid/webviewclient/WebViewClientActivity.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package net.trustly.inappbrowserandroid.webviewclient
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.net.Uri
-import android.os.Bundle
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.browser.customtabs.CustomTabsIntent
-import net.trustly.inappbrowserandroid.TrustlyConstants
-import net.trustly.inappbrowserandroid.WebViewBaseActivity
-
-class WebViewClientActivity : WebViewBaseActivity() {
-
-    @SuppressLint("SetJavaScriptEnabled")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        webView.settings.apply {
-            javaScriptEnabled = true
-            domStorageEnabled = true
-        }
-
-        webView.webViewClient = object : WebViewClient() {
-            override fun shouldOverrideUrlLoading(
-                view: WebView,
-                request: WebResourceRequest
-            ): Boolean {
-                val url = request.url.toString()
-                if (url.contains(TrustlyConstants.OAUTH_LOGIN_PATH))
-                    launchUrl(this@WebViewClientActivity, url)
-                return true
-            }
-        }
-        webView.loadUrl(TrustlyConstants.TRUSTLY_URL + "web-view-client-redirect")
-    }
-
-    override fun onResume() {
-        super.onResume()
-
-        webView.loadUrl(TrustlyConstants.TRUSTLY_PROCEED_TO_CHOOSE_ACCOUNT_SCRIPT)
-    }
-
-    private fun launchUrl(context: Context, url: String) {
-        val customTabsIntent = CustomTabsIntent.Builder().build()
-        customTabsIntent.launchUrl(context, Uri.parse(url))
-    }
-
-}
\ No newline at end of file
diff --git a/android-app/app/src/main/res/layout/activity_main.xml b/android-app/app/src/main/res/layout/activity_main.xml
index 4a9f518..413dd48 100644
--- a/android-app/app/src/main/res/layout/activity_main.xml
+++ b/android-app/app/src/main/res/layout/activity_main.xml
@@ -5,23 +5,13 @@
     android:layout_height="match_parent">
 
     <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/webViewClientButton"
+        android:id="@+id/customTabsButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/webview_client"
+        android:text="@string/custom_tabs"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/webViewChromeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/webchrome_client"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/webViewClientButton" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/android-app/app/src/main/res/values/strings.xml b/android-app/app/src/main/res/values/strings.xml
index b82388e..172ead1 100644
--- a/android-app/app/src/main/res/values/strings.xml
+++ b/android-app/app/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
 <resources>
     <string name="app_name">InAppBrowserAndroid</string>
-    <string name="webchrome_client">WebChromeClient</string>
-    <string name="webview_client">WebViewClient</string>
+    <string name="custom_tabs">Custom Tabs</string>
 </resources>
\ No newline at end of file
diff --git a/ios-app/in-app-browser-ios/ViewController.swift b/ios-app/in-app-browser-ios/ViewController.swift
index db1fc32..d07e5ef 100644
--- a/ios-app/in-app-browser-ios/ViewController.swift
+++ b/ios-app/in-app-browser-ios/ViewController.swift
@@ -14,67 +14,18 @@ import SafariServices
 
 class ViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
     
-    private let OBSERVER_NAME = "appInterface"
-    private var webView: WKWebView!
     private var webSession: ASWebAuthenticationSession!
-
-    
-    private func createNotifications(){
-        NotificationCenter.default.addObserver(self, selector: #selector(closeInAppBrowser), name: .trustlyCloseInAppBrowser, object: nil)
-    }
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        
-        self.createNotifications()
-        
+                
         // the url of your web app
-        let url = URL(string: "http://localhost:3000?integrationContext=InAppBrowser&urlScheme=in-app-browser-ios")!
-        let reqApp = URLRequest(url: url);
-
-        self.webView = WKWebView(
-           frame: self.view.bounds,
-           configuration: self.getWKWebViewConfiguration()
-        )
-        
-        webView.navigationDelegate = self
-        webView.uiDelegate = self
-        webView.load(reqApp)
-        self.view.addSubview(self.webView)
-    }
-    
-    private func getWKWebViewConfiguration() -> WKWebViewConfiguration {
-        let userController = WKUserContentController()
-        let configuration = WKWebViewConfiguration()
-        let wkPreferences = WKPreferences()
-        wkPreferences.javaScriptCanOpenWindowsAutomatically = true
-        configuration.preferences = wkPreferences
-        configuration.userContentController = userController
-        return configuration
-    }
-    
-    func webView(_ webView: WKWebView, createWebViewWith configuration: WKWebViewConfiguration, for navigationAction: WKNavigationAction, windowFeatures: WKWindowFeatures) -> WKWebView? {
-
-        if navigationAction.targetFrame == nil, let url = navigationAction.request.url {
-          if url.description.lowercased().range(of: "/oauth/login") != nil {
-
-              if #available(iOS 13, *) {
-                  self.buildASWebAuthenticationSession(url: url, callbackURL: "in-app-browser-ios")
-
-              } else {
-                  // handle iOS =<12 with SFAuthenticationSession
-              }
-          }
-        }
-
-        return nil
+        let url = URL(string: "http://10.200.206.129:3001?integrationContext=FullInAppBrowser&urlScheme=in-app-browser-ios")!
+        self.buildASWebAuthenticationSession(url: url, callbackURL: "in-app-browser-ios")
     }
     
     private func buildASWebAuthenticationSession(url: URL, callbackURL: String){
         webSession = ASWebAuthenticationSession(url: url, callbackURLScheme: callbackURL, completionHandler: { (url, error) in
-
-            self.proceedToChooseAccount()
-
         })
         
         webSession.prefersEphemeralWebBrowserSession = true
@@ -82,16 +33,5 @@ class ViewController: UIViewController, WKNavigationDelegate, WKUIDelegate {
         webSession.start()
     }
     
-    @objc func closeInAppBrowser(notification: Notification){
-        if webSession != nil {
-            webSession.cancel()
-        }
-        
-        self.proceedToChooseAccount()
-    }
-    
-    private func proceedToChooseAccount(){
-        self.webView.evaluateJavaScript("window.Trustly.proceedToChooseAccount();", completionHandler: nil)
-    }
 }