r
/
p5.js-web-editor
1
0
Fork 0
Code Issues 1 Pull Requests Releases 1 Wiki Activity

Fixes bug where lastUsedAt timestamp wasn't set when access token used

This commit is contained in:
Andrew Nicolaou 2019-05-15 14:07:46 +02:00 committed by Cassie Tarakajian
parent 27ea1c1e1b
commit 9f627c1c37
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
server/config/passport.js
View File

@ -46,12 +46,10 @@ passport.use(new BasicStrategy((userid, key, done) => {
User.findOne({ username: userid }, (err, user) => { // eslint-disable-line consistent-return User.findOne({ username: userid }, (err, user) => { // eslint-disable-line consistent-return
if (err) { return done(err); } if (err) { return done(err); }
if (!user) { return done(null, false); } if (!user) { return done(null, false); }
user.findMatchingKey(key, (innerErr, isMatch, keyID) => { user.findMatchingKey(key, (innerErr, isMatch, keyDocument) => {
if (isMatch) { if (isMatch) {
User.update( keyDocument.lastUsedAt = Date.now();
{ 'apiKeys._id': keyID }, user.save();
{ '$set': { 'apiKeys.$.lastUsedAt': Date.now() } }
);
return done(null, user); return done(null, user);
} }
return done(null, false, { msg: 'Invalid username or API key' }); return done(null, false, { msg: 'Invalid username or API key' });

2
server/models/user.js
View File

@ -133,7 +133,7 @@ userSchema.methods.findMatchingKey = function findMatchingKey(candidateKey, cb)
this.apiKeys.forEach((k) => { this.apiKeys.forEach((k) => {
if (bcrypt.compareSync(candidateKey, k.hashedKey)) { if (bcrypt.compareSync(candidateKey, k.hashedKey)) {
foundOne = true; foundOne = true;
cb(null, true, k._id); cb(null, true, k);
} }
}); });
if (!foundOne) cb('Matching API key not found !', false, null); if (!foundOne) cb('Matching API key not found !', false, null);