login and register

xxanxnie · Nov 17, 2024 · 2763968 · 2763968
1 parent 19173dd
commit 2763968
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 28 deletions.
diff --git a/include/Auth.h b/include/Auth.h
@@ -27,19 +27,16 @@ class UserAlreadyExistsException : public AuthException {
 // User model
 struct User {
     std::string id;
-    std::string username;
     std::string email;
     std::string passwordHash;
     std::string role;
     std::string createdAt;
 
-    // Constructor for creating a new user
-    User(const std::string& username, 
-         const std::string& email, 
+    // Updated constructor
+    User(const std::string& email, 
          const std::string& passwordHash,
          const std::string& role = "user")
-        : username(username)
-        , email(email)
+        : email(email)
         , passwordHash(passwordHash)
         , role(role) {}
 
@@ -75,9 +72,8 @@ class AuthService {
     ~AuthService() = default;
 
     // User registration and login
-    std::string registerUser(const std::string& username, 
-                            const std::string& email, 
-                            const std::string& password);
+    std::string registerUser(const std::string& email, 
+                           const std::string& password);
 
     std::string loginUser(const std::string& email, 
                          const std::string& password);
@@ -97,7 +93,7 @@ class AuthService {
 
 private:
     DatabaseManager& dbManager;
-    const std::string collection_name = "users";
+    const std::string collection_name = "Users";
     const int JWT_EXPIRATION_HOURS = 24;
     const std::string JWT_SECRET = "your-secret-key";  // In production, load from env variables
 
@@ -112,11 +108,9 @@ class AuthService {
     // User validation
     bool isValidEmail(const std::string& email);
     bool isValidPassword(const std::string& password);
-    bool isValidUsername(const std::string& username);
 
     // Database operations
     std::vector<std::pair<std::string, std::string>> createUserDocument(
-        const std::string& username,
         const std::string& email,
         const std::string& passwordHash,
         const std::string& role = "user"

diff --git a/include/RouteController.h b/include/RouteController.h
@@ -16,6 +16,7 @@
 #include "Healthcare.h"
 #include "Outreach.h"
 #include "Shelter.h"
+#include "Auth.h"
 
 class RouteController {
  private:
@@ -68,6 +69,9 @@ class RouteController {
   void getAllHealthcareServices(const crow::request& req, crow::response& res);
   void updateHealthcareService(const crow::request& req, crow::response& res);
   void deleteHealthcareService(const crow::request& req, crow::response& res);
+
+  void registerUser(const crow::request& req, crow::response& res);
+  void loginUser(const crow::request& req, crow::response& res);
 };
 
 #endif
diff --git a/src/Auth.cpp b/src/Auth.cpp
@@ -12,8 +12,7 @@ AuthService::AuthService(DatabaseManager& dbManager) : dbManager(dbManager) {}
 AuthService::AuthService() : dbManager(DatabaseManager::getInstance()) {}
 
 // Registration
-std::string AuthService::registerUser(const std::string& username, 
-                                    const std::string& email, 
+std::string AuthService::registerUser(const std::string& email, 
                                     const std::string& password) {
     // Validate input
     if (!isValidEmail(email)) {
@@ -22,9 +21,6 @@ std::string AuthService::registerUser(const std::string& username,
     if (!isValidPassword(password)) {
         throw AuthException("Password does not meet requirements");
     }
-    if (!isValidUsername(username)) {
-        throw AuthException("Invalid username format");
-    }
 
     // Check if user already exists
     if (findUserByEmail(email)) {
@@ -33,7 +29,7 @@ std::string AuthService::registerUser(const std::string& username,
 
     // Hash password and create user
     std::string hashedPassword = hashPassword(password);
-    auto userDoc = createUserDocument(username, email, hashedPassword);
+    auto userDoc = createUserDocument(email, hashedPassword);
 
     try {
         dbManager.insertResource(collection_name, userDoc);
@@ -48,7 +44,7 @@ std::string AuthService::registerUser(const std::string& username,
         }
 
         auto userView = result[0].view();
-        User newUser(username, email, hashedPassword);
+        User newUser(email, hashedPassword);
         newUser.id = userView["_id"].get_oid().value.to_string();
         return generateJWT(newUser);
     } catch (const std::exception& e) {
@@ -141,7 +137,6 @@ std::optional<User> AuthService::findUserByEmail(const std::string& email) {
     User user;
     user.id = userDoc["_id"].get_oid().value.to_string();
     user.email = userDoc["email"].get_utf8().value.to_string();
-    user.username = userDoc["username"].get_utf8().value.to_string();
     user.passwordHash = userDoc["passwordHash"].get_utf8().value.to_string();
     user.role = userDoc["role"].get_utf8().value.to_string();
     user.createdAt = userDoc["createdAt"].get_utf8().value.to_string();
@@ -161,12 +156,6 @@ bool AuthService::isValidPassword(const std::string& password) {
     return std::regex_match(password, pattern);
 }
 
-bool AuthService::isValidUsername(const std::string& username) {
-    // 3-20 characters, alphanumeric and underscore
-    const std::regex pattern(R"(^[a-zA-Z0-9_]{3,20}$)");
-    return std::regex_match(username, pattern);
-}
-
 // Utility Methods
 int64_t AuthService::getCurrentTimestamp() {
     return std::chrono::duration_cast<std::chrono::seconds>(
@@ -179,13 +168,11 @@ int64_t AuthService::getExpirationTimestamp() {
 }
 
 std::vector<std::pair<std::string, std::string>> AuthService::createUserDocument(
-    const std::string& username,
     const std::string& email,
     const std::string& passwordHash,
     const std::string& role
 ) {
     std::vector<std::pair<std::string, std::string>> content;
-    content.push_back({"username", username});
     content.push_back({"email", email});
     content.push_back({"passwordHash", passwordHash});
     content.push_back({"role", role});

diff --git a/src/RouteController.cpp b/src/RouteController.cpp
@@ -868,6 +868,74 @@ void RouteController::deleteHealthcareService(const crow::request& req,
   }
 }
 
+void RouteController::registerUser(const crow::request& req, crow::response& res) {
+    try {
+        auto resource = bsoncxx::from_json(req.body);
+
+        // Validate required fields
+        if (!resource["email"] || !resource["password"]) {
+            res.code = 400;
+            res.write("Missing required fields: email and password");
+            res.end();
+            return;
+        }
+
+        std::string email = resource["email"].get_utf8().value.to_string();
+        std::string password = resource["password"].get_utf8().value.to_string();
+
+        AuthService& authService = AuthService::getInstance();
+        std::string token = authService.registerUser(email, password);
+
+        res.code = 201;
+        res.write(token);
+        res.end();
+    } catch (const UserAlreadyExistsException& e) {
+        res.code = 409;
+        res.write(e.what());
+        res.end();
+    } catch (const AuthException& e) {
+        res.code = 400;
+        res.write(e.what());
+        res.end();
+    } catch (const std::exception& e) {
+        res = handleException(e);
+    }
+}
+
+void RouteController::loginUser(const crow::request& req, crow::response& res) {
+    try {
+        auto resource = bsoncxx::from_json(req.body);
+
+        // Validate required fields
+        if (!resource["email"] || !resource["password"]) {
+            res.code = 400;
+            res.write("Missing required fields: email and password");
+            res.end();
+            return;
+        }
+
+        std::string email = resource["email"].get_utf8().value.to_string();
+        std::string password = resource["password"].get_utf8().value.to_string();
+
+        AuthService& authService = AuthService::getInstance();
+        std::string token = authService.loginUser(email, password);
+
+        res.code = 200;
+        res.write(token);
+        res.end();
+    } catch (const InvalidCredentialsException& e) {
+        res.code = 401;
+        res.write(e.what());
+        res.end();
+    } catch (const AuthException& e) {
+        res.code = 400;
+        res.write(e.what());
+        res.end();
+    } catch (const std::exception& e) {
+        res = handleException(e);
+    }
+}
+
 void RouteController::initRoutes(crow::SimpleApp& app) {
   CROW_ROUTE(app, "/").methods(crow::HTTPMethod::GET)(
       [this](const crow::request& req, crow::response& res) { index(res); });
@@ -976,4 +1044,16 @@ void RouteController::initRoutes(crow::SimpleApp& app) {
           [this](const crow::request& req, crow::response& res) {
             deleteHealthcareService(req, res);
           });
+
+  CROW_ROUTE(app, "/auth/register")
+      .methods(crow::HTTPMethod::POST)
+      ([this](const crow::request& req, crow::response& res) {
+          registerUser(req, res);
+      });
+
+  CROW_ROUTE(app, "/auth/login")
+      .methods(crow::HTTPMethod::POST)
+      ([this](const crow::request& req, crow::response& res) {
+          loginUser(req, res);
+      });
 }
diff --git a/src/main.cpp b/src/main.cpp
@@ -44,6 +44,7 @@ int main(int argc, char* argv[]) {
   dbManager.createCollection("Outreach");
   dbManager.createCollection("Shelter");
   dbManager.createCollection("Counseling");
+  dbManager.createCollection("Users");
 
   crow::SimpleApp app;