Fix compilation errors in FCM, Firestore etc.

Author: mobizt

library.json

@@ -1,6 +1,6 @@
 {
   "name": "FirebaseClient",
-  "version": "2.1.3",
+  "version": "2.1.4",
   "keywords": "communication, REST, esp32, esp8266, arduino",
   "description": "Async Firebase Client library for Arduino.",
   "repository": {

library.properties

@@ -1,6 +1,6 @@
 name=FirebaseClient
 
-version=2.1.3
+version=2.1.4
 
 author=Mobizt
 

src/cloud_storage/CloudStorage.h

@@ -464,7 +464,11 @@ class CloudStorage : public AppBase
 
     void setFileStatus(async_data *sData, const GoogleCloudStorage::req_data &request)
     {
-        if ((request.file && (request.file->filename.length() || request.file->data_size)) || request.opt.ota)
+        bool isFile = request.file && request.file->data && request.file->data_size > 0;
+#if defined(ENABLE_FS)
+        isFile |= request.file && request.file->filename.length() > 0;
+#endif
+        if (isFile || request.opt.ota)
         {
             sData->download = request.method == reqns::http_get;
             sData->upload = request.method == reqns::http_post || request.method == reqns::http_put || request.method == reqns::http_patch;

src/core/Core.h

@@ -7,7 +7,7 @@
 #undef FIREBASE_CLIENT_VERSION
 #endif
 
-#define FIREBASE_CLIENT_VERSION "2.1.3"
+#define FIREBASE_CLIENT_VERSION "2.1.4"
 
 static void sys_idle()
 {

src/database/RealtimeDatabase.h

@@ -1108,11 +1108,11 @@ class RealtimeDatabase : public RTDBResultImpl, AppBase
     void setFileStatus(async_data *sData, const req_data &request)
     {
         using namespace reqns;
-        bool isFile = false;
+        bool isFile = request.file && request.file->data && request.file->data_size > 0;
 #if defined(ENABLE_FS)
-        isFile = request.file->filename.length() > 0;
+        isFile |= request.file && request.file->filename.length() > 0;
 #endif
-        if ((request.file && (isFile || (request.file->data && request.file->data_size))) || request.opt.ota)
+        if (isFile || request.opt.ota)
         {
             sData->download = request.method == http_get;
             sData->upload = request.method == http_post || request.method == http_put || request.method == http_patch;

src/firestore/FirestoreBase.h

@@ -111,8 +111,6 @@ class FirestoreBase : public AppBase
         if (request.aResult)
             sData->setRefResult(request.aResult, reinterpret_cast<uint32_t>(&(getRVec(request.aClient))));
 
-        sData->download = request.method == reqns::http_get && sData->request.file_data.filename.length();
-
         processBase(request.aClient, sData->async);
         handleRemoveBase(request.aClient);
     }

src/functions/Functions.h

@@ -735,25 +735,8 @@ class CloudFunctions : public AppBase
             return request.aClient->setClientError(request, FIREBASE_ERROR_OPERATION_CANCELLED);
 
         request.aClient->newRequest(sData, service_url, request.path, extras, request.method, request.opt, request.uid, "");
-
-        if (request.file)
-            sData->request.file_data.copy(*request.file);
-
-        setFileStatus(sData, request);
-
-        if (request.file && sData->upload)
-        {
-            sData->request.base64 = false;
-
-            if (request.mime.length())
-                sData->request.addContentType(request.mime);
-
-            sData->request.setFileContentLength(0);
-
-            if (sData->request.file_data.file_size == 0)
-                return request.aClient->setClientError(request, FIREBASE_ERROR_FILE_READ);
-        }
-        else if (request.options->payload.length())
+        
+        if (request.options->payload.length())
         {
             sData->request.val[reqns::payload] = request.options->payload;
             sData->request.setContentLengthFinal(request.options->payload.length());
@@ -773,16 +756,6 @@ class CloudFunctions : public AppBase
         request.aClient->process(sData->async);
         request.aClient->handleRemove();
     }
-
-    void setFileStatus(async_data *sData, const GoogleCloudFunctions::req_data &request)
-    {
-        using namespace reqns;
-        if ((request.file && request.file->filename.length()) || request.opt.ota)
-        {
-            sData->download = request.method == http_get;
-            sData->upload = request.method == http_post || request.method == http_put || request.method == http_patch;
-        }
-    }
 };
 #endif
 #endif

src/messaging/Messaging.h

@@ -145,7 +145,6 @@ class Messaging : public AppBase
         if (request.aResult)
             sData->setRefResult(request.aResult, reinterpret_cast<uint32_t>(&(request.aClient->getResultList())));
 
-        sData->download = request.method == reqns::http_get && sData->request.file_data.filename.length();
         request.aClient->process(sData->async);
         request.aClient->handleRemove();
     }

src/rules/Releases.h

@@ -128,8 +128,6 @@ class Releases : public AppBase
         if (request.aResult)
             sData->setRefResult(request.aResult, reinterpret_cast<uint32_t>(&(getRVec(request.aClient))));
 
-        sData->download = request.method == reqns::http_get && sData->request.file_data.filename.length();
-
         processBase(request.aClient, sData->async);
         handleRemoveBase(request.aClient);
     }

src/rules/RuleSets.h

@@ -107,8 +107,6 @@ class RuleSets : public AppBase
         if (request.aResult)
             sData->setRefResult(request.aResult, reinterpret_cast<uint32_t>(&(getRVec(request.aClient))));
 
-        sData->download = request.method == reqns::http_get && sData->request.file_data.filename.length();
-
         processBase(request.aClient, sData->async);
         handleRemoveBase(request.aClient);
     }