Merge pull request #65 from sikka-software/feature/enhance-hajar-usab…

…ility-js

Feature/enhance hajar usability js

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hajar",
-  "version": "1.1.76",
+  "version": "1.1.78",
   "description": "Toolkit to create SaaS applications",
   "author": "Sikka Software <[email protected]> (http://sikka.io)",
   "license": "MIT",

www/src/@sikka/hajar/core/auth/index.js

@@ -1,53 +1,53 @@
 import { compare, hash } from "bcrypt";
 import { sign, verify } from "jsonwebtoken";
+import HajarError from "../utils/hajarError";
 
-async function login(email, password, config) {
-  const { models } = config.mongoose;
-  const user = await models.User.findOne({ email });
-  if (!user) {
-    throw new Error("User not found");
-  }
+async function login(email, password, userType, config) {
+  try {
+    const { models } = config.mongoose;
+    const user = await models.User.findOne({ email });
+    if (!user) {
+      throw new HajarError("User not found", "invalid-email-password");
+    }
 
-  const validPassword = await compare(password, user.password);
-  if (!validPassword) {
-    throw new Error("Invalid password");
-  }
+    const validPassword = await compare(password, user.password);
 
-  const ref = user.ref;
-  let additionalData = null;
-
-  switch (ref) {
-    case "admin":
-      additionalData = await models.Admin.findOne({ uid: user._id });
-      if (!additionalData) {
-        throw new Error("Admin not found");
-      }
-      break;
-    case "client":
-      additionalData = await models.Client.findOne({ uid: user._id });
-      if (!additionalData) {
-        throw new Error("Client not found");
-      }
-      break;
-    default:
-      throw new Error("Invalid user reference");
-  }
+    if (!validPassword) {
+      throw new HajarError("Invalid password", "invalid-email-password");
+    }
 
-  const token = sign({ _id: user._id }, config.accessToken, {
-    expiresIn: "7d",
-  });
+    // Capitalize the first letter of userType
+    const modelType = userType.charAt(0).toUpperCase() + userType.slice(1);
 
-  const refreshToken = sign({ _id: user._id }, config.refreshToken, {
-    expiresIn: "30d",
-  });
+    // Check if the model exists in models on our mongoose instance
+    if (!models[modelType]) {
+      throw new HajarError("Invalid user type", "invalid_user_type");
+    }
 
-  return {
-    success: true,
-    user: { ...user.toObject() },
-    [ref]: { ...additionalData.toObject() },
-    token,
-    refreshToken,
-  };
+    const additionalData = await models[modelType].findOne({ uid: user._id });
+    if (!additionalData) {
+      throw new HajarError(`${modelType} not found`, `${userType}_not_found`);
+    }
+
+    const token = sign({ _id: user._id }, config.accessToken, {
+      expiresIn: "1h",
+    });
+
+    const refreshToken = sign({ _id: user._id }, config.refreshToken, {
+      expiresIn: "7d",
+    });
+
+    return {
+      success: true,
+      user: { ...user.toObject() },
+      [userType]: { ...additionalData.toObject() },
+      token,
+      refreshToken,
+    };
+  } catch (error) {
+    console.error("Login error:", error);
+    throw error;
+  }
 }
 
 // @TODO: Add the ability to register a client in the same function
@@ -63,10 +63,16 @@ async function register(userDetails, config) {
     });
 
     if (usernameCheck) {
-      throw new Error("User with this username already exists");
+      throw new HajarError(
+        "User with this username already exists",
+        "username_exists"
+      );
     }
     if (userExists) {
-      throw new Error("User with this email already exists");
+      throw new HajarError(
+        "User with this email already exists",
+        "email_exists"
+      );
     }
 
     const adminRole = await models.Role.findOne({

www/src/@sikka/hajar/core/index.js

@@ -38,11 +38,11 @@ class Hajar {
     this.config = null;
     this.initialized = false;
     this.auth = {
-      login: (email, password) => {
+      login: (email, password, userType) => {
         if (!this.initialized) {
           throw new Error("Hajar is not initialized");
         }
-        return login(email, password, this.config);
+        return login(email, password, userType, this.config);
       },
       register: (userDetails) => {
         if (!this.initialized) {

www/src/@sikka/hajar/core/utils/hajarError.js

@@ -0,0 +1,11 @@
+class HajarError extends Error {
+  constructor(message, slug, customProperties) {
+    super(message); // Pass the message parameter to the Error constructor
+    this.slug = slug; // Assign the code parameter to a property on the error object
+    if (customProperties) {
+      Object.assign(this, customProperties);
+    }
+  }
+}
+
+export default HajarError;