diff --git a/lib/www/server/api/middleware/auth/authentify.js b/lib/www/server/api/middleware/auth/authentify.js index 8be7a14..84e5c29 100644 --- a/lib/www/server/api/middleware/auth/authentify.js +++ b/lib/www/server/api/middleware/auth/authentify.js @@ -3,6 +3,7 @@ const { Netmask } = require('netmask'); const cfg = require('../../../lib/config'); const jwt = require('../../../lib/jwt'); const user = require('../../../lib/db/user'); +const ServerUser = require('../../../lib/db/user/User'); async function authorisedIP (req, res) { 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) { const ttl = req.user.exp - Date.now()/1000; 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) { // Refresh token - payload = Object.assign({}, credentials); - jwt.issue(Object.assign({}, credentials), req, res); + payload = Object.assign({}, credentials.toJSON()); + jwt.issue(Object.assign({}, credentials.toJSON()), req, res); } } }