feat:intercept request clean sample

KevinnZou · May 3, 2024 · 1bd5e75 · 1bd5e75
1 parent 8b802c5
commit 1bd5e75
Show file tree

Hide file tree

Showing 3 changed files with 166 additions and 35 deletions.
diff --git a/sample/shared/src/commonMain/kotlin/com/kevinnzou/sample/BasicWebViewSample.kt b/sample/shared/src/commonMain/kotlin/com/kevinnzou/sample/BasicWebViewSample.kt
@@ -33,13 +33,9 @@ import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.unit.dp
 import co.touchlab.kermit.Logger
 import com.multiplatform.webview.cookie.Cookie
-import com.multiplatform.webview.request.RequestInterceptor
-import com.multiplatform.webview.request.WebRequest
-import com.multiplatform.webview.request.WebRequestInterceptResult
 import com.multiplatform.webview.util.KLogSeverity
 import com.multiplatform.webview.web.LoadingState
 import com.multiplatform.webview.web.WebView
-import com.multiplatform.webview.web.WebViewNavigator
 import com.multiplatform.webview.web.WebViewState
 import com.multiplatform.webview.web.rememberWebViewNavigator
 import com.multiplatform.webview.web.rememberWebViewState
@@ -67,30 +63,7 @@ internal fun BasicWebViewSample() {
 
         onDispose { }
     }
-    val navigator =
-        rememberWebViewNavigator(
-            requestInterceptor =
-                object : RequestInterceptor {
-                    override fun onInterceptUrlRequest(
-                        request: WebRequest,
-                        navigator: WebViewNavigator,
-                    ): WebRequestInterceptResult {
-                        request.let {
-                            Logger.i { "Sample onInterceptRequest: $it" }
-                        }
-                        return if (request.url.contains("github")) {
-                            WebRequestInterceptResult.Modify(
-                                WebRequest(
-                                    url = "https://kotlinlang.org/docs/multiplatform.html",
-                                    headers = mutableMapOf("info" to "test"),
-                                ),
-                            )
-                        } else {
-                            WebRequestInterceptResult.Allow
-                        }
-                    }
-                },
-        )
+    val navigator = rememberWebViewNavigator()
     var textFieldValue by remember(state.lastLoadedUrl) {
         mutableStateOf(state.lastLoadedUrl)
     }
@@ -118,9 +91,9 @@ internal fun BasicWebViewSample() {
                             contentDescription = "Error",
                             colorFilter = ColorFilter.tint(Color.Red),
                             modifier =
-                                Modifier
-                                    .align(Alignment.CenterEnd)
-                                    .padding(8.dp),
+                            Modifier
+                                .align(Alignment.CenterEnd)
+                                .padding(8.dp),
                         )
                     }
 
@@ -154,16 +127,16 @@ internal fun BasicWebViewSample() {
             WebView(
                 state = state,
                 modifier =
-                    Modifier
-                        .fillMaxSize(),
+                Modifier
+                    .fillMaxSize(),
                 navigator = navigator,
             )
         }
     }
 }
 
 @Composable
