From 98887eecce353d593b6fec590c4f81b357963fc5 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Mon, 26 Jun 2023 22:26:06 +1000 Subject: [PATCH] Fixed a logout bug --- server/database/models/banned-ip-addresses.js | 2 ++ server/utilities/banned-ip-addresses-middleware.js | 2 +- tools/react/token-provider.jsx | 7 +------ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/server/database/models/banned-ip-addresses.js b/server/database/models/banned-ip-addresses.js index ebfc71e..ffd2b24 100644 --- a/server/database/models/banned-ip-addresses.js +++ b/server/database/models/banned-ip-addresses.js @@ -1,6 +1,8 @@ const Sequelize = require('sequelize'); const sequelize = require('..'); +//DOCS: this isn't set by anything - it's a stub for now + module.exports = sequelize.define('bannedIPAddresses', { content: { type: 'varchar(320)', diff --git a/server/utilities/banned-ip-addresses-middleware.js b/server/utilities/banned-ip-addresses-middleware.js index 352c593..ed151d9 100644 --- a/server/utilities/banned-ip-addresses-middleware.js +++ b/server/utilities/banned-ip-addresses-middleware.js @@ -27,7 +27,7 @@ module.exports = async (req, res, next) => { return res.status(403).send("IP address banned"); } - console.log(`IP allowed\t${address}\t\t\t${date.toTimeString()}`); + // console.log(`IP allowed\t${address}\t\t\t${date.toTimeString()}`); return next(); }; \ No newline at end of file diff --git a/tools/react/token-provider.jsx b/tools/react/token-provider.jsx index 1a50e94..3baa8d8 100644 --- a/tools/react/token-provider.jsx +++ b/tools/react/token-provider.jsx @@ -25,18 +25,13 @@ const TokenProvider = props => { localStorage.setItem("accessToken", accessToken); }, [accessToken]); - //force a logout if refresh token is too old - if (accessToken && (new Date(Date.now() - 60 * 60 * 24 * 30 * 1000).getTime() > decode(accessToken).exp * 1000)) { - forceLogout(); - } - //wrap the default fetch function const tokenFetch = async (url, options) => { //use this? let bearer = accessToken; //if expired (10 minutes, normally) - const expired = new Date(decode(accessToken).exp * 1000) < Date.now(); + const expired = new Date(decode(accessToken).exp + 600) < Date.now(); if (expired) { //BUGFIX: if logging out, just skip over the refresh token