mirror/seerr
1
0
Fork 0
mirror of https://github.com/seerr-team/seerr.git synced 2026-06-15 11:59:11 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(userSettings): improve account linking logic to prevent conflicts with existing users

Browse Source
This commit is contained in:
0xsysr3ll
2026-02-22 19:29:41 +01:00
parent d5f1b78993
commit ebffa1efa3
1 changed files with 25 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
server/routes/user/usersettings.ts
View File

@@ -403,12 +403,11 @@ userSettingsRoutes.post<{ username: string; password: string }>(
});
}
// Do not allow linking of an already linked account
if (
await userRepository.exist({
where: { jellyfinUsername: req.body.username },
})
) {
// Do not allow linking of an already linked account (by another user)
const existingByUsername = await userRepository.findOne({
where: { jellyfinUsername: req.body.username },
});
if (existingByUsername && existingByUsername.id !== req.user!.id) {
return res.status(422).json({
message: 'The specified account is already linked to a Seerr user',
});
@@ -440,19 +439,31 @@ userSettingsRoutes.post<{ username: string; password: string }>(
clientIp
);
// Do not allow linking of an already linked account
if (
await userRepository.exist({
where: { jellyfinUserId: account.User.Id },
})
) {
const user = req.user;
const existingByUserId = await userRepository.findOne({
where: { jellyfinUserId: account.User.Id },
});
if (existingByUserId) {
if (existingByUserId.id === user.id) {
if (isMainJellyfin) {
user.userType =
settings.main.mediaServerType === MediaServerType.EMBY
? UserType.EMBY
: UserType.JELLYFIN;
}
user.jellyfinUserId = account.User.Id;
user.jellyfinUsername = account.User.Name;
user.jellyfinAuthToken = account.AccessToken;
user.jellyfinDeviceId = deviceId;
await userRepository.save(user);
return res.status(204).send();
}
return res.status(422).json({
message: 'The specified account is already linked to a Seerr user',
});
}
const user = req.user;
if (isMainJellyfin) {
user.userType =
settings.main.mediaServerType === MediaServerType.EMBY