Skip to content

Revert "[dotnet] [bidi] Make cookie expiry as TimeSpan" #16217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Revert "[dotnet] [bidi] Make cookie expiry as TimeSpan" #16217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion dotnet/src/webdriver/BiDi/Communication/Broker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ internal Broker(BiDi bidi, Uri url)
new RealmConverter(_bidi),
new RealmTypeConverter(),
new DateTimeOffsetConverter(),
new TimeSpanConverter(),
new PrintPageRangeConverter(),
new InputOriginConverter(),
new WebExtensionConverter(_bidi),
Expand Down
11 changes: 10 additions & 1 deletion dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,16 @@ internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
{
public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
{
return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());
// Workaround: it should be Int64, chrome uses double for `expiry` like "expiry":1737379944.308351

if (reader.TryGetInt64(out long unixTime) is false)
{
var doubleValue = reader.GetDouble();

unixTime = Convert.ToInt64(doubleValue);
}

return DateTimeOffset.FromUnixTimeMilliseconds(unixTime);
}

public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
Expand Down
44 changes: 0 additions & 44 deletions dotnet/src/webdriver/BiDi/Communication/Json/Converters/TimeSpanConverter.cs
View file
Open in desktop

This file was deleted.

7 changes: 6 additions & 1 deletion dotnet/src/webdriver/BiDi/Network/Cookie.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@
// </copyright>

using System;
using System.Text.Json.Serialization;

namespace OpenQA.Selenium.BiDi.Network;

public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, TimeSpan? Expiry);
public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite)
{
[JsonInclude]
public DateTimeOffset? Expiry { get; internal set; }
}

public enum SameSite
{
Expand Down
Loading