diff --git a/src/Playwright/Core/APIRequest.cs b/src/Playwright/Core/APIRequest.cs index a52c4db15..25164ef45 100644 --- a/src/Playwright/Core/APIRequest.cs +++ b/src/Playwright/Core/APIRequest.cs @@ -64,7 +64,7 @@ async Task IAPIRequest.NewContextAsync(APIRequestNewContextO } if (!string.IsNullOrEmpty(storageState)) { - args.Add("storageState", JsonSerializer.Deserialize(storageState, Helpers.JsonExtensions.DefaultJsonSerializerOptions)); + args.Add("storageState", JsonSerializer.Deserialize(storageState, Helpers.JsonExtensions.DefaultJsonSerializerOptions)); } var context = await _playwright.SendMessageToServerAsync( diff --git a/src/Playwright/Core/APIRequestContext.cs b/src/Playwright/Core/APIRequestContext.cs index 91737ede1..ca4d51b95 100644 --- a/src/Playwright/Core/APIRequestContext.cs +++ b/src/Playwright/Core/APIRequestContext.cs @@ -215,7 +215,7 @@ private APIRequestContextOptions WithMethod(APIRequestContextOptions options, st public async Task StorageStateAsync(APIRequestContextStorageStateOptions options = null) { string state = JsonSerializer.Serialize( - await SendMessageToServerAsync("storageState").ConfigureAwait(false), + await SendMessageToServerAsync("storageState").ConfigureAwait(false), JsonExtensions.DefaultJsonSerializerOptions); if (!string.IsNullOrEmpty(options?.Path)) diff --git a/src/Playwright/Core/Browser.cs b/src/Playwright/Core/Browser.cs index 783162a11..e185e5aa6 100644 --- a/src/Playwright/Core/Browser.cs +++ b/src/Playwright/Core/Browser.cs @@ -155,7 +155,7 @@ public async Task NewContextAsync(BrowserNewContextOptions opti if (!string.IsNullOrEmpty(storageState)) { - args.Add("storageState", JsonSerializer.Deserialize(storageState, Helpers.JsonExtensions.DefaultJsonSerializerOptions)); + args.Add("storageState", JsonSerializer.Deserialize(storageState, Helpers.JsonExtensions.DefaultJsonSerializerOptions)); } if (options.ViewportSize?.Width == -1) diff --git a/src/Playwright/Core/BrowserContext.cs b/src/Playwright/Core/BrowserContext.cs index 4af6c800a..a8ca3c80d 100644 --- a/src/Playwright/Core/BrowserContext.cs +++ b/src/Playwright/Core/BrowserContext.cs @@ -539,7 +539,7 @@ public Task SetOfflineAsync(bool offline) => SendMessageToServerAsync( public async Task StorageStateAsync(BrowserContextStorageStateOptions options = default) { string state = JsonSerializer.Serialize( - await SendMessageToServerAsync("storageState").ConfigureAwait(false), + await SendMessageToServerAsync("storageState").ConfigureAwait(false), JsonExtensions.DefaultJsonSerializerOptions); if (!string.IsNullOrEmpty(options?.Path)) diff --git a/src/Playwright/Core/StorageState.cs b/src/Playwright/Core/StorageState.cs deleted file mode 100644 index 232f560ca..000000000 --- a/src/Playwright/Core/StorageState.cs +++ /dev/null @@ -1,55 +0,0 @@ -/* - * MIT License - * - * Copyright (c) Microsoft Corporation. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and / or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -using System; -using System.Collections.Generic; -using System.Linq; -using Microsoft.Playwright.Transport.Protocol; - -namespace Microsoft.Playwright.Core; - -internal class StorageState : IEquatable -{ - /// - /// Cookie list. - /// - public ICollection Cookies { get; set; } = new List(); - - /// - /// List of local storage per origin. - /// - public ICollection Origins { get; set; } = new List(); - - public bool Equals(StorageState other) - => other != null && - Cookies.SequenceEqual(other.Cookies) && - Origins.SequenceEqual(other.Origins); - - public override int GetHashCode() - => 412870874 + - EqualityComparer>.Default.GetHashCode(Cookies) + - EqualityComparer>.Default.GetHashCode(Origins); - - public override bool Equals(object obj) => Equals(obj as StorageState); -}