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

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

@@ -18,12 +18,12 @@ async function login(config, email, password) {
   let clientData = null;
 
   if (ref === "admin") {
-    adminData = await models.Admin.findOne({ userId: user._id });
+    adminData = await models.Admin.findOne({ uid: user._id });
     if (!adminData) {
       throw new Error("Admin not found");
     }
   } else if (ref === "client") {
-    clientData = await models.Client.findOne({ userId: user._id });
+    clientData = await models.Client.findOne({ uid: user._id });
     if (!clientData) {
       throw new Error("Client not found");
     }

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

@@ -23,7 +23,6 @@ class Hajar {
       mongoose: mongooseInstance,
     };
     this.initialized = true;
-
     console.log("Hajar initialized successfully.");
   }
 }