propro-utils 1.5.57 → 1.5.59

package/middlewares/account_info.js

@@ -1,5 +1,6 @@
 require('dotenv').config();
 const axios = require('axios');
+const mongoose = require('mongoose');
 const { getOrSetCache } = require('../utils/redis');
 const { v4: uuidv4 } = require('uuid');
 const ServiceManager = require('../utils/serviceManager');
@@ -99,26 +100,37 @@ async function createDefaultFolders(folderSchema, accountId) {
   }
 }
 
-/**
- * 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.
- * If the user exists but doesn't have global styles, creates them.
- *
- * @param {string} accountId - The account ID of the user to check/create.
- * @returns {Promise<Object>} A promise that resolves to the user object.
- * @throws {Error} If there's an issue with database operations.
- */
 const checkIfUserExists = async accountId => {
   try {
     const userSchema = await ServiceManager.getService('UserSchema');
     const userStyleSchema = await ServiceManager.getService('UserStyleSchema');
     const folderSchema = await ServiceManager.getService('FolderSchema');
+    const Theme = mongoose.model('Theme');
 
     let user = await userSchema
       .findOne({ accountId })
       .populate('userGlobalStyles');
 
     if (user) {
+      if (!user.theme) {
+        let defaultTheme = await Theme.findOne({
+          name: 'Default Theme',
+          accountId,
+        });
+        if (!defaultTheme) {
+          defaultTheme = await Theme.create({
+            canvasBackground: '#000000',
+            defaultItemWidth: 200,
+            defaultColor: '#ffffff',
+            fontSize: '16px',
+            name: 'Default Theme',
+            id: uuidv4(),
+          });
+        }
+        user.theme = defaultTheme._id;
+        await user.save();
+      }
+
       if (!user.userGlobalStyles) {
         user.userGlobalStyles = await createUserGlobalStyles(
           userStyleSchema,
@@ -129,7 +141,7 @@ const checkIfUserExists = async accountId => {
         user.userGlobalStyles.styleShortcuts = defaultUserGlobalStyleShortcuts;
         await user.userGlobalStyles.save();
       }
-      // Check if user has any folders
+
       const userFolders = await folderSchema.find({ user_id: user.id });
       const defaultFolderNames = defaultFolders.map(folder => folder.name);
       const userFolderNames = userFolders.map(folder => folder.name);
@@ -152,6 +164,21 @@ const checkIfUserExists = async accountId => {
       return user;
     }
 
+    let defaultTheme = await Theme.findOne({
+      name: 'Default Theme',
+      accountId,
+    });
+    if (!defaultTheme) {
+      defaultTheme = await Theme.create({
+        canvasBackground: '#000000',
+        defaultItemWidth: 200,
+        defaultColor: '#ffffff',
+        fontSize: '16px',
+        name: 'Default Theme',
+        id: uuidv4(),
+      });
+    }
+
     const userGlobalStyles = await createUserGlobalStyles(
       userStyleSchema,
       accountId
@@ -162,6 +189,7 @@ const checkIfUserExists = async accountId => {
       id: uuidv4(),
       verified: false,
       userGlobalStyles: userGlobalStyles._id,
+      theme: defaultTheme._id,
     });
 
     const folders = await createDefaultFolders(folderSchema, user.id);

package/package.json

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

package/src/server/index.js

@@ -210,7 +210,8 @@ class AuthMiddleware {
     const refreshToken =
       req.cookies['x-refresh-token'] || req.headers['x-refresh-token'];
     if (!refreshToken) {
-      return res.status(401).json({ error: 'No refresh token provided' });
+      clearAuthCookies(res);
+      return this.handleAuth(req, res);
     }
 
     try {