Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ role.onUnauthorizedFailure( function( req, res ){
res.redirect( '/' );
});

// Define where the user session is on the request object
role.userSessionHandler( function( req ) {
// Example using custom Passport auth
return req.user;
});

// Сonnect a middleware
app.use( role.middleware() );

Expand Down
35 changes: 25 additions & 10 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function Acl( rolesConfig ){
this.roles = rolesConfig;
this.authorizedFailureHandler = null;
this.unauthorizedFailureHandler = null;
this.userSessionHandler = null;
}


Expand All @@ -41,7 +42,7 @@ Acl.prototype.is = function( roleName, failureBack ){
if ( req.role && req.role.is(roleName) )
next();
else
acl.handleFailure( req, res, next, failureBack )
acl.handleFailure( req, res, next, failureBack );
};
};

Expand All @@ -56,7 +57,7 @@ Acl.prototype.isAny = function( roles, failureBack ){
if ( req.role && req.role.isAny(roles) )
next();
else
acl.handleFailure( req, res, next, failureBack )
acl.handleFailure( req, res, next, failureBack );
};
};

Expand Down Expand Up @@ -105,7 +106,7 @@ Acl.prototype.can = function( permissionName, failureBack ){
if ( req.role && req.role.can(permissionName) )
next();
else
acl.handleFailure( req, res, next, failureBack )
acl.handleFailure( req, res, next, failureBack );
};
};

Expand All @@ -125,20 +126,34 @@ Acl.prototype.onUnauthorizedFailure = function( fn ){
this.unauthorizedFailureHandler = fn;
};

/**
* @param {Function} fn
*/
Acl.prototype.userSessionHandler = function( fn ){
this.userSessionHandler = fn;
};

Acl.prototype.middleware = function(){
var acl = this;
return function( req, res, next ){
req.role = new Role( acl.roles );
res.locals.role = req.role;
if ( req.session && req.session.user ){
if ( req.session.user.role )
req.role.addRole( req.session.user.role );
else
req.role.setAuthorized( true );

var user = req.session && req.session.user;

// Allow custom lookup of user
if (typeof acl.userSessionHandler === 'function') {
user = acl.userSessionHandler(req);
}

if ( user.role ) {
req.role.addRole( user.role );
} else {
req.role.setAuthorized( true );
}

next();
}
};
};


Expand Down Expand Up @@ -237,4 +252,4 @@ Role.prototype.removeRole = function( roleName ){

Role.prototype.setAuthorized = function( val ){
this.authorized = !!val;
};
};