chore: update MPT service api signature (#2943)

microsoft · Jun 5, 2024 · 062fbe9 · 062fbe9
1 parent 929a44c
commit 062fbe9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/src/Playwright.MSTest/Services/BrowserService.cs b/src/Playwright.MSTest/Services/BrowserService.cs
@@ -25,7 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Playwright.TestAdapter;
 
@@ -51,19 +50,17 @@ public async Task BuildAsync(PlaywrightTest parentTest)
         else
         {
             var exposeNetwork = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_EXPOSE_NETWORK") ?? "<loopback>";
-            var caps = new Dictionary<string, string>
-            {
-                ["os"] = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_OS") ?? "linux",
-                ["runId"] = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_RUN_ID") ?? DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture),
-            };
-            var wsEndpoint = $"{serviceUrl}?cap={JsonSerializer.Serialize(caps)}";
+            var os = Uri.EscapeDataString(Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_OS") ?? "linux");
+            var runId = Uri.EscapeDataString(Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_RUN_ID") ?? DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture));
+            var apiVersion = "2023-10-01-preview";
+            var wsEndpoint = $"{serviceUrl}?os={os}&runId={runId}&api-version={apiVersion}";
             var connectOptions = new BrowserTypeConnectOptions
             {
                 Timeout = 3 * 60 * 1000,
                 ExposeNetwork = exposeNetwork,
                 Headers = new Dictionary<string, string>
                 {
-                    ["x-mpt-access-key"] = accessToken
+                    ["Authorization"] = $"Bearer {accessToken}"
                 }
             };
 

diff --git a/src/Playwright.NUnit/BrowserService.cs b/src/Playwright.NUnit/BrowserService.cs
@@ -25,7 +25,6 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Text.Json;
 using System.Threading.Tasks;
 using Microsoft.Playwright.TestAdapter;
 
@@ -56,19 +55,17 @@ private static async Task<IBrowser> CreateBrowser(IBrowserType browserType)
         }
 
         var exposeNetwork = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_EXPOSE_NETWORK") ?? "<loopback>";
-        var caps = new Dictionary<string, string>
-        {
-            ["os"] = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_OS") ?? "linux",
-            ["runId"] = Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_RUN_ID") ?? DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture),
-        };
-        var wsEndpoint = $"{serviceUrl}?cap={JsonSerializer.Serialize(caps)}";
+        var os = Uri.EscapeDataString(Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_OS") ?? "linux");
+        var runId = Uri.EscapeDataString(Environment.GetEnvironmentVariable("PLAYWRIGHT_SERVICE_RUN_ID") ?? DateTime.Now.ToUniversalTime().ToString("yyyy-MM-ddTHH:mm:ss", CultureInfo.InvariantCulture));
+        var apiVersion = "2023-10-01-preview";
+        var wsEndpoint = $"{serviceUrl}?os={os}&runId={runId}&api-version={apiVersion}";
         var connectOptions = new BrowserTypeConnectOptions
         {
             Timeout = 3 * 60 * 1000,
             ExposeNetwork = exposeNetwork,
             Headers = new Dictionary<string, string>
             {
-                ["x-mpt-access-key"] = accessToken
+                ["Authorization"] = $"Bearer {accessToken}"
             }
         };