diff --git a/app/routes/core.server.routes.js b/app/routes/core.server.routes.js index e6ddd285c1..1db9d40074 100644 --- a/app/routes/core.server.routes.js +++ b/app/routes/core.server.routes.js @@ -3,5 +3,5 @@ module.exports = function(app) { // Root routing var core = require('../../app/controllers/core.server.controller'); - app.get('/', core.index); + app.route('/').get(core.index); }; \ No newline at end of file diff --git a/app/routes/users.server.routes.js b/app/routes/users.server.routes.js index a3ff21b9a7..a87befbdbd 100644 --- a/app/routes/users.server.routes.js +++ b/app/routes/users.server.routes.js @@ -8,38 +8,38 @@ var passport = require('passport'); module.exports = function(app) { // User Routes var users = require('../../app/controllers/users.server.controller'); - app.get('/users/me', users.me); - app.put('/users', users.update); - app.post('/users/password', users.changePassword); - app.del('/users/accounts', users.removeOAuthProvider); + app.route('/users/me').get(users.me); + app.route('/users').put(users.update); + app.route('/users/password').post(users.changePassword); + app.route('/users/accounts').delete(users.removeOAuthProvider); // Setting up the users api - app.post('/auth/signup', users.signup); - app.post('/auth/signin', users.signin); - app.get('/auth/signout', users.signout); + app.route('/auth/signup').post(users.signup); + app.route('/auth/signin').post(users.signin); + app.route('/auth/signout').get(users.signout); // Setting the facebook oauth routes - app.get('/auth/facebook', passport.authenticate('facebook', { + app.route('/auth/facebook').get(passport.authenticate('facebook', { scope: ['email'] })); - app.get('/auth/facebook/callback', users.oauthCallback('facebook')); + app.route('/auth/facebook/callback').get(users.oauthCallback('facebook')); // Setting the twitter oauth routes - app.get('/auth/twitter', passport.authenticate('twitter')); - app.get('/auth/twitter/callback', users.oauthCallback('twitter')); + app.route('/auth/twitter').get(passport.authenticate('twitter')); + app.route('/auth/twitter/callback').get(users.oauthCallback('twitter')); // Setting the google oauth routes - app.get('/auth/google', passport.authenticate('google', { + app.route('/auth/google').get(passport.authenticate('google', { scope: [ 'https://www.googleapis.com/auth/userinfo.profile', 'https://www.googleapis.com/auth/userinfo.email' ] })); - app.get('/auth/google/callback', users.oauthCallback('google')); + app.route('/auth/google/callback').get(users.oauthCallback('google')); // Setting the linkedin oauth routes - app.get('/auth/linkedin', passport.authenticate('linkedin')); - app.get('/auth/linkedin/callback', users.oauthCallback('linkedin')); + app.route('/auth/linkedin').get(passport.authenticate('linkedin')); + app.route('/auth/linkedin/callback').get(users.oauthCallback('linkedin')); // Finish by binding the user middleware app.param('userId', users.userByID); diff --git a/package.json b/package.json index fbbb871fe8..fd279c582b 100755 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "postinstall": "bower install --config.interactive=false" }, "dependencies": { - "express": "~4.0.0", + "express": "~4.1.0", "express-session": "~1.0.2", "body-parser": "~1.0.1", "cookie-parser": "~1.0.1", diff --git a/public/modules/articles/views/view-article.client.view.html b/public/modules/articles/views/view-article.client.view.html index 821b9e831a..b7170c18bf 100644 --- a/public/modules/articles/views/view-article.client.view.html +++ b/public/modules/articles/views/view-article.client.view.html @@ -3,7 +3,7 @@

{{article.title}}

-
+