Refactoring tumblr authorization

app.js

@@ -84,8 +84,8 @@ app.get('/auth/twitter/callback', passport.authenticate('twitter', { successRedi
 app.get('/auth/foursquare', api.foursquareAuth);
 app.get('/auth/foursquare/callback', api.foursquareCallback);
 
-app.get('/auth/tumblr', passport.authorize('tumblr', { failureRedirect: '/api' }));
-app.get('/auth/tumblr/callback', passport.authorize('tumblr', { failureRedirect: '/api' }), api.tumblrCallback);
+app.get('/auth/tumblr', passport.authorize('tumblr'));
+app.get('/auth/tumblr/callback', passport.authorize('tumblr', { failureRedirect: '/api' }), passportConf.tumblrCallback);
 
 app.listen(app.get('port'), function() {
   console.log('Express server listening on port ' + app.get('port'));

config/passport.js

@@ -106,7 +106,7 @@ passport.use('tumblr', new OAuthStrategy({
     User.findById(req.user._id, function(err, user) {
       user.tokens.tumblr = token;
       user.save(function(err) {
-        done(err);
+        done(err, req.user);
       });
     });
   }
@@ -126,3 +126,8 @@ exports.ensureAdmin = function ensureAdmin(req, res, next) {
       res.send(403);
   };
 };
+
+
+exports.tumblrCallback = function(req, res) {
+  res.redirect('/api/tumblr');
+};

controllers/api.js

@@ -1,11 +1,11 @@
+var config = require('../config/config');
+var User = require('../models/User');
 var async = require('async');
 var geoip = require('geoip-lite');
-var config = require('../config/config');
 var FB = require('fb');
 var tumblr = require('tumblr.js');
 var foursquare = require('node-foursquare')({ secrets: config.foursquare });
 
-var User = require('../models/User');
 
 /**
  * GET /api
@@ -36,6 +36,7 @@ exports.getFoursquare = function(req, res) {
       });
     },
     userCheckins: function(callback) {
+      console.log('I AM RUNNING');
       foursquare.Users.getCheckins('self', null, req.user.tokens.foursquare, function(err, results) {
         callback(err, results);
       });
@@ -67,6 +68,9 @@ exports.getTumblr = function(req, res) {
   });
 };
 
+
+
+
 /**
  * GET /api/facebook
  */
@@ -98,11 +102,3 @@ exports.foursquareCallback = function(req, res) {
     });
   });
 };
-
-/**
-* GET /auth/tumblr/callback
-*/
-exports.tumblrCallback = function(req, res) {
-
-};
-