gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8118 from FreeCodeCamp/revert-8006-fix/brownie-points

Browse Source 
Revert "Fix give-brownie-points/about API DB queries"
This commit is contained in:
Berkeley Martinez
2016-04-14 17:39:37 -07:00
parent 190a10e190 17915e7ecf
commit 0427d9e85d
2 changed files with 78 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

185
common/models/user.js
View File

@ -1,26 +1,26 @@
import { Disposable, Observable, Scheduler } from 'rx'; import { Observable } from 'rx';
import uuid from 'node-uuid'; import uuid from 'node-uuid';
import moment from 'moment'; import moment from 'moment';
import dedent from 'dedent'; import dedent from 'dedent';
import debug from 'debug'; import debugFactory from 'debug';
import { saveUser, observeMethod } from '../../server/utils/rx';
import { blacklistedUsernames } from '../../server/utils/constants'; import { blacklistedUsernames } from '../../server/utils/constants';
const log = debug('fcc:user:remote'); const debug = debugFactory('fcc:user:remote');
const BROWNIEPOINTS_TIMEOUT = [1, 'hour']; const BROWNIEPOINTS_TIMEOUT = [1, 'hour'];
const aboutFilter = {
username: true,
bio: true
};
function getAboutProfile({ function getAboutProfile({
username, username,
bio, githubProfile: github,
points progressTimestamps = [],
bio
}) { }) {
return { return {
username, username,
bio, github,
browniePoints: points browniePoints: progressTimestamps.length,
bio
}; };
} }
@ -54,31 +54,8 @@ module.exports = function(User) {
User.on('dataSourceAttached', () => { User.on('dataSourceAttached', () => {
User.findOne$ = Observable.fromNodeCallback(User.findOne, User); User.findOne$ = Observable.fromNodeCallback(User.findOne, User);
User.findById$ = Observable.fromNodeCallback(User.findById, User);
User.update$ = Observable.fromNodeCallback(User.updateAll, User); User.update$ = Observable.fromNodeCallback(User.updateAll, User);
User.count$ = Observable.fromNodeCallback(User.count, User); User.count$ = Observable.fromNodeCallback(User.count, User);
// getPointsById$(_id: String|ObjectId) => Observable[Number]
User.getPointsById$ = function getPointsById$(id) {
return Observable.create(observer => {
let isDisposed = false;
// safe ObjectID creation
// MongoID(id: ObjectID|String) => ObjectID
// MongoDB requires id's to be of type ObjectID
const _id = this.app.dataSources.db.connector.getDefaultIdType()(id);
this.app.dataSources.db.connector
.collection('user')
.aggregate([
{ $match: { _id } },
{ $project: { points: { $size: '$progressTimestamps' } } }
], (err, [ { points = 1 } = {}]) => {
if (isDisposed) { return null; }
if (err) { return observer.onError(err); }
observer.onNext(points);
return observer.onCompleted();
});
return Disposable.create(() => { isDisposed = true; });
});
};
}); });
User.observe('before save', function({ instance: user }, next) { User.observe('before save', function({ instance: user }, next) {
@ -99,7 +76,7 @@ module.exports = function(User) {
next(); next();
}); });
log('setting up user hooks'); debug('setting up user hooks');
User.afterRemote('confirm', function(ctx) { User.afterRemote('confirm', function(ctx) {
ctx.req.flash('success', { ctx.req.flash('success', {
msg: [ msg: [
@ -151,9 +128,9 @@ module.exports = function(User) {
} }
// the email of the requested user // the email of the requested user
log(info.email); debug(info.email);
// the temp access token to allow password reset // the temp access token to allow password reset
log(info.accessToken.id); debug(info.accessToken.id);
// requires AccessToken.belongsTo(User) // requires AccessToken.belongsTo(User)
var mailOptions = { var mailOptions = {
to: info.email, to: info.email,
@ -173,7 +150,7 @@ module.exports = function(User) {
User.app.models.Email.send(mailOptions, function(err) { User.app.models.Email.send(mailOptions, function(err) {
if (err) { console.error(err); } if (err) { console.error(err); }
log('email reset sent'); debug('email reset sent');
}); });
}); });
@ -196,7 +173,7 @@ module.exports = function(User) {
}; };
if (accessToken && accessToken.id) { if (accessToken && accessToken.id) {
log('setting cookies'); debug('setting cookies');
res.cookie('access_token', accessToken.id, config); res.cookie('access_token', accessToken.id, config);
res.cookie('userId', accessToken.userId, config); res.cookie('userId', accessToken.userId, config);
} }
@ -204,7 +181,7 @@ module.exports = function(User) {
return req.logIn({ id: accessToken.userId.toString() }, function(err) { return req.logIn({ id: accessToken.userId.toString() }, function(err) {
if (err) { return next(err); } if (err) { return next(err); }
log('user logged in'); debug('user logged in');
if (req.session && req.session.returnTo) { if (req.session && req.session.returnTo) {
var redirectTo = req.session.returnTo; var redirectTo = req.session.returnTo;
@ -240,7 +217,7 @@ module.exports = function(User) {
if (!username && !email) { if (!username && !email) {
return Promise.resolve(false); return Promise.resolve(false);
} }
log('checking existence'); debug('checking existence');
// check to see if username is on blacklist // check to see if username is on blacklist
if (username && blacklistedUsernames.indexOf(username) !== -1) { if (username && blacklistedUsernames.indexOf(username) !== -1) {
@ -253,7 +230,7 @@ module.exports = function(User) {
} else { } else {
where.email = email ? email.toLowerCase() : email; where.email = email ? email.toLowerCase() : email;
} }
log('where', where); debug('where', where);
return User.count(where) return User.count(where)
.then(count => count > 0); .then(count => count > 0);
}; };
@ -294,23 +271,16 @@ module.exports = function(User) {
)); ));
}); });
} }
username = username.toLowerCase(); return User.findOne({ where: { username } }, (err, user) => {
const filter = { if (err) {
where: { username }, return cb(err);
fields: { id: true, ...aboutFilter } }
}; if (!user || user.username !== username) {
return User.findOne$(filter) return cb(new Error(`no user found for ${ username }`));
.doOnNext(user => { }
if (!user || user.username !== username) { const aboutUser = getAboutProfile(user);
throw new Error(`no user found for ${ username }`); return cb(null, aboutUser);
} });
})
.flatMap(user => user.getPoints$().map(user))
.map(user => getAboutProfile(user))
.subscribe(
aboutUser => cb(null, aboutUser),
cb
);
}; };
User.remoteMethod( User.remoteMethod(
@ -338,8 +308,7 @@ module.exports = function(User) {
User.giveBrowniePoints = User.giveBrowniePoints =
function giveBrowniePoints(receiver, giver, data = {}, dev = false, cb) { function giveBrowniePoints(receiver, giver, data = {}, dev = false, cb) {
receiver = receiver.toLowerCase(); const findUser = observeMethod(User, 'findOne');
giver = giver.toLowerCase();
if (!receiver) { if (!receiver) {
return nextTick(() => { return nextTick(() => {
cb( cb(
@ -352,84 +321,63 @@ module.exports = function(User) {
cb(new TypeError(`giver should be a string but got ${ giver }`)); cb(new TypeError(`giver should be a string but got ${ giver }`));
}); });
} }
if (giver === receiver) {
return nextTick(() => {
cb(new Error('giver and receiver must be different users'));
});
}
let temp = moment(); let temp = moment();
const browniePoints = temp const browniePoints = temp
.subtract.apply(temp, BROWNIEPOINTS_TIMEOUT) .subtract.apply(temp, BROWNIEPOINTS_TIMEOUT)
.valueOf(); .valueOf();
const user$ = User.findOne$({ const user$ = findUser({ where: { username: receiver }});
where: { username: receiver },
fields: { return user$
...aboutFilter, .tapOnNext((user) => {
progressTimestamps: true
}
});
const giver$ = User.count$({ username: giver });
return Observable.combineLatest(
user$,
giver$,
(user, giver) => ({ doesGiverExist: !!giver, user })
)
.tapOnNext(({ user, doesGiverExist }) => {
if (!user) { if (!user) {
throw new Error(`could not find receiver for ${ receiver }`); throw new Error(`could not find receiver for ${ receiver }`);
} }
if (!doesGiverExist) {
throw new Error(`no user found for giver '${giver}'`);
}
}) })
.flatMap(({ progressTimestamps = [] }) => { .flatMap(({ progressTimestamps = [] }) => {
return Observable.from( return Observable.from(progressTimestamps);
progressTimestamps,
null,
null,
Scheduler.default
);
}) })
// filter out non objects // filter out non objects
.filter((timestamp) => !!timestamp || typeof timestamp === 'object') .filter((timestamp) => !!timestamp || typeof timestamp === 'object')
// filterout timestamps older then an hour // filterout timestamps older then an hour
.filter(({ timestamp = 0 }) => timestamp >= browniePoints) .filter(({ timestamp = 0 }) => {
return timestamp >= browniePoints;
})
// filter out brownie points given by giver // filter out brownie points given by giver
.filter(browniePoint => browniePoint.giver === giver) .filter((browniePoint) => {
return browniePoint.giver === giver;
})
// no results means this is the first brownie point given by giver // no results means this is the first brownie point given by giver
// so return -1 to indicate receiver should receive point // so return -1 to indicate receiver should receive point
.first({ defaultValue: -1 }) .first({ defaultValue: -1 })
.flatMap(browniePointsFromGiver => { .flatMap((browniePointsFromGiver) => {
if (browniePointsFromGiver === -1) { if (browniePointsFromGiver === -1) {
const updateData = {
$push: { return user$.flatMap((user) => {
progressTimestamps: { user.progressTimestamps.push({
giver, giver,
timestamp: Date.now() timestamp: Date.now(),
} ...data
}
};
return user$
.flatMap(user => user.update$(updateData).map(user))
.doOnNext(user => {
user.points = user.progressTimestamps.length + 1;
}); });
return saveUser(user);
});
} }
return Observable.throw( return Observable.throw(
new Error(`${ giver } already gave ${ receiver } points`) new Error(`${ giver } already gave ${ receiver } points`)
); );
}) })
.subscribe( .subscribe(
user => cb( (user) => {
null, return cb(
getAboutProfile(user), null,
dev ? getAboutProfile(user),
{ giver, receiver, data } : dev ?
null { giver, receiver, data } :
), null
e => cb(e, null, dev ? { giver, receiver, data } : null), );
},
(e) => cb(e, null, dev ? { giver, receiver, data } : null),
() => { () => {
log('brownie points assigned completed'); debug('brownie points assigned completed');
} }
); );
}; };
@ -475,7 +423,7 @@ module.exports = function(User) {
} }
); );
// user.update$(updateData: Object) => Observable[Number] // user.updateTo$(updateData: Object) => Observable[Number]
User.prototype.update$ = function update$(updateData) { User.prototype.update$ = function update$(updateData) {
const id = this.getId(); const id = this.getId();
const updateOptions = { allowExtendedOperators: true }; const updateOptions = { allowExtendedOperators: true };
@ -493,7 +441,7 @@ module.exports = function(User) {
} }
return this.constructor.update$({ id }, updateData, updateOptions); return this.constructor.update$({ id }, updateData, updateOptions);
}; };
User.prototype.getTimestamps = function getTimestamps() { User.prototype.getPoints$ = function getPoints$() {
const id = this.getId(); const id = this.getId();
const filter = { const filter = {
where: { id }, where: { id },
@ -517,11 +465,4 @@ module.exports = function(User) {
return user.challengeMap; return user.challengeMap;
}); });
}; };
// user.getPoints$() => Observable[Number]
User.prototype.getPoints$ = function getPoints$() {
const id = this.getId();
return this.constructor
.getPointsById$(id)
.doOnNext(points => { this.points = points; });
};
}; };

30
server/component-passport.js
View File

@ -1,4 +1,3 @@
import { Observable } from 'rx';
import passport from 'passport'; import passport from 'passport';
import { PassportConfigurator } from 'loopback-component-passport'; import { PassportConfigurator } from 'loopback-component-passport';
import passportProviders from './passport-providers'; import passportProviders from './passport-providers';
@ -71,21 +70,22 @@ PassportConfigurator.prototype.init = function passportInit(noSession) {
}); });
passport.deserializeUser((id, done) => { passport.deserializeUser((id, done) => {
Observable.combineLatest(
this.userModel.findById$(id, { fields }), this.userModel.findById(id, { fields }, (err, user) => {
this.userModel.getPointsById$(id), if (err || !user) {
(user, points) => { return done(err, user);
if (user) { user.points = points; }
return user;
} }
) return this.app.dataSources.db.connector
.doOnNext(user => { .collection('user')
if (!user) { throw new Error('deserialize found no user'); } .aggregate([
}) { $match: { _id: user.id } },
.subscribe( { $project: { points: { $size: '$progressTimestamps' } } }
user => done(null, user), ], function(err, [{ points = 1 } = {}]) {
done if (err) { return done(err); }
); user.points = points;
return done(null, user);
});
});
}); });
}; };