Archives/gristlabs_grist-core
1
0
Fork 0
mirror of https://github.com/gristlabs/grist-core.git synced 2024-10-27 20:44:07 +00:00
Code Issues Projects Releases Wiki Activity

[comm] Use getRequestProfile from Authorizer

Browse Source
This commit is contained in:
Thomas Karolski 2022-03-12 20:31:53 +01:00 committed by Thomas Karolski
parent 9f3ed989c4
commit e5dc2d198f
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/server/lib/Comm.js
View File

@ -50,6 +50,7 @@ const {parseFirstUrlPart} = require('app/common/gristUrls');
const version = require('app/common/version'); const version = require('app/common/version');
const {Client} = require('./Client'); const {Client} = require('./Client');
const {localeFromRequest} = require('app/server/lib/ServerLocale'); const {localeFromRequest} = require('app/server/lib/ServerLocale');
const {getRequestProfile} = require('app/server/lib/Authorizer');
// Bluebird promisification, to be able to use e.g. websocket.sendAsync method. // Bluebird promisification, to be able to use e.g. websocket.sendAsync method.
Promise.promisifyAll(ws.prototype); Promise.promisifyAll(ws.prototype);
@ -151,18 +152,16 @@ Comm.prototype._broadcastMessage = function(type, data, clients) {
}; };
/**
* Returns a profile based on the request or session.
*/
Comm.prototype._getSessionProfile = function(scopedSession, req) { Comm.prototype._getSessionProfile = function(scopedSession, req) {
// apply x-remote-user header as a profile if the header was set const profile = getRequestProfile(req);
if (req.headers && req.headers['x-remote-user']) { if (profile)
const userName = req.headers['x-remote-user'].toString(); return Promise.resolve(profile);
return Promise.resolve({ else
"email": userName,
"name": userName,
});
}
return scopedSession.getSessionProfile(); return scopedSession.getSessionProfile();
} };
/** /**