🗑️ fix: Delete Shared Links on Conversation Deletion (#10396)
Some checks failed
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Waiting to run
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Waiting to run
Docker Dev Images Build / build (Dockerfile, librechat-dev, node) (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile.multi, librechat-dev-api, api-build) (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Sync Translation Keys with Locize (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Create Translation PR on Version Published (push) Has been cancelled

*  feat: Enhance DELETE /all endpoint to remove shared links alongside conversations and tool calls

- Added functionality to delete all shared links for a user when clearing conversations.
- Introduced comprehensive tests to ensure correct behavior and error handling for the new deletion process.

*  feat: Implement deleteConvoSharedLink method and update conversation deletion logic to remove associated shared links
This commit is contained in:
Danny Avila 2025-11-06 11:44:28 -05:00 committed by GitHub
parent c6611d4e77
commit ba71375982
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 640 additions and 3 deletions

View file

@ -936,6 +936,107 @@ describe('Share Methods', () => {
});
});
describe('deleteConvoSharedLink', () => {
test('should delete all shared links for a specific conversation', async () => {
const userId = new mongoose.Types.ObjectId().toString();
const conversationId1 = 'conv-to-delete';
const conversationId2 = 'conv-to-keep';
await SharedLink.create([
{ shareId: 'share1', conversationId: conversationId1, user: userId, isPublic: true },
{ shareId: 'share2', conversationId: conversationId1, user: userId, isPublic: false },
{ shareId: 'share3', conversationId: conversationId2, user: userId, isPublic: true },
]);
const result = await shareMethods.deleteConvoSharedLink(userId, conversationId1);
expect(result.deletedCount).toBe(2);
expect(result.message).toContain('successfully');
const remainingShares = await SharedLink.find({});
expect(remainingShares).toHaveLength(1);
expect(remainingShares[0].conversationId).toBe(conversationId2);
});
test('should only delete shares for the specified user and conversation', async () => {
const userId1 = new mongoose.Types.ObjectId().toString();
const userId2 = new mongoose.Types.ObjectId().toString();
const conversationId = 'shared-conv';
await SharedLink.create([
{ shareId: 'share1', conversationId, user: userId1, isPublic: true },
{ shareId: 'share2', conversationId, user: userId2, isPublic: true },
{ shareId: 'share3', conversationId: 'other-conv', user: userId1, isPublic: true },
]);
const result = await shareMethods.deleteConvoSharedLink(userId1, conversationId);
expect(result.deletedCount).toBe(1);
const remainingShares = await SharedLink.find({});
expect(remainingShares).toHaveLength(2);
expect(
remainingShares.some((s) => s.user === userId2 && s.conversationId === conversationId),
).toBe(true);
expect(
remainingShares.some((s) => s.user === userId1 && s.conversationId === 'other-conv'),
).toBe(true);
});
test('should handle when no shares exist for the conversation', async () => {
const userId = new mongoose.Types.ObjectId().toString();
const conversationId = 'nonexistent-conv';
const result = await shareMethods.deleteConvoSharedLink(userId, conversationId);
expect(result.deletedCount).toBe(0);
expect(result.message).toContain('successfully');
});
test('should throw error when userId is missing', async () => {
await expect(shareMethods.deleteConvoSharedLink('', 'conv123')).rejects.toThrow(
'Missing required parameters',
);
});
test('should throw error when conversationId is missing', async () => {
await expect(shareMethods.deleteConvoSharedLink('user123', '')).rejects.toThrow(
'Missing required parameters',
);
});
test('should delete multiple shared links for same conversation', async () => {
const userId = new mongoose.Types.ObjectId().toString();
const conversationId = 'conv-with-many-shares';
await SharedLink.create([
{ shareId: 'share1', conversationId, user: userId, isPublic: true },
{
shareId: 'share2',
conversationId,
user: userId,
isPublic: true,
targetMessageId: 'msg1',
},
{
shareId: 'share3',
conversationId,
user: userId,
isPublic: true,
targetMessageId: 'msg2',
},
{ shareId: 'share4', conversationId, user: userId, isPublic: false },
]);
const result = await shareMethods.deleteConvoSharedLink(userId, conversationId);
expect(result.deletedCount).toBe(4);
const remainingShares = await SharedLink.find({ conversationId, user: userId });
expect(remainingShares).toHaveLength(0);
});
});
describe('Edge Cases and Error Handling', () => {
test('should handle conversation with special characters in ID', async () => {
const userId = new mongoose.Types.ObjectId().toString();

View file

@ -173,8 +173,8 @@ export function createShareMethods(mongoose: typeof import('mongoose')) {
return null;
}
// Filter messages based on targetMessageId if present (branch-specific sharing)
let messagesToShare = share.messages;
/** Filtered messages based on targetMessageId if present (branch-specific sharing) */
let messagesToShare: t.IMessage[] = share.messages;
if (share.targetMessageId) {
messagesToShare = getMessagesUpToTarget(share.messages, share.targetMessageId);
}
@ -310,6 +310,34 @@ export function createShareMethods(mongoose: typeof import('mongoose')) {
}
}
/**
* Delete shared links by conversation ID
*/
async function deleteConvoSharedLink(
user: string,
conversationId: string,
): Promise<t.DeleteAllSharesResult> {
if (!user || !conversationId) {
throw new ShareServiceError('Missing required parameters', 'INVALID_PARAMS');
}
try {
const SharedLink = mongoose.models.SharedLink as Model<t.ISharedLink>;
const result = await SharedLink.deleteMany({ user, conversationId });
return {
message: 'Shared links deleted successfully',
deletedCount: result.deletedCount,
};
} catch (error) {
logger.error('[deleteConvoSharedLink] Error deleting shared links', {
error: error instanceof Error ? error.message : 'Unknown error',
user,
conversationId,
});
throw new ShareServiceError('Error deleting shared links', 'SHARE_DELETE_ERROR');
}
}
/**
* Create a new shared link for a conversation
*/
@ -528,6 +556,7 @@ export function createShareMethods(mongoose: typeof import('mongoose')) {
deleteSharedLink,
getSharedMessages,
deleteAllSharedLinks,
deleteConvoSharedLink,
};
}