diff --git a/server/config/config.example.js b/server/config/config.example.js index 070da540..633a440e 100644 --- a/server/config/config.example.js +++ b/server/config/config.example.js @@ -266,7 +266,8 @@ module.exports = peer.picture = userinfo.picture; } } - if(userinfo['urn:oid:0.9.2342.19200300.100.1.60'] != null ){ + if (userinfo['urn:oid:0.9.2342.19200300.100.1.60'] != null) + { peer.picture = `data:image/jpeg;base64, ${userinfo['urn:oid:0.9.2342.19200300.100.1.60']}`; } diff --git a/server/server.js b/server/server.js index 1b560a23..eb20ef9a 100755 --- a/server/server.js +++ b/server/server.js @@ -88,8 +88,9 @@ const app = express(); app.use(helmet.hsts()); const sharedCookieParser=cookieParser(); + app.use(sharedCookieParser); -app.use(bodyParser.json( { limit: '5mb' })); +app.use(bodyParser.json({ limit: '5mb' })); app.use(bodyParser.urlencoded({ limit: '5mb', extended: true })); const session = expressSession({ @@ -418,7 +419,9 @@ async function setupAuth() peerId : req.query.peerId, roomId : req.query.roomId })); - if (authStrategy== 'saml') { + + if (authStrategy== 'saml') + { req.session.samlstate=state; } @@ -505,14 +508,15 @@ async function setupAuth() try { let state; + if (authStrategy == 'saml') state=req.session.samlstate; else { if (req.method === 'GET') - state = JSON.parse(base64.decode(req.query.state)); - if (req.method === 'POST') - state = JSON.parse(base64.decode(req.body.state)); + state = JSON.parse(base64.decode(req.query.state)); + if (req.method === 'POST') + state = JSON.parse(base64.decode(req.body.state)); } const { peerId, roomId } = state; @@ -654,7 +658,9 @@ async function runWebSocketServer() { io = require('socket.io')(mainListener); - io.use(sharedSession(session, sharedCookieParser, { autoSave : true },{cookie: false})); + io.use( + sharedSession(session, sharedCookieParser, { autoSave: true }, { cookie: false }) + ); // Handle connections from clients. io.on('connection', (socket) =>