coolaj86
/
walnut.js
1
1
Fork 1
Code Issues Pull Requests Releases Activity

log cleanup

This commit is contained in:
AJ ONeal 2017-12-06 06:02:17 +00:00
parent 1e9618f5ec
commit fc07a8dd30
1 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/oauth3.js
View File

@ -9,8 +9,8 @@ function generateRescope(req, Models, decoded, fullPpid, ppid) {
console.log('[rescope] Attempting ', fullPpid); console.log('[rescope] Attempting ', fullPpid);
return Models.IssuerOauth3OrgGrants.find({ azpSub: fullPpid }).then(function (results) { return Models.IssuerOauth3OrgGrants.find({ azpSub: fullPpid }).then(function (results) {
if (results[0]) { if (results[0]) {
console.log('[rescope] lukcy duck: got it on the 1st try'); console.log('[rescope] lucky duck: got it on the 1st try');
return PromiseA.resolve(results); return results;
} }
// XXX BUG XXX // XXX BUG XXX
@ -20,24 +20,35 @@ function generateRescope(req, Models, decoded, fullPpid, ppid) {
var result = results[0]; var result = results[0];
if (!result || !result.sub || !decoded.iss) { if (!result || !result.sub || !decoded.iss) {
// XXX BUG XXX TODO swap this external ppid for an internal (and ask user to link with existing profile) console.log('[rescope] Not a 2nd party token...');
//req.oauth3.accountIdx = fullPpid; return Models.IssuerOauth3OrgProfiles.get(fullPpid);
console.log(decoded);
console.log(decoded.iss);
console.log(fullPpid);
console.log(ppid);
throw new Error("internal / external ID swapping not yet implemented. TODO: "
+ "No profile found with that credential. Would you like to create a new profile or link to an existing profile?");
} }
return result;
}).then(function (result) {
if (!result || !result.sub || !decoded.iss) {
// XXX BUG XXX TODO swap this external ppid for an internal (and ask user to link with existing profile)
//req.oauth3.accountIdx = fullPpid;
console.log('[DEBUG] decoded:');
console.log(decoded);
console.log('[DEBUG] decoded.iss:', decoded.iss);
console.log('[DEBUG] fullPpid:', fullPpid);
console.log('[DEBUG] ppid:', ppid);
throw new Error(
"TODO: No profile found with that credential. Would you like to create a new profile or link to an existing profile?"
);
}
// XXX BUG XXX need to pass own url in to use as issuer for own tokens // XXX BUG XXX need to pass own url in to use as issuer for own tokens
req.oauth3.accountIdx = result.sub + '@' + decoded.iss; req.oauth3.accountIdx = result.sub + '@' + (result.iss || decoded.iss);
console.log('[rescope] result:'); console.log('[rescope] result:');
console.log(results); console.log(result);
console.log(req.oauth3.accountIdx); console.log('[rescope] req.oauth3.accountIdx:', req.oauth3.accountIdx);
return PromiseA.resolve(req.oauth3.accountIdx); return req.oauth3.accountIdx;
}); });
}; };
} }