correction cookiejar conflict

Author: playmiel

src/AsyncHttpClient.cpp

@@ -10,7 +10,7 @@
 #include <memory>
 #include <utility>
 #include "ConnectionPool.h"
-#include "CookieJar.h"
+#include "AsyncCookieJar.h"
 #include "HttpHelpers.h"
 #include "RedirectHandler.h"
 
@@ -24,7 +24,7 @@ AsyncHttpClient::AsyncHttpClient()
     : _defaultTimeout(10000), _defaultUserAgent(String("ESPAsyncWebClient/") + ESP_ASYNC_WEB_CLIENT_VERSION),
       _bodyChunkCallback(nullptr), _maxBodySize(kDefaultMaxBodyBytes), _followRedirects(false), _maxRedirectHops(3),
       _maxHeaderBytes(kDefaultMaxHeaderBytes) {
-    _cookieJar.reset(new CookieJar(this));
+    _cookieJar.reset(new AsyncCookieJar(this));
     _connectionPool.reset(new ConnectionPool(this));
     _redirectHandler.reset(new RedirectHandler(this));
 #if defined(ARDUINO_ARCH_ESP32) && defined(ASYNC_HTTP_ENABLE_AUTOLOOP)

src/AsyncHttpClient.h

@@ -25,7 +25,7 @@
 #include <freertos/semphr.h>
 #endif
 
-class CookieJar;
+class AsyncCookieJar;
 class ConnectionPool;
 class RedirectHandler;
 
@@ -111,7 +111,7 @@ class AsyncHttpClient {
     void loop(); // manual timeout / queue progression
 
   private:
-    friend class CookieJar;
+    friend class AsyncCookieJar;
     friend class ConnectionPool;
     friend class RedirectHandler;
 
@@ -200,7 +200,7 @@ class AsyncHttpClient {
     AsyncHttpTLSConfig _defaultTlsConfig;
     bool _keepAliveEnabled = false;
     uint32_t _keepAliveIdleMs = 5000;
-    std::unique_ptr<CookieJar> _cookieJar;
+    std::unique_ptr<AsyncCookieJar> _cookieJar;
     std::unique_ptr<ConnectionPool> _connectionPool;
     std::unique_ptr<RedirectHandler> _redirectHandler;
 

src/CookieJar.cpp

@@ -1,4 +1,4 @@
-#include "CookieJar.h"
+#include "AsyncCookieJar.h"
 #include <cctype>
 #include <cstring>
 #include "AsyncHttpClient.h"
@@ -17,31 +17,31 @@ static uint8_t countDomainDots(const String& domain) {
     return dots;
 }
 
-CookieJar::CookieJar(AsyncHttpClient* client) : _client(client) {}
+AsyncCookieJar::AsyncCookieJar(AsyncHttpClient* client) : _client(client) {}
 
-void CookieJar::lock() const {
+void AsyncCookieJar::lock() const {
     if (_client)
         _client->lock();
 }
 
-void CookieJar::unlock() const {
+void AsyncCookieJar::unlock() const {
     if (_client)
         _client->unlock();
 }
 
-void CookieJar::clearCookies() {
+void AsyncCookieJar::clearCookies() {
     lock();
     _cookies.clear();
     unlock();
 }
 
-void CookieJar::setAllowCookieDomainAttribute(bool enable) {
+void AsyncCookieJar::setAllowCookieDomainAttribute(bool enable) {
     lock();
     _allowCookieDomainAttribute = enable;
     unlock();
 }
 
-void CookieJar::addAllowedCookieDomain(const char* domain) {
+void AsyncCookieJar::addAllowedCookieDomain(const char* domain) {
     if (!domain || strlen(domain) == 0)
         return;
     String normalized = normalizeDomainForStorage(String(domain));
@@ -60,13 +60,13 @@ void CookieJar::addAllowedCookieDomain(const char* domain) {
     unlock();
 }
 
-void CookieJar::clearAllowedCookieDomains() {
+void AsyncCookieJar::clearAllowedCookieDomains() {
     lock();
     _allowedCookieDomains.clear();
     unlock();
 }
 
-void CookieJar::setCookie(const char* name, const char* value, const char* path, const char* domain, bool secure) {
+void AsyncCookieJar::setCookie(const char* name, const char* value, const char* path, const char* domain, bool secure) {
     if (!name || strlen(name) == 0)
         return;
     if (!isValidHttpHeaderValue(String(name)))
@@ -108,7 +108,7 @@ void CookieJar::setCookie(const char* name, const char* value, const char* path,
     unlock();
 }
 
-bool CookieJar::isIpLiteral(const String& host) const {
+bool AsyncCookieJar::isIpLiteral(const String& host) const {
     if (host.length() == 0)
         return false;
     bool hasColon = false;
@@ -131,7 +131,7 @@ bool CookieJar::isIpLiteral(const String& host) const {
     return hasColon || hasDot;
 }
 
-bool CookieJar::normalizeCookieDomain(String& domain, const String& host, bool domainAttributeProvided,
+bool AsyncCookieJar::normalizeCookieDomain(String& domain, const String& host, bool domainAttributeProvided,
                                       bool* outHostOnly) const {
     if (outHostOnly)
         *outHostOnly = true;
@@ -186,7 +186,7 @@ bool CookieJar::normalizeCookieDomain(String& domain, const String& host, bool d
     return true;
 }
 
-bool CookieJar::domainMatches(const String& cookieDomain, const String& host) const {
+bool AsyncCookieJar::domainMatches(const String& cookieDomain, const String& host) const {
     if (cookieDomain.length() == 0)
         return true;
     if (host.equalsIgnoreCase(cookieDomain))
@@ -199,7 +199,7 @@ bool CookieJar::domainMatches(const String& cookieDomain, const String& host) co
     return host.substring(offset).equalsIgnoreCase(cookieDomain);
 }
 
-bool CookieJar::pathMatches(const String& cookiePath, const String& requestPath) const {
+bool AsyncCookieJar::pathMatches(const String& cookiePath, const String& requestPath) const {
     String req = requestPath;
     int q = req.indexOf('?');
     if (q != -1)
@@ -218,7 +218,7 @@ bool CookieJar::pathMatches(const String& cookiePath, const String& requestPath)
     return req.length() > cpath.length() && req.charAt(cpath.length()) == '/';
 }
 
-bool CookieJar::cookieMatchesRequest(const StoredCookie& cookie, const AsyncHttpRequest* request,
+bool AsyncCookieJar::cookieMatchesRequest(const StoredCookie& cookie, const AsyncHttpRequest* request,
                                      int64_t nowSeconds) const {
     if (!request)
         return false;
@@ -238,11 +238,11 @@ bool CookieJar::cookieMatchesRequest(const StoredCookie& cookie, const AsyncHttp
     return !cookie.value.isEmpty();
 }
 
-bool CookieJar::isCookieExpired(const StoredCookie& cookie, int64_t nowSeconds) const {
+bool AsyncCookieJar::isCookieExpired(const StoredCookie& cookie, int64_t nowSeconds) const {
     return cookie.expiresAt != -1 && nowSeconds >= cookie.expiresAt;
 }
 
-void CookieJar::purgeExpiredCookies(int64_t nowSeconds) {
+void AsyncCookieJar::purgeExpiredCookies(int64_t nowSeconds) {
     for (auto it = _cookies.begin(); it != _cookies.end();) {
         if (isCookieExpired(*it, nowSeconds)) {
             it = _cookies.erase(it);
@@ -252,7 +252,7 @@ void CookieJar::purgeExpiredCookies(int64_t nowSeconds) {
     }
 }
 
-void CookieJar::evictOneCookieLocked() {
+void AsyncCookieJar::evictOneCookieLocked() {
     if (_cookies.empty())
         return;
     size_t bestIndex = 0;
@@ -303,7 +303,7 @@ void CookieJar::evictOneCookieLocked() {
     _cookies.erase(_cookies.begin() + static_cast<std::vector<StoredCookie>::difference_type>(bestIndex));
 }
 
-void CookieJar::applyCookies(AsyncHttpRequest* request) {
+void AsyncCookieJar::applyCookies(AsyncHttpRequest* request) {
     if (!request)
         return;
     int64_t now = currentTimeSeconds();
@@ -343,7 +343,7 @@ void CookieJar::applyCookies(AsyncHttpRequest* request) {
     }
 }
 
-void CookieJar::storeResponseCookie(const AsyncHttpRequest* request, const String& setCookieValue) {
+void AsyncCookieJar::storeResponseCookie(const AsyncHttpRequest* request, const String& setCookieValue) {
     if (!request)
         return;
     String raw = setCookieValue;

src/CookieJar.h

@@ -7,9 +7,9 @@
 
 class AsyncHttpClient;
 
-class CookieJar {
+class AsyncCookieJar {
   public:
-    explicit CookieJar(AsyncHttpClient* client);
+    explicit AsyncCookieJar(AsyncHttpClient* client);
 
     void clearCookies();
     void setAllowCookieDomainAttribute(bool enable);

test/test_cookies/test_main.cpp

@@ -3,7 +3,7 @@
 
 #define private public
 #include "AsyncHttpClient.h"
-#include "CookieJar.h"
+#include "AsyncCookieJar.h"
 #undef private
 
 static void test_domain_matching_subdomains() {

test/test_redirects/test_main.cpp

@@ -4,7 +4,7 @@
 
 #define private public
 #include "AsyncHttpClient.h"
-#include "CookieJar.h"
+#include "AsyncCookieJar.h"
 #include "RedirectHandler.h"
 #undef private