Aaltronav/dougal-software
1
0
Fork 0
mirror of https://gitlab.com/wgp/dougal/software.git synced 2025-12-06 12:07:08 +00:00
Code Issues Packages Projects Releases Activity

Fix reading of credentials for issuing JWT

Browse Source
This commit is contained in:
D. Berge
2025-07-24 23:03:05 +02:00
parent 84c1385f88
commit 3ea82cb660
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/www/server/api/middleware/auth/authentify.js
View File

@@ -3,6 +3,7 @@ const { Netmask } = require('netmask');
const cfg = require('../../../lib/config'); const cfg = require('../../../lib/config');
const jwt = require('../../../lib/jwt'); const jwt = require('../../../lib/jwt');
const user = require('../../../lib/db/user'); const user = require('../../../lib/db/user');
const ServerUser = require('../../../lib/db/user/User');
async function authorisedIP (req, res) { async function authorisedIP (req, res) {
const validIPs = await user.ip({active: true}); // Get all active IP logins const validIPs = await user.ip({active: true}); // Get all active IP logins
@@ -78,11 +79,11 @@ async function auth (req, res, next) {
if (req.user.exp) { if (req.user.exp) {
const ttl = req.user.exp - Date.now()/1000; const ttl = req.user.exp - Date.now()/1000;
if (ttl < cfg.jwt.options.expiresIn/2) { if (ttl < cfg.jwt.options.expiresIn/2) {
const credentials = await user.get(req.user.id); const credentials = await ServerUser.fromSQL(null, req.user.id);
if (credentials) { if (credentials) {
// Refresh token // Refresh token
payload = Object.assign({}, credentials); payload = Object.assign({}, credentials.toJSON());
jwt.issue(Object.assign({}, credentials), req, res); jwt.issue(Object.assign({}, credentials.toJSON()), req, res);
} }
} }
} }