shpaq/sct-overseerr
1
0
Fork 0
mirror of https://github.com/sct/overseerr.git synced 2025-09-17 17:24:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(locale): properly restore display language upon page refresh (#1646)

Browse Source 
* fix(locale): properly restore display language upon page refresh

* refactor: dedupe logic
This commit is contained in:
TheCatLady
2021-05-16 21:13:52 -04:00
committed by GitHub
parent 928b8a71cf
commit e85d1ce94e
3 changed files with 21 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/middleware/auth.ts
View File

@@ -5,36 +5,35 @@ import { getSettings } from '../lib/settings';
export const checkUser: Middleware = async (req, _res, next) => {
const settings = getSettings();
let user: User | undefined;
if (req.header('X-API-Key') === settings.main.apiKey) {
const userRepository = getRepository(User);
let userId = 1; // Work on original administrator account
// If a User ID is provided, we will act on that users behalf
// If a User ID is provided, we will act on that user's behalf
if (req.header('X-API-User')) {
userId = Number(req.header('X-API-User'));
}
const user = await userRepository.findOne({ where: { id: userId } });
if (user) {
req.user = user;
}
user = await userRepository.findOne({ where: { id: userId } });
} else if (req.session?.userId) {
const userRepository = getRepository(User);
const user = await userRepository.findOne({
user = await userRepository.findOne({
where: { id: req.session.userId },
});
if (user) {
req.user = user;
req.locale = user.settings?.locale
? user.settings?.locale
: settings.main.locale;
}
}
if (user) {
req.user = user;
}
req.locale = user?.settings?.locale
? user.settings.locale
: settings.main.locale;
next();
};