Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🛠️ fix: Remove `expiresAt` field when setting expiry to "never" (#4294)

normunds-wipo77bcb80e0090
diff --git a/api/server/services/UserService.js b/api/server/services/UserService.js
index 30b54c7406..91d772477b 100644
--- a/api/server/services/UserService.js
+++ b/api/server/services/UserService.js
@@ -103,10 +103,10 @@ const getUserKeyExpiry = async ({ userId, name }) => {
* @param {string} params.userId - The unique identifier for the user.
* @param {string} params.name - The name associated with the key.
* @param {string} params.value - The value to be encrypted and stored as the key's value.
- * @param {Date} params.expiresAt - The expiry date for the key.
+ * @param {Date} params.expiresAt - The expiry date for the key [optional]
* @returns {Promise<Object>} The updated or newly inserted key document.
* @description This function either updates an existing user key or inserts a new one into the database,
- * after encrypting the provided value. It sets the provided expiry date for the key.
+ * after encrypting the provided value. It sets the provided expiry date for the key (or unsets for no expiry).
*/
const updateUserKey = async ({ userId, name, value, expiresAt = null }) => {
const encryptedValue = await encrypt(value);
@@ -115,13 +115,15 @@ const updateUserKey = async ({ userId, name, value, expiresAt = null }) => {
name,
value: encryptedValue,
};
-
- // Only add expiresAt to the update object if it's not null
+ const updateQuery = { $set: updateObject };
+ // add expiresAt to the update object if it's not null
if (expiresAt) {
updateObject.expiresAt = new Date(expiresAt);
+ } else {
+ // make sure to remove if already present
+ updateQuery.$unset = { expiresAt };
}
-
- return await Key.findOneAndUpdate({ userId, name }, updateObject, {
+ return await Key.findOneAndUpdate({ userId, name }, updateQuery, {
upsert: true,
new: true,
}).lean();