mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 06:00:56 +02:00

* server-side JWT auth implementation * move oauth routes and strategies, fix bugs * backend modifications for wiring up the frontend login and reg forms * Add frontend data services for login and registration * Add login and registration forms * Implment auth context, functional client side auth * protect routes with jwt auth * finish local strategy (using local storage) * Start setting up google auth * disable token refresh, remove old auth middleware * refactor client, add ApiErrorBoundary context * disable google and facebook strategies * fix: fix presets not displaying specific to user * fix: fix issue with browser refresh * fix: casing issue with User.js (#11) * delete user.js to be renamed * fix: fix casing issue with User.js * comment out api error watcher temporarily * fix: issue with api error watcher (#12) * delete user.js to be renamed * fix: fix casing issue with User.js * comment out api error watcher temporarily * feat: add google auth social login * fix: make google login url dynamic based on dev/prod * fix: bug where UI is briefly displayed before redirecting to login * fix: fix cookie expires value for local auth * Update README.md * Update LOCAL_INSTALL structure * Add local testing instructions * Only load google strategy if client id and secret are provided * Update .env.example files with new params * fix issue with not redirecting to register form * only show google login button if value is set in .env * cleanup log messages * Add label to button for google login on login form * doc: fix client/server url values in .env.example * feat: add error message details to registration failure * Restore preventing paste on confirm password * auto-login user after registering * feat: forgot password (#24) * make login/reg pages look like openai's * add password reset data services * new form designs similar to openai, add password reset pages * add api's for password reset * email utils for password reset * remove bcrypt salt rounds from process.env * refactor: restructure api auth code, consolidate routes (#25) * add api's for password reset * remove bcrypt salt rounds from process.env * refactor: consolidate auth routes, use controller pattern * refactor: code cleanup * feat: migrate data to first user (#26) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes after refactor (#27) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes * fix: issue with auto-login when logging out then logging in with new browser window (#28) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes * fix: fix issue with auto-login in new tab * doc: Update README and .env.example files with user system information (#29) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes * fix: fix issue with auto-login in new tab * doc: update README and .env.example files * Fixup: LOCAL_INSTALL.md PS instructions (#200) (#30) Co-authored-by: alfredo-f <alfredo.fomitchenko@mail.polimi.it> * feat: send user with completion to protect against abuse (#31) * Fixup: LOCAL_INSTALL.md PS instructions (#200) * server-side JWT auth implementation * move oauth routes and strategies, fix bugs * backend modifications for wiring up the frontend login and reg forms * Add frontend data services for login and registration * Add login and registration forms * Implment auth context, functional client side auth * protect routes with jwt auth * finish local strategy (using local storage) * Start setting up google auth * disable token refresh, remove old auth middleware * refactor client, add ApiErrorBoundary context * disable google and facebook strategies * fix: fix presets not displaying specific to user * fix: fix issue with browser refresh * fix: casing issue with User.js (#11) * delete user.js to be renamed * fix: fix casing issue with User.js * comment out api error watcher temporarily * feat: add google auth social login * fix: make google login url dynamic based on dev/prod * fix: bug where UI is briefly displayed before redirecting to login * fix: fix cookie expires value for local auth * Only load google strategy if client id and secret are provided * Update .env.example files with new params * fix issue with not redirecting to register form * only show google login button if value is set in .env * cleanup log messages * Add label to button for google login on login form * doc: fix client/server url values in .env.example * feat: add error message details to registration failure * Restore preventing paste on confirm password * auto-login user after registering * feat: forgot password (#24) * make login/reg pages look like openai's * add password reset data services * new form designs similar to openai, add password reset pages * add api's for password reset * email utils for password reset * remove bcrypt salt rounds from process.env * refactor: restructure api auth code, consolidate routes (#25) * add api's for password reset * remove bcrypt salt rounds from process.env * refactor: consolidate auth routes, use controller pattern * refactor: code cleanup * feat: migrate data to first user (#26) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes after refactor (#27) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes * fix: issue with auto-login when logging out then logging in with new browser window (#28) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes * fix: fix issue with auto-login in new tab * doc: Update README and .env.example files with user system information (#29) * refactor: use /api for auth routes * fix: use user id instead of username * feat: migrate data to first user on register * fix: fix social login routes * fix: fix issue with auto-login in new tab * doc: update README and .env.example files * Send user id to openai to protect against abuse * add meilisearch to gitignore * Remove webpack --------- Co-authored-by: alfredo-f <alfredo.fomitchenko@mail.polimi.it> --------- Co-authored-by: Danny Avila <110412045+danny-avila@users.noreply.github.com> Co-authored-by: Alfredo Fomitchenko <alfredo.fomitchenko@mail.polimi.it>
129 lines
4.2 KiB
JavaScript
129 lines
4.2 KiB
JavaScript
// const { Conversation } = require('./plugins');
|
|
const Conversation = require('./schema/convoSchema');
|
|
const { getMessages, deleteMessages } = require('./Message');
|
|
|
|
const getConvo = async (user, conversationId) => {
|
|
console.log('getConvo -> userId', user);
|
|
try {
|
|
return await Conversation.findOne({ user, conversationId }).exec();
|
|
} catch (error) {
|
|
console.log(error);
|
|
return { message: 'Error getting single conversation' };
|
|
}
|
|
};
|
|
|
|
module.exports = {
|
|
Conversation,
|
|
saveConvo: async (user, { conversationId, newConversationId, ...convo }) => {
|
|
try {
|
|
const messages = await getMessages({ conversationId });
|
|
const update = { ...convo, messages, user };
|
|
if (newConversationId) {
|
|
update.conversationId = newConversationId;
|
|
}
|
|
|
|
return await Conversation.findOneAndUpdate({ conversationId: conversationId, user }, update, {
|
|
new: true,
|
|
upsert: true
|
|
}).exec();
|
|
} catch (error) {
|
|
console.log(error);
|
|
return { message: 'Error saving conversation' };
|
|
}
|
|
},
|
|
getConvosByPage: async (user, pageNumber = 1, pageSize = 12) => {
|
|
try {
|
|
const totalConvos = (await Conversation.countDocuments({ user })) || 1;
|
|
const totalPages = Math.ceil(totalConvos / pageSize);
|
|
const convos = await Conversation.find({ user })
|
|
.sort({ createdAt: -1, created: -1 })
|
|
.skip((pageNumber - 1) * pageSize)
|
|
.limit(pageSize)
|
|
.exec();
|
|
return { conversations: convos, pages: totalPages, pageNumber, pageSize };
|
|
} catch (error) {
|
|
console.log(error);
|
|
return { message: 'Error getting conversations' };
|
|
}
|
|
},
|
|
getConvosQueried: async (user, convoIds, pageNumber = 1, pageSize = 12) => {
|
|
try {
|
|
if (!convoIds || convoIds.length === 0) {
|
|
return { conversations: [], pages: 1, pageNumber, pageSize };
|
|
}
|
|
|
|
const cache = {};
|
|
const convoMap = {};
|
|
const promises = [];
|
|
// will handle a syncing solution soon
|
|
const deletedConvoIds = [];
|
|
|
|
convoIds.forEach((convo) =>
|
|
promises.push(
|
|
Conversation.findOne({
|
|
user,
|
|
conversationId: convo.conversationId
|
|
}).exec()
|
|
)
|
|
);
|
|
|
|
const results = (await Promise.all(promises)).filter((convo, i) => {
|
|
if (!convo) {
|
|
deletedConvoIds.push(convoIds[i].conversationId);
|
|
return false;
|
|
} else {
|
|
const page = Math.floor(i / pageSize) + 1;
|
|
if (!cache[page]) {
|
|
cache[page] = [];
|
|
}
|
|
cache[page].push(convo);
|
|
convoMap[convo.conversationId] = convo;
|
|
return true;
|
|
}
|
|
});
|
|
|
|
// const startIndex = (pageNumber - 1) * pageSize;
|
|
// const convos = results.slice(startIndex, startIndex + pageSize);
|
|
const totalPages = Math.ceil(results.length / pageSize);
|
|
cache.pages = totalPages;
|
|
cache.pageSize = pageSize;
|
|
return {
|
|
cache,
|
|
conversations: cache[pageNumber] || [],
|
|
pages: totalPages || 1,
|
|
pageNumber,
|
|
pageSize,
|
|
// will handle a syncing solution soon
|
|
filter: new Set(deletedConvoIds),
|
|
convoMap
|
|
};
|
|
} catch (error) {
|
|
console.log(error);
|
|
return { message: 'Error fetching conversations' };
|
|
}
|
|
},
|
|
getConvo,
|
|
/* chore: this method is not properly error handled */
|
|
getConvoTitle: async (user, conversationId) => {
|
|
try {
|
|
const convo = await getConvo(user, conversationId);
|
|
/* ChatGPT Browser was triggering error here due to convo being saved later */
|
|
if (convo && !convo.title) {
|
|
return null;
|
|
} else {
|
|
// TypeError: Cannot read properties of null (reading 'title')
|
|
return convo?.title || 'New Chat';
|
|
}
|
|
} catch (error) {
|
|
console.log(error);
|
|
return { message: 'Error getting conversation title' };
|
|
}
|
|
},
|
|
deleteConvos: async (user, filter) => {
|
|
let toRemove = await Conversation.find({ ...filter, user }).select('conversationId');
|
|
const ids = toRemove.map((instance) => instance.conversationId);
|
|
let deleteCount = await Conversation.deleteMany({ ...filter, user }).exec();
|
|
deleteCount.messages = await deleteMessages({ conversationId: { $in: ids } });
|
|
return deleteCount;
|
|
}
|
|
};
|