diff --git a/packages/core/users/public/services/meanUser.js b/packages/core/users/public/services/meanUser.js index 40d0461119..6b1cafd00f 100644 --- a/packages/core/users/public/services/meanUser.js +++ b/packages/core/users/public/services/meanUser.js @@ -1,7 +1,7 @@ 'use strict'; -angular.module('mean.users').factory('MeanUser', [ '$rootScope', '$http', '$location', '$stateParams', '$cookies', '$q', '$timeout', - function($rootScope, $http, $location, $stateParams, $cookies, $q, $timeout) { +angular.module('mean.users').factory('MeanUser', [ '$rootScope', '$http', '$location', '$stateParams', '$cookies', '$q', '$timeout', '$meanConfig', + function($rootScope, $http, $location, $stateParams, $cookies, $q, $timeout, $meanConfig) { var self; @@ -186,7 +186,7 @@ angular.module('mean.users').factory('MeanUser', [ '$rootScope', '$http', '$loca else { $cookies.put('redirect', $location.path()); $timeout(deferred.reject); - $location.url('/auth/login'); + $location.url($meanConfig.loginPage); } }); diff --git a/packages/core/users/server/controllers/users.js b/packages/core/users/server/controllers/users.js index 62f5a96f60..4067907984 100755 --- a/packages/core/users/server/controllers/users.js +++ b/packages/core/users/server/controllers/users.js @@ -35,7 +35,7 @@ module.exports = function(MeanUser) { */ authCallback: function(req, res) { var payload = req.user; - var escaped = JSON.stringify(payload); + var escaped = JSON.stringify(payload); escaped = encodeURI(escaped); // We are sending the payload inside the token var token = jwt.sign(escaped, config.secret, { expiresInMinutes: 60*5 }); @@ -53,7 +53,7 @@ module.exports = function(MeanUser) { if (req.isAuthenticated()) { return res.redirect('/'); } - res.redirect('/login'); + res.redirect(config.public.loginPage); }, /** @@ -148,7 +148,7 @@ module.exports = function(MeanUser) { // We are sending the payload inside the token var token = jwt.sign(escaped, config.secret, { expiresInMinutes: 60*5 }); - res.json({ + res.json({ token: token, redirect: config.strategies.landingPage }); @@ -186,7 +186,7 @@ module.exports = function(MeanUser) { escaped = encodeURI(escaped); var token = jwt.sign(escaped, config.secret, { expiresInMinutes: 60*5 }); res.json({ token: token }); - + }); }, diff --git a/packages/core/users/server/routes/users.js b/packages/core/users/server/routes/users.js index 2c9234f1f8..7f8167eb1e 100644 --- a/packages/core/users/server/routes/users.js +++ b/packages/core/users/server/routes/users.js @@ -7,6 +7,7 @@ module.exports = function(MeanUser, app, auth, database, passport) { // User routes use users controller var users = require('../controllers/users')(MeanUser); + var loginPage = config.public.loginPage; app.route('/api/logout') .get(users.signout); @@ -85,12 +86,12 @@ module.exports = function(MeanUser, app, auth, database, passport) { app.route('/api/auth/facebook') .get(passport.authenticate('facebook', { scope: ['email', 'user_about_me'], - failureRedirect: '/auth/login', + failureRedirect: loginPage, }), users.signin); app.route('/api/auth/facebook/callback') .get(passport.authenticate('facebook', { - failureRedirect: '/auth/login', + failureRedirect: loginPage, }), users.authCallback); } @@ -99,26 +100,26 @@ module.exports = function(MeanUser, app, auth, database, passport) { // Setting the github oauth routes app.route('/api/auth/github') .get(passport.authenticate('github', { - failureRedirect: '/auth/login' + failureRedirect: loginPage }), users.signin); app.route('/api/auth/github/callback') .get(passport.authenticate('github', { - failureRedirect: '/auth/login' + failureRedirect: loginPage }), users.authCallback); } if(config.strategies.twitter.enabled) - { + { // Setting the twitter oauth routes app.route('/api/auth/twitter') .get(passport.authenticate('twitter', { - failureRedirect: '/auth/login' + failureRedirect: loginPage }), users.signin); app.route('/api/auth/twitter/callback') .get(passport.authenticate('twitter', { - failureRedirect: '/auth/login' + failureRedirect: loginPage }), users.authCallback); } @@ -127,7 +128,7 @@ module.exports = function(MeanUser, app, auth, database, passport) { // Setting the google oauth routes app.route('/api/auth/google') .get(passport.authenticate('google', { - failureRedirect: '/auth/login', + failureRedirect: loginPage, scope: [ 'https://www.googleapis.com/auth/userinfo.profile', 'https://www.googleapis.com/auth/userinfo.email' @@ -136,7 +137,7 @@ module.exports = function(MeanUser, app, auth, database, passport) { app.route('/api/auth/google/callback') .get(passport.authenticate('google', { - failureRedirect: '/auth/login' + failureRedirect: loginPage }), users.authCallback); } @@ -145,13 +146,13 @@ module.exports = function(MeanUser, app, auth, database, passport) { // Setting the linkedin oauth routes app.route('/api/auth/linkedin') .get(passport.authenticate('linkedin', { - failureRedirect: '/auth/login', + failureRedirect: loginPage, scope: ['r_emailaddress'] }), users.signin); app.route('/api/auth/linkedin/callback') .get(passport.authenticate('linkedin', { - failureRedirect: '/auth/login' + failureRedirect: loginPage }), users.authCallback); }