Merge pull request #27 from pooranjoyb/refactor-account

feat: refactored account class

Author: pooranjoyb

Makefile

@@ -86,9 +86,9 @@ all: $(BINS)
 
 # Account 
 createAccount: $(SRCS) $(EXAMPLES_DIR)/account/createAccount.cpp
-	$(CXX) $(CXXFLAGS) -o ./tests/createAccount $(SRCS) $(EXAMPLES_DIR)/account/createAccount.cpp $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) -o ./tests/account/createAccount $(SRCS) $(EXAMPLES_DIR)/account/createAccount.cpp $(LDFLAGS)
 createSession: $(SRCS) $(EXAMPLES_DIR)/account/createSession.cpp
-	$(CXX) $(CXXFLAGS) -o ./tests/createSession $(SRCS) $(EXAMPLES_DIR)/account/createSession.cpp $(LDFLAGS)
+	$(CXX) $(CXXFLAGS) -o ./tests/account/createSession $(SRCS) $(EXAMPLES_DIR)/account/createSession.cpp $(LDFLAGS)
 
 # Database
 createDatabase: $(SRCS) $(EXAMPLES_DIR)/database/createDatabase.cpp

examples/account/createAccount.cpp

@@ -3,16 +3,15 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string email = "cbeow@main.com";
+    std::string email = "cbeocscw@main.com";
     std::string password = "pasvsdvsefefword";
-    std::string userId = "13ferf2421wefew52";
-    std::string name = "pooranjoy bhattacharya";
+    std::string userId = "13ferf2csc421wefew52";
+    std::string name = "pooranjoy cdcdscd";
 
     Appwrite appwrite(projectId);
-    Account& auth = appwrite.getAccount();
 
     try {
-        if (auth.createAccount(email, password, userId, name)) {
+        if (appwrite.getAccount().createAccount(email, password, userId, name)) {
             std::cout << "\nAccount created successfully!" << std::endl;
 
 

examples/account/createSession.cpp

@@ -7,12 +7,11 @@ int main() {
     std::string password = "pasvsdvsefefword";
 
     Appwrite appwrite(projectId);
-    Account& auth = appwrite.getAccount();
 
     try {
-        std::string response = auth.createSession(email, password);
+        std::string response = appwrite.getAccount().createSession(email, password);
         std::cout << "\nSession created." << std::endl;
-        std::cout<< "\n\nResponse  : " << response;
+        std::cout<< "\nResponse  : " << response;
 
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;

include/Appwrite.hpp

@@ -8,7 +8,7 @@
 
 class Appwrite {
 public:
-    Appwrite(const std::string& projectId, const std::string& apiKey);
+    Appwrite(const std::string& projectId, const std::string& apiKey = "");
     Account& getAccount();
     Databases& getDatabases();
     Storage& getStorage();

include/classes/Account.hpp

@@ -8,13 +8,12 @@
 
 class Account {
 public:
-    Account(const std::string& projectId, const std::string& apiKey);
+    explicit Account(const std::string& projectId);
 
     bool createAccount(const std::string& email, const std::string& password, const std::string& userId, const std::string& name);
     std::string createSession(const std::string& email, const std::string& password);
 
 private:
-    std::string apiKey;
     std::string projectId;
 };
 

src/Appwrite.cpp

@@ -1,7 +1,7 @@
 #include "Appwrite.hpp"
 
 Appwrite::Appwrite(const std::string& projectId, const std::string& apiKey)
-    : projectId(projectId), apiKey(apiKey), account(projectId, apiKey),
+    : projectId(projectId), apiKey(apiKey), account(projectId),
       databases(projectId, apiKey), storage(projectId, apiKey), health(projectId, apiKey) {}
 
 

src/services/Account.cpp

@@ -6,8 +6,7 @@
 #include "enums/HttpStatus.hpp"
 #include "exceptions/AppwriteException.hpp"
 
-Account::Account(const std::string& projectId, const std::string& apiKey)
-    : projectId(projectId), apiKey(apiKey) {}
+Account::Account(const std::string& projectId) : projectId(projectId) {}
 
 bool Account::createAccount(const std::string& email, const std::string& password, const std::string& userId, const std::string& name = "") {