fixes bug introduced with csrf

This commit is contained in:
James
2020-08-21 15:44:03 -04:00
parent 60552d9d86
commit f91c47bb37
2 changed files with 4 additions and 5 deletions

View File

@@ -2,6 +2,7 @@ const parseCookies = require('../utilities/parseCookies');
const getExtractJWT = (config) => (req) => {
const jwtFromHeader = req.get('Authorization');
const origin = req.get('Origin');
if (jwtFromHeader && jwtFromHeader.indexOf('JWT ') === 0) {
return jwtFromHeader.replace('JWT ', '');
@@ -10,10 +11,8 @@ const getExtractJWT = (config) => (req) => {
const cookies = parseCookies(req);
const tokenCookieName = `${config.cookiePrefix}-token`;
if (cookies && cookies[tokenCookieName] && Array.isArray(config.csrf)) {
const { headers: { origin } = {} } = req;
if (config.csrf.indexOf(origin) > -1) {
if (cookies && cookies[tokenCookieName]) {
if (!origin || (config.csrf && config.csrf.indexOf(origin) > -1)) {
const token = cookies[tokenCookieName];
return token;
}