Merge branch 'trunk' into rbe_eif

Author: titusfortner

.pr-agent.toml renamed to .pr_agent.toml

@@ -47,104 +47,104 @@ v4.30.0
 v4.29.0
 ======
 * Add CDP for Chrome 133 and remove 130
-* [dotnet] [bidi] Add network SetCacheBehavior command (#15133)
-* [dotnet] Annotate nullability on devtools event args (#15134)
-* [dotnet] Annotate nullability for `DriverService` and chromium/safari services (#15101)
-* [dotnet] Add nullability to `Command` type (#15147)
-* [dotnet] Annotate nullable reference types on input devices (#14804)
-* [dotnet] Annotate nullability on `SendingRemoteHttpRequestEventArgs` (#15148)
-* [dotnet] Fix obvious code style formatting
-* [dotnet] Address some build warnings (#15157)
-* [dotnet] Enhance Print PageSize class to support for predefined well-known sizes (#15144)
-* [dotnet] Improve bidi exception when it is not enabled (#15163)
-* [dotnet] Annotate nullability on `DriverOptions` (#15167)
-* [dotnet] Annotate nullability on `ChromiumOptions` (#15173)
-* [dotnet] Annotate nullability on interactions (#15152)
-* [dotnet] [bidi] Use JsonSerializerContext to be AOT friendly (#15162)
-* [dotnet] Annotate nullability on chrome-based driver services (#15154)
-* [dotnet] Simplify and modernize `DevToolsDomains.InitializeDomains` (#15198)
-* [dotnet] Add nullability to Chromium configuration types (#15204)
-* [dotnet] Allow UTF-16 tolerant string converter as a dictionary key (#15203)
-* [dotnet] Fix webauth credential to allow nullable `rpID` (#15201)
-* [dotnet] [bidi] Avoid polymorphic commands to be more statically easier (#15202)
-* [dotnet] Optimize reflection in `JsonEnumMemberConverter` (#15205)
-* [dotnet] Annotate nullability on firefox and chromium options (#15206)
-* [dotnet] Annotate nullability on `Actions` type (#15208)
-* [dotnet] Fix marionette host Firefox argument (#15153)
-* [dotnet] Make it easier to read bidi logs
-* [dotnet] Annotate nullability on `Navigate()` and `SwitchTo()` (#15211)
-* [dotnet] Annotate nullability on Firefox profile (#15207)
-* [dotnet] Annotate nullability on network interactions (#15209)
-* [dotnet] Add nullability to `Manage()` (#15210)
-* [dotnet] Remove Firefox CDP (#15200)
-* [dotnet] Fully annotate nullability on `HttpCommandExecutor` (#15110)
-* [dotnet] Annotate nullability on `SafariOptions`, error, and enums (#15219)
-* [dotnet] Fix `JavaScriptEngine.ScriptCallbackBindings` not containing new bindings (#15221)
-* [dotnet] Handle nullability on `WebElement` (#15225)
-* [dotnet] Annotate nullability on `FirefoxDriverService` (#15220)
-* [dotnet] Add nullability annotations to devtools domains (#15143)
-* [dotnet] Annotate nullability on Domains (#15237)
-* [dotnet] Add not-null `Response.Value` helper (#15243)
-* [dotnet] Annotate nullability on `JavaScript` protocol (#15238)
-* [dotnet] Annotate nullability on `Target` protocol (#15240)
-* [dotnet] Annotate nullability on `Log` protocol (#15239)
-* [dotnet] Annotate nullability on `JavaScriptEngine` and related types (#15218)
-* [dotnet] Annotate nullability on `DevToolsSession` (#15244)
-* [dotnet] [bidi] Support getting of client windows in browser module (#15241)
-* [dotnet][bidi] Remove json serialization from transport layer (#15250)
-* [dotnet][bidi] Add BrowsingContext.OnNavigationCommitted event (#15253)
-* [dotnet][bidi] Use subscription id for events to unsubscribe (#15251)
-* [dotnet][bidi] Add optional PromptUnload parameter when closing BrowsingContext and compiler helps (#15254)
-* [dotnet] Annotate nullability on `DevTools` and event args (#15252)
-* [dotnet] Annotate nullability on platform-specific WebDrivers (#15236)
-* [dotnet] Add back in a public parameterless constructor to `HttpRequestData` (#15258)
-* [dotnet] Simplify user creation of network types (#15267)
-* [dotnet][bidi] Remove AsBiDiContextAsync helper to avoid disposal issue (#15279)
-* [dotnet] Possibility to override underlying HttpClient/HttpClientHandler for all HTTP requests (#15283)
-* [dotnet][bidi] Underlying local/remote script number as double (#15301)
+* [bidi] Add network SetCacheBehavior command (#15133)
+* Annotate nullability on devtools event args (#15134)
+* Annotate nullability for `DriverService` and chromium/safari services (#15101)
+* Add nullability to `Command` type (#15147)
+* Annotate nullable reference types on input devices (#14804)
+* Annotate nullability on `SendingRemoteHttpRequestEventArgs` (#15148)
+* Fix obvious code style formatting
+* Address some build warnings (#15157)
+* Enhance Print PageSize class to support for predefined well-known sizes (#15144)
+* Improve bidi exception when it is not enabled (#15163)
+* Annotate nullability on `DriverOptions` (#15167)
+* Annotate nullability on `ChromiumOptions` (#15173)
+* Annotate nullability on interactions (#15152)
+* [bidi] Use JsonSerializerContext to be AOT friendly (#15162)
+* Annotate nullability on chrome-based driver services (#15154)
+* Simplify and modernize `DevToolsDomains.InitializeDomains` (#15198)
+* Add nullability to Chromium configuration types (#15204)
+* Allow UTF-16 tolerant string converter as a dictionary key (#15203)
+* Fix webauth credential to allow nullable `rpID` (#15201)
+* [bidi] Avoid polymorphic commands to be more statically easier (#15202)
+* Optimize reflection in `JsonEnumMemberConverter` (#15205)
+* Annotate nullability on firefox and chromium options (#15206)
+* Annotate nullability on `Actions` type (#15208)
+* Fix marionette host Firefox argument (#15153)
+* Make it easier to read bidi logs
+* Annotate nullability on `Navigate()` and `SwitchTo()` (#15211)
+* Annotate nullability on Firefox profile (#15207)
+* Annotate nullability on network interactions (#15209)
+* Add nullability to `Manage()` (#15210)
+* Remove Firefox CDP (#15200)
+* Fully annotate nullability on `HttpCommandExecutor` (#15110)
+* Annotate nullability on `SafariOptions`, error, and enums (#15219)
+* Fix `JavaScriptEngine.ScriptCallbackBindings` not containing new bindings (#15221)
+* Handle nullability on `WebElement` (#15225)
+* Annotate nullability on `FirefoxDriverService` (#15220)
+* Add nullability annotations to devtools domains (#15143)
+* Annotate nullability on Domains (#15237)
+* Add not-null `Response.Value` helper (#15243)
+* Annotate nullability on `JavaScript` protocol (#15238)
+* Annotate nullability on `Target` protocol (#15240)
+* Annotate nullability on `Log` protocol (#15239)
+* Annotate nullability on `JavaScriptEngine` and related types (#15218)
+* Annotate nullability on `DevToolsSession` (#15244)
+* [bidi] Support getting of client windows in browser module (#15241)
+* [bidi] Remove json serialization from transport layer (#15250)
+* [bidi] Add BrowsingContext.OnNavigationCommitted event (#15253)
+* [bidi] Use subscription id for events to unsubscribe (#15251)
+* [bidi] Add optional PromptUnload parameter when closing BrowsingContext and compiler helps (#15254)
+* Annotate nullability on `DevTools` and event args (#15252)
+* Annotate nullability on platform-specific WebDrivers (#15236)
+* Add back in a public parameterless constructor to `HttpRequestData` (#15258)
+* Simplify user creation of network types (#15267)
+* [bidi] Remove AsBiDiContextAsync helper to avoid disposal issue (#15279)
+* Possibility to override underlying HttpClient/HttpClientHandler for all HTTP requests (#15283)
+* [bidi] Underlying local/remote script number as double (#15301)
 
 v4.28.0
 ======
 * Add CDP for Chrome 132 and remove 129
-* [dotnet] Add nullability annotations to print types (#14773)
-* [dotnet] Propagate `IWebDriver.GetAttribute` obsoletion to `WebDriver` (#14802)
-* [dotnet] Add nullability annotations to `ShadowRoot` (#14812)
-* [dotnet] Fix `WebDriver.AuthenticatorId` to return proper state set by user (#14814)
-* [dotnet] Add future-proofing note on `Base64UrlEncoder` (#14821)
+* Add nullability annotations to print types (#14773)
+* Propagate `IWebDriver.GetAttribute` obsoletion to `WebDriver` (#14802)
+* Add nullability annotations to `ShadowRoot` (#14812)
+* Fix `WebDriver.AuthenticatorId` to return proper state set by user (#14814)
+* Add future-proofing note on `Base64UrlEncoder` (#14821)
 * Run update_copyright script. No logical changes
-* [dotnet] Add nullable reference annotations to `Platform` (#14834)
-* [dotnet] Fix Virtual Authenticator removal, annotate NRT (#14822)
-* [dotnet] Annotate Nullable Reference Types on `OpenQA.Selenium.Internal` (#14840)
-* [dotnet] Annotate nullable reference types in internal logging (#14819)
-* [dotnet] Address warnings with `ActionSequence.inputDevice` and use proper alternative (#14848)
-* [dotnet] Add nullability annotations to `Proxy` (#14861)
-* [dotnet] Modernize `Response` type (#14839)
-* [dotnet] Add nullability to Logs API (#14875)
-* [dotnet] Add nullability to `CookieJar` (#14874)
-* [dotnet] Refactor away private constructor from `Response` (#14877)
-* [dotnet] Add nullability to `Alert`s (#14669)
-* [dotnet] [bidi] Convert RemoteRefrence to an interface
-* [dotnet] [bidi] Convert RemoteObjectReference to an interface
-* [dotnet] [bidi] Fix name of autodetect proxy configuration
-* [dotnet] [cdp] Add more internal logs around CDP implementation (Related to #14903)
-* [dotnet] Add nullability annotations to `SessionId` (#14841)
-* [dotnet] Align WebDriver errors with specification (#14936)
-* [dotnet] Add nullability to `IniFileReader` (#14929)
-* [dotnet] Annotate nullability on command repository (#14888)
-* [dotnet] Revert deprecation of GetAttribute method (#14956)
-* [dotnet] Annotate `DriverServiceCommandExecutor` for nullability (#14942)
-* [dotnet] Do not intercept exceptions from `ICommandExecutor.ExecuteAsync` (#14892)
-* [dotnet] Move `Response` constructors towards immutability (#14998)
-* [dotnet] Switch DevTools response JSON parsing to `JsonElement` (#14990)
-* [dotnet] Utilize dedicated WebDriver Spec endpoint to get named cookie (#14957)
-* [dotnet] Tolerate invalid UTF-16 strings in DevTools JSON response (#14972)
-* [dotnet] Fix logging issue when log context level conflicts with logger already captured level (#15057)
-* [dotnet] Safari driver supports /status endpoint (#15066)
-* [dotnet] Simplify nuget package readme code example
-* [dotnet] Guard for cookie deletion when name is empty (#15074)
-* [dotnet] Add nullability to `FirefoxExtension` (#14964)
-* [dotnet] Start adding nullable reference type annotations to the `Support` package (#14779)
-* [dotnet] Finish nullability annotations on `Support` package (#15089)
+* Add nullable reference annotations to `Platform` (#14834)
+* Fix Virtual Authenticator removal, annotate NRT (#14822)
+* Annotate Nullable Reference Types on `OpenQA.Selenium.Internal` (#14840)
+* Annotate nullable reference types in internal logging (#14819)
+* Address warnings with `ActionSequence.inputDevice` and use proper alternative (#14848)
+* Add nullability annotations to `Proxy` (#14861)
+* Modernize `Response` type (#14839)
+* Add nullability to Logs API (#14875)
+* Add nullability to `CookieJar` (#14874)
+* Refactor away private constructor from `Response` (#14877)
+* Add nullability to `Alert`s (#14669)
+* [bidi] Convert RemoteRefrence to an interface
+* [bidi] Convert RemoteObjectReference to an interface
+* [bidi] Fix name of autodetect proxy configuration
+* [cdp] Add more internal logs around CDP implementation (Related to #14903)
+* Add nullability annotations to `SessionId` (#14841)
+* Align WebDriver errors with specification (#14936)
+* Add nullability to `IniFileReader` (#14929)
+* Annotate nullability on command repository (#14888)
+* Revert deprecation of GetAttribute method (#14956)
+* Annotate `DriverServiceCommandExecutor` for nullability (#14942)
+* Do not intercept exceptions from `ICommandExecutor.ExecuteAsync` (#14892)
+* Move `Response` constructors towards immutability (#14998)
+* Switch DevTools response JSON parsing to `JsonElement` (#14990)
+* Utilize dedicated WebDriver Spec endpoint to get named cookie (#14957)
+* Tolerate invalid UTF-16 strings in DevTools JSON response (#14972)
+* Fix logging issue when log context level conflicts with logger already captured level (#15057)
+* Safari driver supports /status endpoint (#15066)
+* Simplify nuget package readme code example
+* Guard for cookie deletion when name is empty (#15074)
+* Add nullability to `FirefoxExtension` (#14964)
+* Start adding nullable reference type annotations to the `Support` package (#14779)
+* Finish nullability annotations on `Support` package (#15089)
 * Update supported versions for Chrome DevTools
 
 v4.27.0

dotnet/CHANGELOG

@@ -120,7 +120,6 @@ namespace OpenQA.Selenium.BiDi.Communication.Json;
 [JsonSerializable(typeof(Modules.BrowsingContext.UserPromptOpenedEventArgs))]
 [JsonSerializable(typeof(Modules.BrowsingContext.UserPromptClosedEventArgs))]
 
-[JsonSerializable(typeof(Modules.Network.ContinueWithAuthParameters.Default), TypeInfoPropertyName = "Network_ContinueWithAuthParameters_Default")]
 [JsonSerializable(typeof(Modules.Network.AddInterceptCommand))]
 [JsonSerializable(typeof(Modules.Network.AddInterceptResult))]
 [JsonSerializable(typeof(Modules.Network.ContinueRequestCommand))]

dotnet/src/webdriver/BiDi/Communication/Json/BiDiJsonSerializerContext.cs

@@ -26,20 +26,26 @@ internal class ContinueWithAuthCommand(ContinueWithAuthParameters @params)
     : Command<ContinueWithAuthParameters>(@params, "network.continueWithAuth");
 
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "action")]
-[JsonDerivedType(typeof(Credentials), "provideCredentials")]
-[JsonDerivedType(typeof(Default), "default")]
-[JsonDerivedType(typeof(Cancel), "cancel")]
-internal abstract record ContinueWithAuthParameters(Request Request) : CommandParameters
-{
-    internal record Credentials(Request Request, [property: JsonPropertyName("credentials")] AuthCredentials AuthCredentials) : ContinueWithAuthParameters(Request);
+[JsonDerivedType(typeof(ContinueWithAuthCredentials), "provideCredentials")]
+[JsonDerivedType(typeof(ContinueWithAuthDefaultCredentials), "default")]
+[JsonDerivedType(typeof(ContinueWithAuthCancelCredentials), "cancel")]
+internal abstract record ContinueWithAuthParameters(Request Request) : CommandParameters;
 
-    internal record Default(Request Request) : ContinueWithAuthParameters(Request);
+internal record ContinueWithAuthCredentials(Request Request, AuthCredentials Credentials) : ContinueWithAuthParameters(Request);
 
-    internal record Cancel(Request Request) : ContinueWithAuthParameters(Request);
-}
+internal abstract record ContinueWithAuthNoCredentials(Request Request) : ContinueWithAuthParameters(Request);
+
+internal record ContinueWithAuthDefaultCredentials(Request Request) : ContinueWithAuthNoCredentials(Request);
+
+internal record ContinueWithAuthCancelCredentials(Request Request) : ContinueWithAuthNoCredentials(Request);
 
 public record ContinueWithAuthOptions : CommandOptions;
 
-public record ContinueWithDefaultAuthOptions : CommandOptions;
+public record ContinueWithAuthCredentialsOptions : ContinueWithAuthOptions;
+
+public record ContinueWithAuthNoCredentialsOptions : ContinueWithAuthOptions;
+
+public record ContinueWithAuthDefaultCredentialsOptions : ContinueWithAuthNoCredentialsOptions;
+
+public record ContinueWithAuthCancelCredentialsOptions : ContinueWithAuthNoCredentialsOptions;
 
-public record ContinueWithCancelledAuthOptions : CommandOptions;

dotnet/src/webdriver/BiDi/Modules/Network/ContinueWithAuthCommand.cs

@@ -104,19 +104,19 @@ internal async Task ProvideResponseAsync(Request request, ProvideResponseOptions
         await Broker.ExecuteCommandAsync(new ProvideResponseCommand(@params), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthOptions? options = null)
+    internal async Task ContinueWithAuthAsync(Request request, AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthParameters.Credentials(request, credentials)), options).ConfigureAwait(false);
+        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCredentials(request, credentials)), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueWithAuthAsync(Request request, ContinueWithDefaultAuthOptions? options = null)
+    internal async Task ContinueWithAuthAsync(Request request, ContinueWithAuthDefaultCredentialsOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthParameters.Default(request)), options).ConfigureAwait(false);
+        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthDefaultCredentials(request)), options).ConfigureAwait(false);
     }
 
-    internal async Task ContinueWithAuthAsync(Request request, ContinueWithCancelledAuthOptions? options = null)
+    internal async Task ContinueWithAuthAsync(Request request, ContinueWithAuthCancelCredentialsOptions? options = null)
     {
-        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthParameters.Cancel(request)), options).ConfigureAwait(false);
+        await Broker.ExecuteCommandAsync(new ContinueWithAuthCommand(new ContinueWithAuthCancelCredentials(request)), options).ConfigureAwait(false);
     }
 
     public async Task<Subscription> OnBeforeRequestSentAsync(Func<BeforeRequestSentEventArgs, Task> handler, SubscriptionOptions? options = null)

dotnet/src/webdriver/BiDi/Modules/Network/NetworkModule.cs

@@ -53,17 +53,17 @@ public Task ContinueResponseAsync(ContinueResponseOptions? options = null)
         return _bidi.Network.ContinueResponseAsync(this, options);
     }
 
-    public Task ContinueWithAuthAsync(AuthCredentials credentials, ContinueWithAuthOptions? options = null)
+    public Task ContinueWithAuthAsync(AuthCredentials credentials, ContinueWithAuthCredentialsOptions? options = null)
     {
         return _bidi.Network.ContinueWithAuthAsync(this, credentials, options);
     }
 
-    public Task ContinueWithAuthAsync(ContinueWithDefaultAuthOptions? options = null)
+    public Task ContinueWithAuthAsync(ContinueWithAuthDefaultCredentialsOptions? options = null)
     {
         return _bidi.Network.ContinueWithAuthAsync(this, options);
     }
 
-    public Task ContinueWithAuthAsync(ContinueWithCancelledAuthOptions? options = null)
+    public Task ContinueWithAuthAsync(ContinueWithAuthCancelCredentialsOptions? options = null)
     {
         return _bidi.Network.ContinueWithAuthAsync(this, options);
     }

dotnet/src/webdriver/BiDi/Modules/Network/Request.cs

@@ -162,7 +162,6 @@ public async Task CanContinueWithAuthCredentials()
     {
         await using var intercept = await bidi.Network.InterceptAuthAsync(async e =>
         {
-            //TODO Seems it would be better to have method which takes abstract options
             await e.Request.Request.ContinueWithAuthAsync(new AuthCredentials("test", "test"));
         });
 
@@ -177,7 +176,7 @@ public async Task CanContinueWithDefaultCredentials()
     {
         await using var intercept = await bidi.Network.InterceptAuthAsync(async e =>
         {
-            await e.Request.Request.ContinueWithAuthAsync(new ContinueWithDefaultAuthOptions());
+            await e.Request.Request.ContinueWithAuthAsync(new ContinueWithAuthDefaultCredentialsOptions());
         });
 
         var action = async () => await context.NavigateAsync(UrlBuilder.WhereIs("basicAuth"), new() { Wait = ReadinessState.Complete });
@@ -191,7 +190,7 @@ public async Task CanContinueWithCanceledCredentials()
     {
         await using var intercept = await bidi.Network.InterceptAuthAsync(async e =>
         {
-            await e.Request.Request.ContinueWithAuthAsync(new ContinueWithCancelledAuthOptions());
+            await e.Request.Request.ContinueWithAuthAsync(new ContinueWithAuthCancelCredentialsOptions());
         });
 
         var action = async () => await context.NavigateAsync(UrlBuilder.WhereIs("basicAuth"), new() { Wait = ReadinessState.Complete });