Fix 2FA
This commit is contained in:
1 parent
6f3dc0c05a
commit
a6fc9f445f
6 files changed
+55
-154
No files matched your search
@@ -155,7 +155,7 @@ router.post('/login', async (req, res, next) => {
|
||||
|
||||
router.get('/me', requireAuth, (req, res) => {
|
||||
const user = db
|
||||
.prepare('SELECT id, email, display_name, role, email_verified FROM users WHERE id = ?')
|
||||
.prepare('SELECT id, email, display_name, role, email_verified, totp_enabled FROM users WHERE id = ?')
|
||||
.get(req.user.id);
|
||||
res.json({ user });
|
||||
});
|
||||
@@ -525,16 +525,17 @@ router.get('/trusted-devices', requireAuth, (req, res, next) => {
|
||||
try {
|
||||
const currentToken = req.headers['x-device-token'] || null;
|
||||
const devices = db.prepare(
|
||||
"SELECT id, token, user_agent, ip_address, created_at, expires_at FROM two_fa_trusted_devices WHERE user_id=? AND expires_at > datetime('now') ORDER BY created_at DESC"
|
||||
"SELECT id, token, user_agent, ip_address, created_at, expires_at, last_seen_at FROM two_fa_trusted_devices WHERE user_id=? AND expires_at > datetime('now') ORDER BY created_at DESC"
|
||||
).all(req.user.id);
|
||||
|
||||
const result = devices.map(d => ({
|
||||
id: d.id,
|
||||
isCurrent: !!(currentToken && d.token === currentToken),
|
||||
user_agent: d.user_agent,
|
||||
ip_address: d.ip_address,
|
||||
created_at: d.created_at,
|
||||
expires_at: d.expires_at,
|
||||
id: d.id,
|
||||
isCurrent: !!(currentToken && d.token === currentToken),
|
||||
user_agent: d.user_agent,
|
||||
ip_address: d.ip_address,
|
||||
created_at: d.created_at,
|
||||
expires_at: d.expires_at,
|
||||
last_seen_at: d.last_seen_at,
|
||||
}));
|
||||
|
||||
res.json(result);
|
||||
|
||||
Reference in new issue
Block a user