SIKKA-6202[IN PROGRESS]

sikka-software · Jan 6, 2024 · 0db4f3a · 0db4f3a
1 parent 4db24dc
commit 0db4f3a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sikka/hajar",
-  "version": "1.1.43",
+  "version": "1.1.44",
   "description": "Toolkit to create SaaS applications",
   "author": "Sikka Software <contact@sikka.io> (http://sikka.io)",
   "license": "MIT",

diff --git a/src/core/authentication/index.js b/src/core/authentication/index.js
@@ -235,19 +235,23 @@ class HajarAuth {
           email: googleUserData.email,
           ref: "customers",
         });
+
         if (!user) {
           user = new this.User({
             username: googleUserData.username,
             email: googleUserData.email,
             ref: "customers",
             password: await this.bcrypt.hash(googleUserData.password, 10),
-            //   role: googleUserData.role,
+            // role: googleUserData.role,
           });
+
           await user.save();
         }
-        const customerData = await this.Customer.findOne({ profile: user._id });
+
+        let customerData = await this.Customer.findOne({ uid: user._id });
+
         if (!customerData) {
-          const customer = new this.Customer({
+          customerData = new this.Customer({
             profile: user._id,
             // role: googleUserData.role,
             uid: user._id,
@@ -256,7 +260,7 @@ class HajarAuth {
             lastName: googleUserData.lastName,
           });
 
-          await customer.save();
+          await customerData.save();
         }
 
         return {
@@ -267,7 +271,6 @@ class HajarAuth {
           token: this.jwt.sign({ userId: user._id }, this.secret),
         };
       }
-
       user = await this.User.findOne({
         email: googleUserData.email,
         ref: "customers",