diff --git a/src/posts.js b/src/posts.js index 646f38dded..66c79350e2 100644 --- a/src/posts.js +++ b/src/posts.js @@ -223,7 +223,7 @@ var RDB = require('./redis'), } } - plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid}, function(err, profile_info) { + plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid, pid: post.pid}, function(err, profile_info) { post.additional_profile_info = profile_info.profile; if (post.editor !== '') { diff --git a/src/routes/authentication.js b/src/routes/authentication.js index 15951ece8b..88fcc1fd23 100644 --- a/src/routes/authentication.js +++ b/src/routes/authentication.js @@ -33,7 +33,7 @@ passport.use(new passportTwitter({ consumerKey: meta.config['social:twitter:key'], consumerSecret: meta.config['social:twitter:secret'], - callbackURL: 'auth/twitter/callback' + callbackURL: nconf.get('url') + 'auth/twitter/callback' }, function(token, tokenSecret, profile, done) { login_module.loginViaTwitter(profile.id, profile.username, profile.photos, function(err, user) { if (err) { @@ -56,7 +56,7 @@ passport.use(new passportGoogle({ clientID: meta.config['social:google:id'], clientSecret: meta.config['social:google:secret'], - callbackURL: 'auth/google/callback' + callbackURL: nconf.get('url') + 'auth/google/callback' }, function(accessToken, refreshToken, profile, done) { login_module.loginViaGoogle(profile.id, profile.displayName, profile.emails[0].value, function(err, user) { if (err) { diff --git a/src/webserver.js b/src/webserver.js index 716bd5dcfe..c9503889f6 100644 --- a/src/webserver.js +++ b/src/webserver.js @@ -745,7 +745,7 @@ var path = require('path'), var custom_routes = { 'routes': [], - 'api_methods': [] + 'api': [] }; plugins.ready(function() { @@ -767,6 +767,20 @@ var path = require('path'), }(route)); } } + + var apiRoutes = custom_routes.api; + for (var route in apiRoutes) { + if (apiRoutes.hasOwnProperty(route)) { + (function(route) { + app[apiRoutes[route].method || 'get']('/api' + apiRoutes[route].route, function(req, res) { + apiRoutes[route].callback(req, res, function(data) { + res.json(data); + }); + }); + }(route)); + } + } + }); });