diff --git a/api/server/services/auth.service.js b/api/server/services/auth.service.js index e570e052a4..00e8578e94 100644 --- a/api/server/services/auth.service.js +++ b/api/server/services/auth.service.js @@ -3,16 +3,16 @@ const Token = require('../../models/schema/tokenSchema'); const crypto = require('crypto'); const bcrypt = require('bcryptjs'); const { registerSchema } = require('../../strategies/validators'); -const { migrateDataToFirstUser, sendEmail } = require('../../utils'); +const { sendEmail } = require('../../utils'); const config = require('../../../config/loader'); const domains = config.domains; /** * Logout user * - * @param {Object} user - * @param {*} refreshToken - * @returns + * @param {Object} user + * @param {*} refreshToken + * @returns */ const logoutUser = async (user, refreshToken) => { try { @@ -37,7 +37,7 @@ const logoutUser = async (user, refreshToken) => { * Register a new user * * @param {Object} user - * @returns + * @returns */ const registerUser = async (user) => { const { error } = registerSchema.validate(user); @@ -91,9 +91,6 @@ const registerUser = async (user) => { newUser.password = hash; newUser.save(); - if (isFirstRegisteredUser) { - migrateDataToFirstUser(newUser); - } return { status: 200, user: newUser }; } catch (err) { return { status: 500, message: err?.message || 'Something went wrong' }; @@ -103,8 +100,8 @@ const registerUser = async (user) => { /** * Request password reset * - * @param {String} email - * @returns + * @param {String} email + * @returns */ const requestPasswordReset = async (email) => { const user = await User.findOne({ email }); @@ -141,10 +138,10 @@ const requestPasswordReset = async (email) => { /** * Reset Password * - * @param {*} userId - * @param {String} token - * @param {String} password - * @returns + * @param {*} userId + * @param {String} token + * @param {String} password + * @returns */ const resetPassword = async (userId, token, password) => { let passwordResetToken = await Token.findOne({ userId }); diff --git a/api/utils/index.js b/api/utils/index.js index 96bf09e124..948a5f6ced 100644 --- a/api/utils/index.js +++ b/api/utils/index.js @@ -1,7 +1,6 @@ const azureUtils = require('./azureUtils'); const cryptoUtils = require('./crypto'); const { tiktokenModels, maxTokensMap } = require('./tokens'); -const migrateConversations = require('./migrateDataToFirstUser'); const sendEmail = require('./sendEmail'); const abortMessage = require('./abortMessage'); @@ -10,7 +9,6 @@ module.exports = { ...azureUtils, maxTokensMap, tiktokenModels, - migrateConversations, sendEmail, abortMessage } \ No newline at end of file diff --git a/api/utils/migrateDataToFirstUser.js b/api/utils/migrateDataToFirstUser.js deleted file mode 100644 index 6f7b558b75..0000000000 --- a/api/utils/migrateDataToFirstUser.js +++ /dev/null @@ -1,29 +0,0 @@ -const Conversation = require('../models/schema/convoSchema'); -const Preset = require('../models/schema/presetSchema'); - -const migrateConversations = async (userId) => { - try { - return await Conversation.updateMany({ user: null }, { $set: { user: userId } }).exec(); - } catch (error) { - console.log(error); - return { message: 'Error saving conversation' }; - } -}; - -const migratePresets = async (userId) => { - try { - return await Preset.updateMany({ user: null }, { $set: { user: userId } }).exec(); - } catch (error) { - console.log(error); - return { message: 'Error saving conversation' }; - } -}; - -const migrateDataToFirstUser = async (user) => { - const conversations = await migrateConversations(user.id); - console.log(conversations); - const presets = await migratePresets(user.id); - console.log(presets); -}; - -module.exports = migrateDataToFirstUser;