From 0d97ad2355cbd6a2acec9983bf4c47698a773272 Mon Sep 17 00:00:00 2001 From: Kata Date: Sun, 5 May 2019 12:58:40 -0500 Subject: [PATCH] [Server/auth] use better expiresAt matching --- Server/api/auth.js | 6 ++---- Server/services/sessions.js | 2 -- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Server/api/auth.js b/Server/api/auth.js index a426ef5..71e13f8 100644 --- a/Server/api/auth.js +++ b/Server/api/auth.js @@ -8,13 +8,11 @@ module.exports = (R, $) => { return } - console.log(ctx.session.expiresAt >= new Date(), ctx.session.expiresAt, new Date()) - - if (ctx.session.accessToken === undefined || ctx.session.expiresAt >= new Date()) { + if (ctx.session.accessToken === undefined || ctx.session.expiresAt < Date.now()) { const data = await $.discord.getAuthToken(token) ctx.session.accessToken = data.access_token ctx.session.refreshToken = data.refresh_token - ctx.session.expiresAt = new Date() + ctx.expires_in + ctx.session.expiresAt = Date.now() + (ctx.expires_in || 1000 * 60 * 60 * 24) } const user = await $.discord.getUser(ctx.session.accessToken) diff --git a/Server/services/sessions.js b/Server/services/sessions.js index bc91039..5f924f1 100644 --- a/Server/services/sessions.js +++ b/Server/services/sessions.js @@ -22,8 +22,6 @@ class SessionsService extends Service { session = this.Session.build({ id }) } - console.log(maxAge) - session.data = data session.maxAge = maxAge