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

Replaced _.findWhere with .find function

Browse Source
This commit is contained in:
Sahat Yalkabov
2014-06-06 16:02:37 -04:00
parent d14bec326c
commit b05c12d6d4
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/passport.js
View File

@ -400,7 +400,7 @@ exports.isAuthenticated = function(req, res, next) {
exports.isAuthorized = function(req, res, next) { exports.isAuthorized = function(req, res, next) {
var provider = req.path.split('/').slice(-1)[0]; var provider = req.path.split('/').slice(-1)[0];
if (_.findWhere(req.user.tokens, { kind: provider })) { if (_.find(req.user.tokens, { kind: provider })) {
next(); next();
} else { } else {
res.redirect('/auth/' + provider); res.redirect('/auth/' + provider);

21
controllers/api.js
View File

@ -36,7 +36,8 @@ exports.getApi = function(req, res) {
*/ */
exports.getFoursquare = function(req, res, next) { exports.getFoursquare = function(req, res, next) {
var token = _.findWhere(req.user.tokens, { kind: 'foursquare' }); var token = _.find(req.user.tokens, { kind: 'foursquare' });
console.log(token);
async.parallel({ async.parallel({
trendingVenues: function(callback) { trendingVenues: function(callback) {
foursquare.Venues.getTrending('40.7222756', '-74.0022724', { limit: 50 }, token.accessToken, function(err, results) { foursquare.Venues.getTrending('40.7222756', '-74.0022724', { limit: 50 }, token.accessToken, function(err, results) {
@ -71,7 +72,7 @@ exports.getFoursquare = function(req, res, next) {
*/ */
exports.getTumblr = function(req, res) { exports.getTumblr = function(req, res) {
var token = _.findWhere(req.user.tokens, { kind: 'tumblr' }); var token = _.find(req.user.tokens, { kind: 'tumblr' });
var client = tumblr.createClient({ var client = tumblr.createClient({
consumer_key: secrets.tumblr.consumerKey, consumer_key: secrets.tumblr.consumerKey,
consumer_secret: secrets.tumblr.consumerSecret, consumer_secret: secrets.tumblr.consumerSecret,
@ -93,7 +94,7 @@ exports.getTumblr = function(req, res) {
*/ */
exports.getFacebook = function(req, res, next) { exports.getFacebook = function(req, res, next) {
var token = _.findWhere(req.user.tokens, { kind: 'facebook' }); var token = _.find(req.user.tokens, { kind: 'facebook' });
graph.setAccessToken(token.accessToken); graph.setAccessToken(token.accessToken);
async.parallel({ async.parallel({
getMe: function(done) { getMe: function(done) {
@ -142,7 +143,7 @@ exports.getScraping = function(req, res, next) {
* GitHub API Example. * GitHub API Example.
*/ */
exports.getGithub = function(req, res) { exports.getGithub = function(req, res) {
var token = _.findWhere(req.user.tokens, { kind: 'github' }); var token = _.find(req.user.tokens, { kind: 'github' });
var github = new Github({ token: token.accessToken }); var github = new Github({ token: token.accessToken });
var repo = github.getRepo('sahat', 'requirejs-library'); var repo = github.getRepo('sahat', 'requirejs-library');
repo.show(function(err, repo) { repo.show(function(err, repo) {
@ -264,7 +265,7 @@ exports.getLastfm = function(req, res, next) {
*/ */
exports.getTwitter = function(req, res, next) { exports.getTwitter = function(req, res, next) {
var token = _.findWhere(req.user.tokens, { kind: 'twitter' }); var token = _.find(req.user.tokens, { kind: 'twitter' });
var T = new Twit({ var T = new Twit({
consumer_key: secrets.twitter.consumerKey, consumer_key: secrets.twitter.consumerKey,
consumer_secret: secrets.twitter.consumerSecret, consumer_secret: secrets.twitter.consumerSecret,
@ -295,7 +296,7 @@ exports.postTwitter = function(req, res, next) {
return res.redirect('/api/twitter'); return res.redirect('/api/twitter');
} }
var token = _.findWhere(req.user.tokens, { kind: 'twitter' }); var token = _.find(req.user.tokens, { kind: 'twitter' });
var T = new Twit({ var T = new Twit({
consumer_key: secrets.twitter.consumerKey, consumer_key: secrets.twitter.consumerKey,
consumer_secret: secrets.twitter.consumerSecret, consumer_secret: secrets.twitter.consumerSecret,
@ -469,7 +470,7 @@ exports.postClockwork = function(req, res, next) {
*/ */
exports.getVenmo = function(req, res, next) { exports.getVenmo = function(req, res, next) {
var token = _.findWhere(req.user.tokens, { kind: 'venmo' }); var token = _.find(req.user.tokens, { kind: 'venmo' });
var query = querystring.stringify({ access_token: token.accessToken }); var query = querystring.stringify({ access_token: token.accessToken });
async.parallel({ async.parallel({
@ -515,7 +516,7 @@ exports.postVenmo = function(req, res, next) {
return res.redirect('/api/venmo'); return res.redirect('/api/venmo');
} }
var token = _.findWhere(req.user.tokens, { kind: 'venmo' }); var token = _.find(req.user.tokens, { kind: 'venmo' });
var formData = { var formData = {
access_token: token.accessToken, access_token: token.accessToken,
@ -549,7 +550,7 @@ exports.postVenmo = function(req, res, next) {
*/ */
exports.getLinkedin = function(req, res, next) { exports.getLinkedin = function(req, res, next) {
var token = _.findWhere(req.user.tokens, { kind: 'linkedin' }); var token = _.find(req.user.tokens, { kind: 'linkedin' });
var linkedin = Linkedin.init(token.accessToken); var linkedin = Linkedin.init(token.accessToken);
linkedin.people.me(function(err, $in) { linkedin.people.me(function(err, $in) {
@ -567,7 +568,7 @@ exports.getLinkedin = function(req, res, next) {
*/ */
exports.getInstagram = function(req, res, next) { exports.getInstagram = function(req, res, next) {
var token = _.findWhere(req.user.tokens, { kind: 'instagram' }); var token = _.find(req.user.tokens, { kind: 'instagram' });
ig.use({ client_id: secrets.instagram.clientID, client_secret: secrets.instagram.clientSecret }); ig.use({ client_id: secrets.instagram.clientID, client_secret: secrets.instagram.clientSecret });
ig.use({ access_token: token.accessToken }); ig.use({ access_token: token.accessToken });