starred/unifi-voucher-site
1
0
Fork 0
mirror of https://github.com/glenndehaan/unifi-voucher-site.git synced 2026-04-05 08:54:17 -04:00
Code Issues Packages Projects Releases Wiki Activity

Moved fetchUserInfo call to authorization.js middleware. Catch fetchUserInfo exceptions, causing invalided session to be stuck

Browse Source
This commit is contained in:
Glenn de Haan
2025-11-11 18:57:04 +01:00
parent 10f95864f9
commit 7bffaa4ebb
4 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/status.js
View File

@@ -21,7 +21,7 @@ module.exports = {
* @param res * @param res
*/ */
get: async (req, res) => { get: async (req, res) => {
const user = req.oidc ? await req.oidc.fetchUserInfo() : { email: 'admin' }; const user = req.oidc ? req.user : { email: 'admin' };
res.render('status', { res.render('status', {
baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '', baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',

2
controllers/voucher.js
View File

@@ -77,7 +77,7 @@ module.exports = {
return; return;
} }
const user = req.oidc ? await req.oidc.fetchUserInfo() : { email: null }; const user = req.oidc ? req.user : { email: null };
const voucherNote = `${req.body['voucher-note'] !== '' ? req.body['voucher-note'] : ''}||;;||web||;;||${req.oidc ? 'oidc' : 'local'}||;;||${req.oidc ? user.email.split('@')[1].toLowerCase() : ''}`; const voucherNote = `${req.body['voucher-note'] !== '' ? req.body['voucher-note'] : ''}||;;||web||;;||${req.oidc ? 'oidc' : 'local'}||;;||${req.oidc ? user.email.split('@')[1].toLowerCase() : ''}`;
// Create voucher code // Create voucher code

2
controllers/vouchers.js
View File

@@ -59,7 +59,7 @@ module.exports = {
return; return;
} }
const user = req.oidc ? await req.oidc.fetchUserInfo() : { email: 'admin' }; const user = req.oidc ? req.user : { email: 'admin' };
res.render('voucher', { res.render('voucher', {
baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '', baseUrl: req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : '',

9
middlewares/authorization.js
View File

@@ -51,6 +51,15 @@ module.exports = {
// Check if OIDC is enabled then verify user status // Check if OIDC is enabled then verify user status
if(variables.authOidcEnabled) { if(variables.authOidcEnabled) {
oidc = req.oidc.isAuthenticated(); oidc = req.oidc.isAuthenticated();
// Retrieve user info/verify user session is still valid
req.user = await req.oidc.fetchUserInfo().catch(() => {
res.redirect(302, `${req.headers['x-ingress-path'] ? req.headers['x-ingress-path'] : ''}/login`);
});
if(!req.user) {
return;
}
} }
// Check if user is authorized by a service // Check if user is authorized by a service