removes cookieParser and universal-cookie, adds external test router to demo server

This commit is contained in:
James
2020-07-06 12:34:07 -04:00
parent f18a524800
commit 45e6a38685
7 changed files with 37 additions and 44 deletions

View File

@@ -1,3 +1,5 @@
const parseCookies = require('../utilities/parseCookies');
const getExtractJWT = config => (req) => {
const jwtFromHeader = req.get('Authorization');
@@ -5,12 +7,12 @@ const getExtractJWT = config => (req) => {
return jwtFromHeader.replace('JWT ', '');
}
if (req.cookies) {
const jwt = req.cookies[`${config.cookiePrefix}-token`];
const cookies = parseCookies(req);
const tokenCookieName = `${config.cookiePrefix}-token`;
if (jwt) {
return jwt;
}
if (cookies && cookies[tokenCookieName]) {
const token = cookies[tokenCookieName];
return token;
}
return null;

View File

@@ -3,7 +3,6 @@ const passport = require('passport');
const compression = require('compression');
const bodyParser = require('body-parser');
const methodOverride = require('method-override');
const cookieParser = require('cookie-parser');
const qsMiddleware = require('qs-middleware');
const fileUpload = require('express-fileupload');
const localizationMiddleware = require('../../localization/middleware');
@@ -12,7 +11,6 @@ const identifyAPI = require('./identifyAPI');
const middleware = (config) => {
return [
cookieParser(),
passport.initialize(),
authenticate(config),
express.json(),

View File

@@ -1,6 +1,5 @@
const express = require('express');
const passport = require('passport');
const cookieParser = require('cookie-parser');
const getExecuteStaticPolicy = require('../auth/getExecuteStaticPolicy');
const authenticate = require('./middleware/authenticate');
@@ -11,7 +10,6 @@ function initStatic() {
if (config.upload) {
const router = express.Router();
router.use(cookieParser());
router.use(passport.initialize());
router.use(authenticate(this.config));

View File

@@ -0,0 +1,15 @@
function parseCookies(req) {
const list = {};
const rc = req.headers.cookie;
if (rc) {
rc.split(';').forEach((cookie) => {
const parts = cookie.split('=');
list[parts.shift().trim()] = decodeURI(parts.join('='));
});
}
return list;
}
module.exports = parseCookies;