Bellatrix playwright upgrade

src/Bellatrix.Api/ApiClientService.cs

@@ -13,6 +13,7 @@
 // <site>https://bellatrix.solutions/</site>
 using System;
 using System.Diagnostics;
+using System.Net;
 using System.Threading;
 using System.Threading.Tasks;
 using Bellatrix.Api.Configuration;
@@ -31,27 +32,11 @@ public class ApiClientService
     private readonly ApiSettings _apiSettings = ConfigurationService.GetSection<ApiSettings>();
 
     // TODO: is this going to be accessible in the service container?
-    public ApiClientService(string baseUrl = null)
+    public ApiClientService(string baseUrl = null, CookieContainer cookieContainer = null)
     {
         _executionProvider = new ExecutionProvider();
         InitializeExecutionExtensions(_executionProvider);
 
-        var options = new RestClientOptions
-        {
-            BaseUrl = baseUrl is not null ? new Uri(baseUrl) : null,
-            FollowRedirects = true
-        };
-
-        _executionProvider.OnClientInitialized(WrappedClient);
-        var authenticator = ServicesCollection.Current.Resolve<IAuthenticator>();
-        if (authenticator != null)
-        {
-            options.Authenticator = authenticator;
-        }
-        WrappedClient = new RestClient(
-            options,
-            configureSerialization: s => s.UseNewtonsoftJson()
-            );
         ////WrappedClient.AddHandler("application/json", () => NewtonsoftJsonSerializer.Default);
         ////WrappedClient.AddHandler("text/json", () => NewtonsoftJsonSerializer.Default);
         ////WrappedClient.AddHandler("text/x-json", () => NewtonsoftJsonSerializer.Default);
@@ -63,6 +48,8 @@ public ApiClientService(string baseUrl = null)
             MaxRetryAttempts = _apiSettings.MaxRetryAttempts;
             PauseBetweenFailures = Utilities.TimeSpanConverter.Convert(_apiSettings.PauseBetweenFailures, _apiSettings.TimeUnit);
 
+            InitializeNewRestClient(baseUrl, cookieContainer);
+
             int timeoutSeconds = _apiSettings.ClientTimeoutSeconds;
             Policy.Timeout(timeoutSeconds, onTimeout: (context, timespan, task) =>
             {
@@ -83,11 +70,23 @@ public ApiClientService(string baseUrl = null)
 
     public int MaxRetryAttempts { get; set; }
 
-    ////public Uri BaseUrl
-    ////{
-    ////    get => WrappedClient.Ur.AbsoluteUri;
-    ////    set => WrappedClient.BaseUrl = new Uri(value);
-    ////}
+    public CookieContainer CookieContainer
+    {
+        get => WrappedClient.Options.CookieContainer;
+        set
+        {
+            InitializeNewRestClient(WrappedClient.Options.BaseUrl.AbsoluteUri, value);
+        }
+    }
+
+    public Uri BaseUrl
+    {
+        get => WrappedClient.Options.BaseUrl;
+        set
+        {
+            InitializeNewRestClient(value.AbsoluteUri, WrappedClient.Options.CookieContainer);
+        }
+    }
 
     public TimeSpan PauseBetweenFailures { get; set; }
 
@@ -348,4 +347,29 @@ private void SetJsonContent(RestRequest request, object obj = null)
             request.AddJsonBody(obj);
         }
     }
+
+    private void InitializeNewRestClient(string baseUrl = null, CookieContainer cookieContainer = null)
+    {
+        var options = new RestClientOptions
+        {
+            BaseUrl = baseUrl is not null ? new Uri(baseUrl) : null,
+            FollowRedirects = true
+        };
+
+        if (cookieContainer is not null)
+        {
+            options.CookieContainer = cookieContainer;
+        }
+
+        _executionProvider.OnClientInitialized(WrappedClient);
+        var authenticator = ServicesCollection.Current.Resolve<IAuthenticator>();
+        if (authenticator != null)
+        {
+            options.Authenticator = authenticator;
+        }
+        WrappedClient = new RestClient(
+            options,
+            configureSerialization: s => s.UseNewtonsoftJson()
+            );
+    }
 }

