Skip to content

ScopedUser Logout Error #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djwglpuppy wants to merge 4 commits into
base: master
Choose a base branch
from
Open

ScopedUser Logout Error #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5661173
Created NonExistent Scoped User Error
djwglpuppy May 27, 2012
83932fe
Added an optional error callback to the middlewareCallBack for scope …
djwglpuppy May 29, 2012
3abeabe
Code Cleanup
djwglpuppy May 29, 2012
32a8cf1
More Code Cleanup
djwglpuppy May 29, 2012
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
4 changes: 2 additions & 2 deletions lib/auth_middleware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ module.exports = function(optionsOrStrategy) {
middlewareCallback= scope;
scope= undefined;
}
RequestMethods.logout.call( this, {scope:scope, request:req, response:res}, logoutHandler, function() {
RequestMethods.logout.call( this, {scope:scope, request:req, response:res}, logoutHandler, function(err) {
//Clear out the saved auth details
//TODO: this should be scope-aware.
createAuthDetails( req );
Expand All @@ -90,7 +90,7 @@ module.exports = function(optionsOrStrategy) {
traceFunction( message, {scope:scope, request:req, response:res}, linePrefix );
};

if( middlewareCallback) middlewareCallback();
if( middlewareCallback) middlewareCallback(err);
})
};

Expand Down
31 changes: 18 additions & 13 deletions lib/requestMethods.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

/*!
* Copyright(c) 2010 Ciaran Jessup <ciaranj@gmai.com>
* MIT Licensed
Expand Down Expand Up @@ -155,17 +156,21 @@ module.exports.isUnAuthenticated= function(scope) {
};

module.exports.logout= function( authContext, logoutHandler, middlewareCallback ) {
var ad= this.getAuthDetails();
ad.trace( "Logout", authContext.scope, "!!!" );
var user;
if( authContext.scope === undefined) {
user= ad.user;
delete ad.user;
ad.scopedUsers= {};
}
else {
user= ad.scopedUsers[authContext.scope].user;
delete ad.scopedUsers[authContext.scope].user;
}
logoutHandler( authContext, user, middlewareCallback );
var user, err;
var ad= this.getAuthDetails();
ad.trace( "Logout", authContext.scope, "!!!" );
if( authContext.scope === undefined) {
user= ad.user;
delete ad.user;
ad.scopedUsers= {};
}
else {
try {
user= ad.scopedUsers[authContext.scope].user;
delete ad.scopedUsers[authContext.scope].user;
} catch(error){
err= new Error('There are no user credentials associated with the scope: "' + authContext.scope + '"');
}
}
logoutHandler( authContext, user, middlewareCallback(err));
};