Update Core.

mobizt · Jan 29, 2024 · 319a1fc · 319a1fc
1 parent 27e5e9d
commit 319a1fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 15 deletions.
diff --git a/src/core/AsyncClient/AsyncClient.h b/src/core/AsyncClient/AsyncClient.h
@@ -129,8 +129,6 @@ class AsyncClient
     network_config_data net;
     uint32_t addr = 0;
     bool inProcess = false;
-    // should be removed
-    String token;
 
     void closeFile(async_data_item_t *sData)
     {
@@ -459,6 +457,7 @@ class AsyncClient
             if (setData || error_notify_timeout)
             {
                 *sData->refResult = sData->aResult;
+
                 if (setData)
                     sData->refResult->setPayload(sData->aResult.data_payload);
             }
@@ -595,6 +594,7 @@ class AsyncClient
 
                     if (sData->response.flags.sse || !sData->response.flags.payload_remaining)
                     {
+
                         sData->aResult.setPayload(sData->response.payload);
 
                         if (sData->aResult.download_data.total > 0)
@@ -1651,12 +1651,6 @@ class AsyncClient
         return url_info.host;
     }
 
-    // should be removed
-    String getToken()
-    {
-        return token;
-    }
-
 public:
     AsyncClient(Client &client, network_config_data &net) : client(&client)
     {
@@ -1704,11 +1698,6 @@ class AsyncClient
             client->stop();
     }
 
-    void setAuth(const String &auth)
-    {
-        this->token = auth;
-    }
-
     FirebaseError lastError() { return lastErr; }
 };
 

diff --git a/src/core/AsyncClient/ResponseHandler.h b/src/core/AsyncClient/ResponseHandler.h
@@ -27,7 +27,7 @@
 #include <Arduino.h>
 #include <Client.h>
 
-#define FIREBASE_TCP_READ_TIMEOUT 60 * 1000;
+#define FIREBASE_TCP_READ_TIMEOUT 30 * 1000
 
 struct async_response_handler_t
 {

diff --git a/src/core/AuthRequest.h b/src/core/AuthRequest.h
@@ -33,11 +33,14 @@ class AuthRequest
 {
 private:
     AsyncClient::async_data_item_t *sData = nullptr;
+
 
 public:
     AuthRequest(){};
     ~AuthRequest(){};
 
+    unsigned long request_sent_ms = 0;
+
     void asyncRequest(AsyncClient *aClient, const String &subdomain, const String &extras, const String &payload, AsyncResult &aResult)
     {
         String host;
@@ -49,6 +52,7 @@ class AuthRequest
         aClient->setContentLength(sData, sData->request.payload.length());
         sData->refResult = &aResult;
         sData->ref_result_addr = aResult.addr;
+        request_sent_ms = millis();
         aClient->process(sData->async);
         aClient->handleRemove();
     }

diff --git a/src/core/FirebaseApp.h b/src/core/FirebaseApp.h
@@ -432,7 +432,8 @@ namespace firebase
 
             if (auth_data.user_auth.status._event == auth_event_auth_request_sent)
             {
-                if (aResult.error().code() > 0)
+
+                if (aResult.error().code() > 0 || millis() - authReq.request_sent_ms > FIREBASE_TCP_READ_TIMEOUT)
                 {
                     setEvent(auth_event_error);
                     return false;