From 3df006997ceaeb68bbd54f0057745032c03e9bb1 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 4 Feb 2024 17:50:12 +0700 Subject: [PATCH] Update services apps. --- src/database/Database.h | 10 +++++----- src/firestore/Firestore.h | 16 ++++++++++++---- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/database/Database.h b/src/database/Database.h index 40cf1c63..632fe4b7 100644 --- a/src/database/Database.h +++ b/src/database/Database.h @@ -40,12 +40,12 @@ class Database public: Database(const String &url = "") { - this->dbUrl = url; + this->service_url = url; }; Database &operator=(Database &rhs) { - this->dbUrl = rhs.dbUrl; + this->service_url = rhs.service_url; return *this; } @@ -826,7 +826,7 @@ class Database */ void url(const String &url) { - this->dbUrl = url; + this->service_url = url; } /** @@ -850,7 +850,7 @@ class Database } private: - String dbUrl; + String service_url; uint32_t app_addr = 0; app_token_t *app_token = nullptr; @@ -909,7 +909,7 @@ class Database String extras = auth_param ? ".json?auth=" + String(FIREBASE_AUTH_PLACEHOLDER) : ".json"; addParams(auth_param, extras, request.method, request.options, request.file); - AsyncClient::async_data_item_t *sData = request.aClient->newSlot(firebase_client_list, dbUrl, request.path, extras, request.method, request.opt, request.uid); + AsyncClient::async_data_item_t *sData = request.aClient->newSlot(firebase_client_list, service_url, request.path, extras, request.method, request.opt, request.uid); if (!sData) return setClientError(request, FIREBASE_ERROR_OPERATION_CANCELLED); diff --git a/src/firestore/Firestore.h b/src/firestore/Firestore.h index 07ae513c..4debb9f9 100644 --- a/src/firestore/Firestore.h +++ b/src/firestore/Firestore.h @@ -40,7 +40,7 @@ class Firestore private: AsyncClient *aClient = nullptr; - String url; + String service_url; String path; String uid; uint32_t app_addr = 0; @@ -123,20 +123,28 @@ class Firestore firebase_firestore_transaction_read_write_option_t readWrite; } TransactionOptions; - ~Firestore(){}; Firestore(const String &url = "") { - this->url = url; + this->service_url = url; }; Firestore &operator=(Firestore &rhs) { - this->url = rhs.url; + this->service_url = rhs.service_url; return *this; } + /** + * Set the database URL + * @param url The Firestore URL. + */ + void url(const String &url) + { + this->service_url = url; + } + void setApp(uint32_t app_addr, app_token_t *app_token) { this->app_addr = app_addr;