verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #247 from haio/master 

Ensure roleId and principalId to be string in Role#isInRole
This commit is contained in:
Raymond Feng 2014-05-02 22:55:20 -07:00
parent 1077a7f288 429052a0db
commit 6afa95311c
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/models/role.js
View File

@ -373,8 +373,14 @@ Role.isInRole = function (role, context, callback) {
async.some(context.principals, function (p, done) { async.some(context.principals, function (p, done) {
var principalType = p.type || undefined; var principalType = p.type || undefined;
var principalId = p.id || undefined; var principalId = p.id || undefined;
var roleId = result.id.toString();
if(principalId !== null && principalId !== undefined && (typeof principalId !== 'string') ) {
principalId = principalId.toString();
}
if (principalType && principalId) { if (principalType && principalId) {
roleMappingModel.findOne({where: {roleId: result.id, roleMappingModel.findOne({where: {roleId: roleId,
principalType: principalType, principalId: principalId}}, principalType: principalType, principalId: principalId}},
function (err, result) { function (err, result) {
debug('Role mapping found: %j', result); debug('Role mapping found: %j', result);