diff --git a/app.js b/app.js index bcb2d2944c..ae62020544 100755 --- a/app.js +++ b/app.js @@ -61,9 +61,9 @@ app.post('/account/settings', passportConf.ensureAuthenticated, user.postAccount app.get('/partials/:name', home.partials); -app.get('/api', api.apiBrowser); -app.get('/api/foursquare', passportConf.ensureAuthenticated, api.foursquare); -app.get('/api/tumblr', passportConf.ensureAuthenticated, api.tumblr); +app.get('/api', api.getApi); +app.get('/api/foursquare', passportConf.ensureAuthenticated, api.getFoursquare); +app.get('/api/tumblr', passportConf.ensureAuthenticated, api.getTumblr); app.get('/api/facebook', passportConf.ensureAuthenticated, api.facebook); app.get('/contact', contact.getContact); @@ -84,6 +84,10 @@ 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.authenticate('provider')); +app.get('/auth/tumblr/callback', passport.authenticate('provider', { successRedirect: '/', failureRedirect: '/login' })); + + app.listen(app.get('port'), function() { console.log('Express server listening on port ' + app.get('port')); }); diff --git a/views/api/tumblr.jade b/views/api/tumblr.jade index 132ea9ae34..60bb92dd4c 100644 --- a/views/api/tumblr.jade +++ b/views/api/tumblr.jade @@ -6,5 +6,14 @@ block content i.fa.fa-tumblr-square | Tumblr API - if !user.tokens.foursquare - a.btn.btn-large.btn-primary(href='/auth/tumblr') Get Tumblr Token + if !user.tokens.tumblr + h3 + i.fa.fa-shield + | Authorization Required + a(href='/auth/tumblr') + .label.label-primary.label-block + h2 + i.fa.fa-qrcode + | Get Tumblr Token + else + h2 else