SIKKA-5847[COMPLETED]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hajar",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "description": "Toolkit to create SaaS applications",
   "author": "Sikka Software <contact@sikka.io> (http://sikka.io)",
   "license": "MIT",

src/core/authentication/index.js

@@ -121,16 +121,17 @@ class HajarAuth {
 
     return newRole;
   }
-  async login(email, password, isGoogle = false) {
+  async loginAdmin(email, password, isGoogle = false) {
     try {
-      const user = await this.User.findOne({ email: email });
+      const user = await this.User.findOne({ email: email, ref: "admins" });
 
       if (!user) {
         throw new HajarError(
           "Invalid email or password",
           "invalid-email-password"
         );
       }
+
       if (!isGoogle) {
         const isPasswordCorrect = await this.bcrypt.compare(
           password,
@@ -145,24 +146,51 @@ class HajarAuth {
         }
       }
 
-      if (user.ref === "admins") {
-        // Password is correct, sign a token for the admin user
-        const token = this.jwt.sign({ userId: user._id }, this.secret);
+      // Password is correct, sign a token for the admin user
+      const token = this.jwt.sign({ userId: user._id }, this.secret);
+
+      return { user, token, role: "admin" };
+    } catch (error) {
+      console.error(error);
+      return new HajarError(error.message, "admin-login-error");
+    }
+  }
+
+  async loginCustomer(email, password, isGoogle = false) {
+    try {
+      const user = await this.User.findOne({ email: email, ref: "customers" });
 
-        return { user, token, role: "admin" };
-      } else {
-        // If the user's "ref" field is not equal to "admins", return an error
+      if (!user) {
         throw new HajarError(
-          "Access denied. Only admins can log in.",
-          "access-denied-only-admins-can-log-in"
+          "Invalid email or password",
+          "invalid-email-password"
+        );
+      }
+
+      if (!isGoogle) {
+        const isPasswordCorrect = await this.bcrypt.compare(
+          password,
+          user.password
         );
+
+        if (!isPasswordCorrect) {
+          throw new HajarError(
+            "Invalid email or password",
+            "invalid-email-password"
+          );
+        }
       }
+
+      // Password is correct, sign a token for the customer user
+      const token = this.jwt.sign({ userId: user._id }, this.secret);
+
+      return { user, token, role: "customer" };
     } catch (error) {
-      // Handle errors and return appropriate responses
       console.error(error);
-      return new HajarError(error.message, "login-error");
+      return new HajarError(error.message, "customer-login-error");
     }
   }
+
   logout(res) {
     res.clearCookie("@admin-tayar-token");
     return true;