diff --git a/app/controllers/articles.server.controller.js b/app/controllers/articles.server.controller.js index dcbe5b8a0a..68b17bb826 100644 --- a/app/controllers/articles.server.controller.js +++ b/app/controllers/articles.server.controller.js @@ -21,7 +21,7 @@ exports.create = function(req, res) { message: errorHandler.getErrorMessage(err) }); } else { - res.jsonp(article); + res.json(article); } }); }; @@ -30,7 +30,7 @@ exports.create = function(req, res) { * Show the current article */ exports.read = function(req, res) { - res.jsonp(req.article); + res.json(req.article); }; /** @@ -47,7 +47,7 @@ exports.update = function(req, res) { message: errorHandler.getErrorMessage(err) }); } else { - res.jsonp(article); + res.json(article); } }); }; @@ -64,7 +64,7 @@ exports.delete = function(req, res) { message: errorHandler.getErrorMessage(err) }); } else { - res.jsonp(article); + res.json(article); } }); }; @@ -79,7 +79,7 @@ exports.list = function(req, res) { message: errorHandler.getErrorMessage(err) }); } else { - res.jsonp(articles); + res.json(articles); } }); }; diff --git a/app/controllers/users/users.authentication.server.controller.js b/app/controllers/users/users.authentication.server.controller.js index 9558ed9734..be6f67476f 100644 --- a/app/controllers/users/users.authentication.server.controller.js +++ b/app/controllers/users/users.authentication.server.controller.js @@ -39,7 +39,7 @@ exports.signup = function(req, res) { if (err) { res.status(400).send(err); } else { - res.jsonp(user); + res.json(user); } }); } @@ -62,7 +62,7 @@ exports.signin = function(req, res, next) { if (err) { res.status(400).send(err); } else { - res.jsonp(user); + res.json(user); } }); } @@ -197,7 +197,7 @@ exports.removeOAuthProvider = function(req, res, next) { if (err) { res.status(400).send(err); } else { - res.jsonp(user); + res.json(user); } }); } diff --git a/app/controllers/users/users.password.server.controller.js b/app/controllers/users/users.password.server.controller.js index 352f0a57bc..7ffb04e849 100644 --- a/app/controllers/users/users.password.server.controller.js +++ b/app/controllers/users/users.password.server.controller.js @@ -138,7 +138,7 @@ exports.reset = function(req, res, next) { res.status(400).send(err); } else { // Return authenticated user - res.jsonp(user); + res.json(user); done(err, user); } diff --git a/app/controllers/users/users.profile.server.controller.js b/app/controllers/users/users.profile.server.controller.js index ee902cc1c0..415c596ce7 100644 --- a/app/controllers/users/users.profile.server.controller.js +++ b/app/controllers/users/users.profile.server.controller.js @@ -36,7 +36,7 @@ exports.update = function(req, res) { if (err) { res.status(400).send(err); } else { - res.jsonp(user); + res.json(user); } }); } @@ -52,5 +52,5 @@ exports.update = function(req, res) { * Send User */ exports.me = function(req, res) { - res.jsonp(req.user || null); + res.json(req.user || null); }; \ No newline at end of file diff --git a/config/express.js b/config/express.js index bea1c88dac..be85e5bafa 100755 --- a/config/express.js +++ b/config/express.js @@ -79,8 +79,8 @@ module.exports = function(db) { app.use(bodyParser.json()); app.use(methodOverride()); - // Enable jsonp - app.enable('jsonp callback'); + // JSONP is disabled by default + // app.enable('jsonp callback'); // CookieParser should be above session app.use(cookieParser());