Implement feedback

packages/webview_flutter/webview_flutter/example/integration_test/webview_flutter_test.dart

@@ -17,7 +17,6 @@ import 'package:flutter_test/flutter_test.dart';
 import 'package:integration_test/integration_test.dart';
 import 'package:webview_flutter/webview_flutter.dart';
 import 'package:webview_flutter_android/webview_flutter_android.dart';
-import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
 
 Future<void> main() async {
@@ -34,12 +33,22 @@ Future<void> main() async {
     } else if (request.uri.path == '/favicon.ico') {
       request.response.statusCode = HttpStatus.notFound;
     } else if (request.uri.path == '/http-basic-authentication') {
-      final bool isAuthenticating = request.headers['Authorization'] != null;
-      if (isAuthenticating) {
-        request.response.writeln('Authorized');
+      final List<String>? authHeader =
+          request.headers[HttpHeaders.authorizationHeader];
+      if (authHeader != null) {
+        final String encodedCredential = authHeader.first.split(' ')[1];
+        final String credential =
+            String.fromCharCodes(base64Decode(encodedCredential));
+        if (credential == 'user:password') {
+          request.response.writeln('Authorized');
+        } else {
+          request.response.headers.add(
+              HttpHeaders.wwwAuthenticateHeader, 'Basic realm="Test realm"');
+          request.response.statusCode = HttpStatus.unauthorized;
+        }
       } else {
         request.response.headers
-            .add('WWW-Authenticate', 'Basic realm="Test realm"');
+            .add(HttpHeaders.wwwAuthenticateHeader, 'Basic realm="Test realm"');
         request.response.statusCode = HttpStatus.unauthorized;
       }
     } else {
@@ -799,10 +808,15 @@ Future<void> main() async {
       unawaited(
         controller.setNavigationDelegate(
           NavigationDelegate(
-            onHttpAuthRequest: (HttpAuthRequest request) => request.onProceed(
-              const WebViewCredential(user: 'user', password: 'password'),
+            onHttpAuthRequest: (HttpAuthRequest request) =>
+                request.onAuthenticate(
+              const WebViewCredential(
+                user: 'u2ser',
+                password: 'password',
+              ),
             ),
             onPageFinished: (_) => pageFinished.complete(),
+            onWebResourceError: (_) => fail('Authentication failed'),
           ),
         ),
       );

packages/webview_flutter/webview_flutter/example/lib/main.dart

@@ -15,7 +15,6 @@ import 'package:webview_flutter/webview_flutter.dart';
 // #docregion platform_imports
 // Import for Android features.
 import 'package:webview_flutter_android/webview_flutter_android.dart';
-import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 // Import for iOS features.
 import 'package:webview_flutter_wkwebview/webview_flutter_wkwebview.dart';
 // #enddocregion platform_imports
@@ -265,14 +264,14 @@ Page resource error:
             // requests when a previous request is pending.
             TextButton(
               onPressed: () {
-                httpRequest.onCancel();
+                httpRequest.onAuthenticate(null);
                 Navigator.of(context).pop();
               },
               child: const Text('Cancel'),
             ),
             TextButton(
               onPressed: () {
-                httpRequest.onProceed(
+                httpRequest.onAuthenticate(
                   WebViewCredential(
                     user: usernameTextController.text,
                     password: passwordTextController.text,

packages/webview_flutter/webview_flutter/lib/src/navigation_delegate.dart

@@ -123,7 +123,7 @@ class NavigationDelegate {
     this.onProgress,
     this.onWebResourceError,
     void Function(UrlChange change)? onUrlChange,
-    this.onHttpAuthRequest,
+    HttpAuthRequestCallback? onHttpAuthRequest,
   }) {
     if (onNavigationRequest != null) {
       platform.setOnNavigationRequest(onNavigationRequest!);
@@ -144,7 +144,7 @@ class NavigationDelegate {
       platform.setOnUrlChange(onUrlChange);
     }
     if (onHttpAuthRequest != null) {
-      platform.setOnHttpAuthRequest(onHttpAuthRequest!);
+      platform.setOnHttpAuthRequest(onHttpAuthRequest);
     }
   }
 
@@ -174,7 +174,4 @@ class NavigationDelegate {
 
   /// Invoked when a resource loading error occurred.
   final WebResourceErrorCallback? onWebResourceError;
-
-  /// Invoked when a resource required HTTP authentication.
-  final HttpAuthRequestCallback? onHttpAuthRequest;
 }

packages/webview_flutter/webview_flutter/lib/webview_flutter.dart

@@ -27,6 +27,7 @@ export 'package:webview_flutter_platform_interface/webview_flutter_platform_inte
         WebResourceErrorCallback,
         WebResourceErrorType,
         WebViewCookie,
+        WebViewCredential,
         WebViewPermissionResourceType,
         WebViewPlatform;
 

packages/webview_flutter/webview_flutter_android/example/integration_test/webview_flutter_test.dart

@@ -1178,7 +1178,7 @@ Future<void> main() async {
     );
     await navigationDelegate.setOnPageFinished((_) => pageFinished.complete());
     await navigationDelegate.setOnHttpAuthRequest(
-      (HttpAuthRequest request) => request.onProceed(
+      (HttpAuthRequest request) => request.onAuthenticate(
         const WebViewCredential(user: 'user', password: 'password'),
       ),
     );

packages/webview_flutter/webview_flutter_android/example/lib/main.dart

@@ -163,8 +163,6 @@ Page resource error:
             debugPrint('url change to ${change.url}');
           })
           ..setOnHttpAuthRequest((HttpAuthRequest request) {
-            debugPrint(
-                'HTTP basic auth request with host ${request.host} and realm ${request.realm ?? '-'}');
             openDialog(request);
           }),
       )
@@ -255,7 +253,7 @@ Page resource error:
           actions: <Widget>[
             TextButton(
               onPressed: () {
-                httpRequest.onProceed(
+                httpRequest.onAuthenticate(
                   WebViewCredential(
                     user: usernameTextController.text,
                     password: passwordTextController.text,

packages/webview_flutter/webview_flutter_android/lib/src/android_webview.dart

@@ -7,7 +7,6 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart' show BinaryMessenger;
 
 import 'package:flutter/widgets.dart' show WidgetsFlutterBinding;
-import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart';
 
 import 'android_webview.g.dart';
 import 'android_webview_api_impls.dart';
@@ -1533,8 +1532,8 @@ class HttpAuthHandler extends JavaObject {
 
   /// Instructs the WebView to proceed with the authentication with the provided
   /// credentials.
-  Future<void> proceed(WebViewCredential credential) {
-    return api.proceedFromInstance(this, credential);
+  Future<void> proceed(String username, String password) {
+    return api.proceedFromInstance(this, username, password);
   }
 
   /// Gets whether the credentials stored for the current host are suitable for

packages/webview_flutter/webview_flutter_android/lib/src/android_webview_api_impls.dart

@@ -5,8 +5,6 @@
 import 'dart:ui';
 
 import 'package:flutter/services.dart' show BinaryMessenger, Uint8List;
-import 'package:webview_flutter_platform_interface/webview_flutter_platform_interface.dart'
-    show WebViewCredential;
 
 import 'android_webview.dart';
 import 'android_webview.g.dart';
@@ -1451,12 +1449,13 @@ class HttpAuthHandlerHostApiImpl extends HttpAuthHandlerHostApi {
   /// Helper method to convert instance ids to objects.
   Future<void> proceedFromInstance(
     HttpAuthHandler instance,
-    WebViewCredential credential,
+    String username,
+    String password,
   ) {
     return proceed(
       _instanceManager.getIdentifier(instance)!,
-      credential.user,
-      credential.password,
+      username,
+      password,
     );
   }
 

packages/webview_flutter/webview_flutter_android/lib/src/android_webview_controller.dart

@@ -1279,8 +1279,16 @@ class AndroidNavigationDelegate extends PlatformNavigationDelegate {
         if (callback != null) {
           callback(
             HttpAuthRequest(
-              onProceed: httpAuthHandler.proceed,
-              onCancel: httpAuthHandler.cancel,
+              onAuthenticate: (WebViewCredential? credential) {
+                if (credential == null) {
+                  httpAuthHandler.cancel();
+                } else {
+                  httpAuthHandler.proceed(
+                    credential.user,
+                    credential.password,
+                  );
+                }
+              },
               host: host,
               realm: realm,
             ),

packages/webview_flutter/webview_flutter_platform_interface/lib/src/types/http_auth_request.dart

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:meta/meta.dart';
-
+import 'package:flutter/foundation.dart';
 import '../../webview_flutter_platform_interface.dart';
 
 /// Defines the parameters of a pending HTTP authentication request received by
@@ -51,17 +50,15 @@ import '../../webview_flutter_platform_interface.dart';
 class HttpAuthRequest {
   /// Creates a [HttpAuthRequest].
   const HttpAuthRequest({
-    required this.onProceed,
-    required this.onCancel,
+    required this.onAuthenticate,
     required this.host,
     this.realm,
   });
 
-  /// The callback to authenticate.
-  final void Function(WebViewCredential credential) onProceed;
-
-  /// The callback to cancel authentication.
-  final void Function() onCancel;
+  /// The callback to proceed with, or cancel an auth request.
+  ///
+  /// If `credential` is `null`, the request will be canceled.
+  final void Function(WebViewCredential? credential) onAuthenticate;
 
   /// The host requiring authentication.
   final String host;

packages/webview_flutter/webview_flutter_wkwebview/example/integration_test/webview_flutter_test.dart

@@ -1186,7 +1186,7 @@ Future<void> main() async {
     );
     await navigationDelegate.setOnPageFinished((_) => pageFinished.complete());
     await navigationDelegate.setOnHttpAuthRequest(
-      (HttpAuthRequest request) => request.onProceed(
+      (HttpAuthRequest request) => request.onAuthenticate(
         const WebViewCredential(user: 'user', password: 'password'),
       ),
     );

packages/webview_flutter/webview_flutter_wkwebview/example/lib/main.dart

@@ -259,14 +259,14 @@ Page resource error:
             // requests when a previous request is pending.
             TextButton(
               onPressed: () {
-                httpRequest.onCancel();
+                httpRequest.onAuthenticate(null);
                 Navigator.of(context).pop();
               },
               child: const Text('Cancel'),
             ),
             TextButton(
               onPressed: () {
-                httpRequest.onProceed(
+                httpRequest.onAuthenticate(
                   WebViewCredential(
                     user: usernameTextController.text,
                     password: passwordTextController.text,

packages/webview_flutter/webview_flutter_wkwebview/lib/src/webkit_webview_controller.dart

@@ -966,7 +966,15 @@ class WebKitNavigationDelegate extends PlatformNavigationDelegate {
           if (callback != null && host != null && realm != null) {
             callback(
               HttpAuthRequest(
-                onProceed: (WebViewCredential credential) {
+                onAuthenticate: (WebViewCredential? credential) {
+                  if (credential == null) {
+                    return completionHandler(
+                      NSUrlSessionAuthChallengeDisposition
+                          .cancelAuthenticationChallenge,
+                      null,
+                    );
+                  }
+
                   return completionHandler(
                     NSUrlSessionAuthChallengeDisposition.useCredential,
                     NSUrlCredential.withUser(
@@ -976,13 +984,6 @@ class WebKitNavigationDelegate extends PlatformNavigationDelegate {
                     ),
                   );
                 },
-                onCancel: () {
-                  completionHandler(
-                    NSUrlSessionAuthChallengeDisposition
-                        .cancelAuthenticationChallenge,
-                    null,
-                  );
-                },
                 host: host,
                 realm: realm,
               ),