Fixed a logout bug
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
const Sequelize = require('sequelize');
|
const Sequelize = require('sequelize');
|
||||||
const sequelize = require('..');
|
const sequelize = require('..');
|
||||||
|
|
||||||
|
//DOCS: this isn't set by anything - it's a stub for now
|
||||||
|
|
||||||
module.exports = sequelize.define('bannedIPAddresses', {
|
module.exports = sequelize.define('bannedIPAddresses', {
|
||||||
content: {
|
content: {
|
||||||
type: 'varchar(320)',
|
type: 'varchar(320)',
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ module.exports = async (req, res, next) => {
|
|||||||
return res.status(403).send("IP address banned");
|
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();
|
return next();
|
||||||
};
|
};
|
||||||
@@ -25,18 +25,13 @@ const TokenProvider = props => {
|
|||||||
localStorage.setItem("accessToken", accessToken);
|
localStorage.setItem("accessToken", 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
|
//wrap the default fetch function
|
||||||
const tokenFetch = async (url, options) => {
|
const tokenFetch = async (url, options) => {
|
||||||
//use this?
|
//use this?
|
||||||
let bearer = accessToken;
|
let bearer = accessToken;
|
||||||
|
|
||||||
//if expired (10 minutes, normally)
|
//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) {
|
if (expired) {
|
||||||
//BUGFIX: if logging out, just skip over the refresh token
|
//BUGFIX: if logging out, just skip over the refresh token
|
||||||
|
|||||||
Reference in New Issue
Block a user