src/Bellatrix.Api/Bellatrix.API.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
     <PackageReference Include="RestSharp" Version="110.2.0" />
-    <PackageReference Include="MSTest" Version="3.2.0" />
+    <PackageReference Include="MSTest" Version="3.2.2" />
   </ItemGroup>
 
   <ItemGroup>

src/Bellatrix.Core/Bellatrix.Core.csproj

@@ -18,7 +18,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
-    <PackageReference Include="MSTest" Version="3.2.0" />
+    <PackageReference Include="MSTest" Version="3.2.2" />
     <PackageReference Include="System.Management" Version="8.0.0" />
     <PackageReference Include="Unity" Version="5.11.10" />
     <!--<PackageReference Include="MSTest.TestFramework" Version="2.2.10" />-->

src/Bellatrix.Desktop/Bellatrix.Desktop.csproj

@@ -8,7 +8,7 @@
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.1" />
 		<PackageReference Include="Microsoft.WinAppDriver.Appium.WebDriver" Version="1.0.1-Preview" />
-    <PackageReference Include="MSTest" Version="3.2.0" />
+    <PackageReference Include="MSTest" Version="3.2.2" />
 
 		<!--Do not Update to 3.14.0, it has bugs incompatible with Appium.WebDriver 3.0.0.1-->
 		<!--<PackageReference Include="Selenium.WebDriver" Version="3.141.0" />-->

src/Bellatrix.KeyVault/Bellatrix.KeyVault.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<Import Project="..\..\shared\SharedAssemblyInfo.targets" />
 	<ItemGroup>
-    <PackageReference Include="Azure.Identity" Version="1.10.4" />
+    <PackageReference Include="Azure.Identity" Version="1.11.0" />
     <PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.5.0" />
 	</ItemGroup>
 	<ItemGroup>

src/Bellatrix.Mobile/Bellatrix.Mobile.csproj

@@ -7,7 +7,7 @@
 	<ItemGroup>
     <PackageReference Include="Appium.WebDriver" Version="5.0.0-rc.5" />
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="MSTest" Version="3.2.0" />
+    <PackageReference Include="MSTest" Version="3.2.2" />
     <PackageReference Include="Selenium.WebDriver" Version="4.17.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />

src/Bellatrix.Playwright/Bellatrix.Playwright.csproj

@@ -0,0 +1,24 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+	<PropertyGroup>
+		<Configurations>DEBUG;STAGE;QA;LOCAL</Configurations>
+	</PropertyGroup>
+
+	<Import Project="..\..\shared\SharedAssemblyInfo.targets" />
+
+	<ItemGroup>
+    <PackageReference Include="AutoMapper" Version="13.0.1" />
+    <PackageReference Include="Microsoft.Playwright" Version="1.40.0" />
+    <PackageReference Include="Microsoft.Playwright.NUnit" Version="1.40.0" />
+	<PackageReference Include="MSTest" Version="3.2.2" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Bellatrix.Api\Bellatrix.API.csproj" />
+    <ProjectReference Include="..\Bellatrix.AWS\Bellatrix.AWS.csproj" />
+    <ProjectReference Include="..\Bellatrix.CognitiveServices\Bellatrix.CognitiveServices.csproj" />
+    <ProjectReference Include="..\Bellatrix.Core\Bellatrix.Core.csproj" />
+    <ProjectReference Include="..\Bellatrix.Layout\Bellatrix.Layout.csproj" />
+  </ItemGroup>
+
+</Project>

src/Bellatrix.Playwright/Usings.cs

@@ -0,0 +1,7 @@
+global using Microsoft.Playwright;
+global using static Microsoft.Playwright.Assertions;
+global using System;
+global using System.Collections.Generic;
+global using System.Linq;
+global using System.IO;
+global using Bellatrix.Playwright.SyncPlaywright;