propro-utils 1.3.30 → 1.3.32

package/middlewares/account_info.js

@@ -60,12 +60,9 @@ const getAccountProfile = async (redisClient, userSchema, accountId) => {
  * @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
-    });
+    const user = await userSchema.findOne({ accountId });
     if (!user) {
-        await userSchema.create({
-            accountId: accountId
-        });
+        await userSchema.create({accountId});
     }
 };
 

package/package.json

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

package/src/index.js

@@ -24,6 +24,7 @@ let _serverAuth, _clientAuth;
  *   }
  * @param {boolean} [options.useClientAuth=false] - A boolean flag to enable client-side authentication.
  * @param {Object} [options.clientOptions={}] - Configuration options for client-side authentication.
+ * @param {Schema} [userSchema] - The user schema to perform the operations on.
  *
  * @returns {Function} An Express middleware function.
  *
@@ -40,7 +41,7 @@ let _serverAuth, _clientAuth;
  *   useClientAuth: false,
  * }));
  */
-module.exports = function proproAuthMiddleware(options = {}) {
+module.exports = function proproAuthMiddleware(options = {}, userSchema) {
   validateEnvironmentVariables([
     "AUTH_URL",
     "CLIENT_ID",
@@ -52,7 +53,7 @@ module.exports = function proproAuthMiddleware(options = {}) {
     try {
       // Lazy loading and initializing server and client authentication modules with options
       if (options.useServerAuth) {
-        _serverAuth = _serverAuth || require("./server")(options.serverOptions);
+        _serverAuth = _serverAuth || require("./server")(options.serverOptions, userSchema);
         _serverAuth(req, res, next);
       } else if (options.useClientAuth) {
         _clientAuth = _clientAuth || require("./client")(options.clientOptions);

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,8 +49,6 @@ function proproAuthMiddleware(options = {}) {
           return res.status(400).send("No code received");
         }
 
-        console.log("code", code);
-
         const {tokens, account, redirectUrl} = await exchangeToken(
           authUrl,
           code,
@@ -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();