propro-utils 1.3.29 → 1.3.31

package/middlewares/account_info.js

@@ -40,14 +40,6 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
                 throw new Error("Invalid permissions");
             }
 
-            // check if the user account is already in the database of the application that is using this middleware, if not, add it
-            const user = await userSchema.findOne({ id: profileData.id });
-            if (!user) {
-                await userSchema.create({
-                    accountId: accountId
-                });
-            }
-
             return profileData;
 
         } catch (error) {
@@ -58,4 +50,23 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
         }
 };
 
-module.exports = getAccountProfile;
+
+/**
+ * Checks if a user exists based on the given account ID.
+ * If the user does not exist, creates a new user with the given account ID.
+ *
+ * @param {Schema} userSchema - The user schema to perform the operations on.
+ * @param {string} accountId - The account ID of the user to check/create.
+ * @returns {Promise<void>} - A promise that resolves once the check/create operation is done.
+ */
+const checkIfUserExists = async (userSchema, accountId) => {
+    const user = await userSchema.findOne({ accountId });
+    if (!user) {
+        await userSchema.create({accountId});
+    }
+};
+
+module.exports = {
+    getAccountProfile,
+    checkIfUserExists
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "propro-utils",
-  "version": "1.3.29",
+  "version": "1.3.31",
   "description": "Auth middleware for propro-auth",
   "main": "src/index.js",
   "scripts": {

package/src/server/index.js

@@ -2,6 +2,7 @@ require("dotenv").config();
 const {
   exchangeToken,
 } = require("./middleware/verifyToken");
+const {checkIfUserExists} = require("../../middlewares/account_info");
 
 /**
  * Middleware for handling authentication and authorization.
@@ -14,9 +15,10 @@ const {
  * @param {string} [options.clientUrl=process.env.CLIENT_URL] - The client URL.
  * @param {string} [options.redirectUri=process.env.REDIRECT_URI] - The redirect URI.
  * @param {string} [options.appName=process.env.APP_NAME] - The application name.
+ * @param {Schema} [userSchema] - The user schema to perform the operations on.
  * @returns {Function} - Express middleware function.
  */
-function proproAuthMiddleware(options = {}) {
+function proproAuthMiddleware(options = {}, userSchema) {
   const {
     secret = "RESTFULAPIs",
     authUrl = process.env.AUTH_URL,
@@ -47,9 +49,7 @@ function proproAuthMiddleware(options = {}) {
           return res.status(400).send("No code received");
         }
 
-        console.log("code", code);
-
-        const {tokens, redirectUrl} = await exchangeToken(
+        const {tokens, account, redirectUrl} = await exchangeToken(
           authUrl,
           code,
           clientId,
@@ -57,6 +57,8 @@ function proproAuthMiddleware(options = {}) {
           redirectUri
         );
 
+        await checkIfUserExists(userSchema, account.accountId);
+
         const currentDateTime = new Date();
 
         const refreshMaxAge = new Date(tokens.refresh.expires).getTime() - currentDateTime.getTime();