mirror of
https://github.com/fallenbagel/jellyseerr.git
synced 2026-01-05 06:08:36 -05:00
fix(api): save user email on the first try (#760)
* fix(api): save user email on the first try fix #227 * fix(api): remove todo * fix(logging): handle media server connection refused error/toast (#748) * fix(logging): handle media server connection refused error/toast Properly log as connection refused if the jellyfin/emby server is unreachable. Previously it used to throw a credentials error which lead to a lot of confusion * refactor(i8n): extract translation keys * refactor(auth): error message for a more consistent format * refactor(auth/errors): use custom error types and error codes instead of abusing error messages * refactor(i8n): replace connection refused translation key with invalidurl * fix(error): combine auth and api error class into a single one called network error * fix(error): use the new network error and network error codes in auth/api * refactor(error): rename NetworkError to ApiError --------- Co-authored-by: Fallenbagel <98979876+Fallenbagel@users.noreply.github.com>
This commit is contained in:
@@ -98,6 +98,7 @@ userSettingsRoutes.post<
|
|||||||
}
|
}
|
||||||
|
|
||||||
user.username = req.body.username;
|
user.username = req.body.username;
|
||||||
|
user.email = req.body.email ?? user.email;
|
||||||
|
|
||||||
// Update quota values only if the user has the correct permissions
|
// Update quota values only if the user has the correct permissions
|
||||||
if (
|
if (
|
||||||
@@ -127,20 +128,19 @@ userSettingsRoutes.post<
|
|||||||
user.settings.originalLanguage = req.body.originalLanguage;
|
user.settings.originalLanguage = req.body.originalLanguage;
|
||||||
user.settings.watchlistSyncMovies = req.body.watchlistSyncMovies;
|
user.settings.watchlistSyncMovies = req.body.watchlistSyncMovies;
|
||||||
user.settings.watchlistSyncTv = req.body.watchlistSyncTv;
|
user.settings.watchlistSyncTv = req.body.watchlistSyncTv;
|
||||||
user.email = req.body.email ?? user.email;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
await userRepository.save(user);
|
const savedUser = await userRepository.save(user);
|
||||||
|
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
username: user.username,
|
username: savedUser.username,
|
||||||
discordId: user.settings.discordId,
|
discordId: savedUser.settings?.discordId,
|
||||||
locale: user.settings.locale,
|
locale: savedUser.settings?.locale,
|
||||||
region: user.settings.region,
|
region: savedUser.settings?.region,
|
||||||
originalLanguage: user.settings.originalLanguage,
|
originalLanguage: savedUser.settings?.originalLanguage,
|
||||||
watchlistSyncMovies: user.settings.watchlistSyncMovies,
|
watchlistSyncMovies: savedUser.settings?.watchlistSyncMovies,
|
||||||
watchlistSyncTv: user.settings.watchlistSyncTv,
|
watchlistSyncTv: savedUser.settings?.watchlistSyncTv,
|
||||||
email: user.email,
|
email: savedUser.email,
|
||||||
});
|
});
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
next({ status: 500, message: e.message });
|
next({ status: 500, message: e.message });
|
||||||
|
|||||||
Reference in New Issue
Block a user