Merge pull request #64 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.75",
+  "version": "1.1.76",
   "description": "Toolkit to create SaaS applications",
   "author": "Sikka Software <[email protected]> (http://sikka.io)",
   "license": "MIT",

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

@@ -33,11 +33,11 @@ async function login(email, password, config) {
       throw new Error("Invalid user reference");
   }
 
-  const token = sign({ _id: user._id }, config.secret, {
+  const token = sign({ _id: user._id }, config.accessToken, {
     expiresIn: "7d",
   });
 
-  const refreshToken = sign({ _id: user._id }, config.refreshTokenSecret, {
+  const refreshToken = sign({ _id: user._id }, config.refreshToken, {
     expiresIn: "30d",
   });
 
@@ -105,9 +105,8 @@ async function register(userDetails, config) {
 
     const newAdmin = await admin.save();
 
-    const token = sign({ _id: newUser._id }, config.secret);
-    // i need to add the refresh token here
-    const refreshToken = sign({ _id: newUser._id }, config.refreshTokenSecret, {
+    const token = sign({ _id: newUser._id }, config.accessToken);
+    const refreshToken = sign({ _id: newUser._id }, config.refreshToken, {
       expiresIn: "30d",
     });
 
@@ -127,7 +126,7 @@ async function register(userDetails, config) {
 async function getUserFromToken(accessToken, config) {
   try {
     const { models } = config.mongoose;
-    const decodedToken = verify(accessToken, config.secret);
+    const decodedToken = verify(accessToken, config.accessToken);
     const user = await models.User.findById(decodedToken._id);
     return user;
   } catch (error) {
@@ -144,7 +143,7 @@ async function refreshAccessToken(refreshToken, config) {
 
   let payload = {};
   try {
-    payload = verify(refreshToken, config.refreshTokenSecret);
+    payload = verify(refreshToken, config.refreshToken);
   } catch (err) {
     throw new Error("Invalid token");
   }
@@ -154,7 +153,7 @@ async function refreshAccessToken(refreshToken, config) {
     throw new Error("User not found");
   }
 
-  const newAccessToken = sign({ _id: user._id }, config.secret, {
+  const newAccessToken = sign({ _id: user._id }, config.accessToken, {
     expiresIn: "1h",
   });
   return newAccessToken;

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

@@ -6,6 +6,34 @@ import {
 } from "./auth/index.js";
 
 class Hajar {
+  async init(url, secrets, mongooseInstance) {
+    if (this.initialized) {
+      throw new Error("🚫 Hajar is already initialized");
+    }
+    console.log("⌛ Starting the database connection process...");
+    try {
+      await mongooseInstance.connect(url);
+      mongooseInstance.connection.once("open", () => {
+        console.log("✅🔗 Connected to the database successfully!");
+      });
+      mongooseInstance.connection.on("error", (error) => {
+        console.error("❌🔗 Error connecting to the database:", error);
+        throw error;
+      });
+
+      this.config = {
+        accessToken: secrets.accessToken,
+        refreshToken: secrets.refreshToken,
+        mongoose: mongooseInstance,
+      };
+
+      this.initialized = true;
+      console.log("✅🚀 Hajar initialized successfully.");
+    } catch (error) {
+      console.error("❌🔗 Attempt to connect to the database failed: ", error);
+      throw error;
+    }
+  }
   constructor() {
     this.config = null;
     this.initialized = false;
@@ -36,18 +64,6 @@ class Hajar {
       },
     };
   }
-  initHajar(jwtSecret, refreshToken, mongooseInstance) {
-    if (this.initialized) {
-      throw new Error("Hajar is already initialized");
-    }
-    this.config = {
-      secret: jwtSecret,
-      refreshTokenSecret: refreshToken,
-      mongoose: mongooseInstance,
-    };
-    this.initialized = true;
-    console.log("Hajar initialized successfully.");
-  }
 }
 
 export default new Hajar();