Skip to content

Allow ignoring cookie exception #2297

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

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Allow ignoring cookie exception #2297

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
5 changes: 5 additions & 0 deletions src/RestSharp/Options/RestClientOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,4 +223,9 @@ public RestClientOptions(string baseUrl) : this(new Uri(Ensure.NotEmptyString(ba
/// Custom function to encode a string for use in a URL query.
/// </summary>
public Func<string, Encoding, string> EncodeQuery { get; set; } = (s, encoding) => s.UrlEncode(encoding)!;

/// <summary>
/// Set to <code>true</code> to ignore invalid cookies returned by the remote server. Default is <code>false</code>.
/// </summary>
public bool IgnoreInvalidCookies { get; set; }
}
19 changes: 13 additions & 6 deletions src/RestSharp/RestClient.Async.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

using RestSharp.Extensions;

// ReSharper disable PossiblyMistakenUseOfCancellationToken

namespace RestSharp;

public partial class RestClient {
Expand Down Expand Up @@ -145,21 +147,26 @@ async Task<HttpResponse> ExecuteRequestAsync(RestRequest request, CancellationTo

// Parse all the cookies from the response and update the cookie jar with cookies
if (responseMessage.Headers.TryGetValues(KnownHeaders.SetCookie, out var cookiesHeader)) {
// ReSharper disable once PossibleMultipleEnumeration
cookieContainer.AddCookies(url, cookiesHeader);
// ReSharper disable once PossibleMultipleEnumeration
Options.CookieContainer?.AddCookies(url, cookiesHeader);
try {
// ReSharper disable once PossibleMultipleEnumeration
cookieContainer.AddCookies(url, cookiesHeader);
// ReSharper disable once PossibleMultipleEnumeration
Options.CookieContainer?.AddCookies(url, cookiesHeader);
}
catch (CookieException) when (!Options.IgnoreInvalidCookies) {
throw;
}
}
}
catch (Exception ex) {
return new HttpResponse(null, url, null, ex, timeoutCts.Token);
return new(null, url, null, ex, timeoutCts.Token);
}

#pragma warning disable CS0618 // Type or member is obsolete
if (request.OnAfterRequest != null) await request.OnAfterRequest(responseMessage).ConfigureAwait(false);
#pragma warning restore CS0618 // Type or member is obsolete
await OnAfterHttpRequest(request, responseMessage, cancellationToken).ConfigureAwait(false);
return new HttpResponse(responseMessage, url, cookieContainer, null, timeoutCts.Token);
return new(responseMessage, url, cookieContainer, null, timeoutCts.Token);
}

static async ValueTask OnBeforeRequest(RestRequest request, CancellationToken cancellationToken) {
Expand Down
Loading