-internal fun cookieSample(state: WebViewState) {
+internal fun CookieSample(state: WebViewState) {
     LaunchedEffect(state) {
         snapshotFlow { state.loadingState }
             .filter { it is LoadingState.Finished }

diff --git a/sample/shared/src/commonMain/kotlin/com/kevinnzou/sample/InterceptRequestSample.kt b/sample/shared/src/commonMain/kotlin/com/kevinnzou/sample/InterceptRequestSample.kt
@@ -0,0 +1,158 @@
+package com.kevinnzou.sample
+
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.Button
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.LinearProgressIndicator
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.OutlinedTextField
+import androidx.compose.material.Text
+import androidx.compose.material.TopAppBar
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.unit.dp
+import co.touchlab.kermit.Logger
+import com.multiplatform.webview.request.RequestInterceptor
+import com.multiplatform.webview.request.WebRequest
+import com.multiplatform.webview.request.WebRequestInterceptResult
+import com.multiplatform.webview.util.KLogSeverity
+import com.multiplatform.webview.web.LoadingState
+import com.multiplatform.webview.web.WebView
+import com.multiplatform.webview.web.WebViewNavigator
+import com.multiplatform.webview.web.rememberWebViewNavigator
+import com.multiplatform.webview.web.rememberWebViewState
+
+/**
+ * Created By Kevin Zou On 2023/9/8
+ *
+ * Sample for intercepting requests in WebView
+ *
+ * Note: Developers targeting the Desktop platform should refer to
+ * [README.desktop.md](https://github.com/KevinnZou/compose-webview-multiplatform/blob/main/README.desktop.md)
+ * for setup instructions first.
+ */
+@Composable
+internal fun InterceptRequestSample() {
+    val initialUrl = "https://www.bing.com/search?q=Android"
+    val state = rememberWebViewState(url = initialUrl)
+    DisposableEffect(Unit) {
+        state.webSettings.apply {
+            logSeverity = KLogSeverity.Debug
+            customUserAgentString =
+                "Mozilla/5.0 (Macintosh; Intel Mac OS X 11_1) AppleWebKit/625.20 (KHTML, like Gecko) Version/14.3.43 Safari/625.20"
+        }
+
+        onDispose { }
+    }
+    val navigator =
+        rememberWebViewNavigator(
+            requestInterceptor =
+            object : RequestInterceptor {
+                override fun onInterceptUrlRequest(
+                    request: WebRequest,
+                    navigator: WebViewNavigator,
+                ): WebRequestInterceptResult {
+                    request.let {
+                        Logger.i { "Sample onInterceptRequest: $it" }
+                    }
+                    return if (request.url.contains("kotlin")) {
+                        WebRequestInterceptResult.Modify(
+                            WebRequest(
+                                url = "https://kotlinlang.org/docs/multiplatform.html",
+                                headers = mutableMapOf("info" to "test"),
+                            ),
+                        )
+                    } else {
+                        WebRequestInterceptResult.Allow
+                    }
+                }
+            },
+        )
+    var textFieldValue by remember(state.lastLoadedUrl) {
+        mutableStateOf(state.lastLoadedUrl)
+    }
+    MaterialTheme {
+        Column {
+            TopAppBar(
+                title = { Text(text = "WebView Sample") },
+                navigationIcon = {
+                    if (navigator.canGoBack) {
+                        IconButton(onClick = { navigator.navigateBack() }) {
+                            Icon(
+                                imageVector = Icons.Default.ArrowBack,
+                                contentDescription = "Back",
+                            )
+                        }
+                    }
+                },
+            )
+
+            Row {
+                Box(modifier = Modifier.weight(1f)) {
+                    if (state.errorsForCurrentRequest.isNotEmpty()) {
+                        Image(
+                            imageVector = Icons.Default.Close,
+                            contentDescription = "Error",
+                            colorFilter = ColorFilter.tint(Color.Red),
+                            modifier =
+                            Modifier
+                                .align(Alignment.CenterEnd)
+                                .padding(8.dp),
+                        )
+                    }
+
+                    OutlinedTextField(
+                        value = textFieldValue ?: "",
+                        onValueChange = { textFieldValue = it },
+                        modifier = Modifier.fillMaxWidth(),
+                    )
+                }
+
+                Button(
+                    onClick = {
+                        textFieldValue?.let {
+                            navigator.loadUrl(it)
+                        }
+                    },
+                    modifier = Modifier.align(Alignment.CenterVertically),
+                ) {
+                    Text("Go")
+                }
+            }
+
+            val loadingState = state.loadingState
+            if (loadingState is LoadingState.Loading) {
+                LinearProgressIndicator(
+                    progress = loadingState.progress,
+                    modifier = Modifier.fillMaxWidth(),
+                )
+            }
+
+            WebView(
+                state = state,
+                modifier =
+                Modifier
+                    .fillMaxSize(),
+                navigator = navigator,
+            )
+        }
+    }
+}
diff --git a/webview/src/iosMain/kotlin/com/multiplatform/webview/web/WKNavigationDelegate.kt b/webview/src/iosMain/kotlin/com/multiplatform/webview/web/WKNavigationDelegate.kt
@@ -113,7 +113,7 @@ class WKNavigationDelegate(
                 request.allHTTPHeaderFields?.forEach {
                     headerMap[it.key.toString()] = it.value.toString()
                 }
-                KLogger.i {
+                KLogger.info {
                     "decidePolicyForNavigationAction: ${request.URL?.absoluteString}, $headerMap"
                 }
                 val webRequest =