fix(core): fix ESLint console warnings, Twitter redirect, and and scope usage (#1388)

* Use validator.js instead of regexp for validations in User Schema.

* Disables "Unexpected console statement  no-console" warnings

* Fixes redirection to wrong URL after login with social networks.

* Use ViewModel vm instead of $scope in manage social accounts controller.

* preserving the option to redirect to a specific URL as done in saveOAuthUserProfile() (thanks to @OneOfTheWorld for pointing out)
This commit is contained in:
Liran Tal
2016-07-07 01:24:23 +03:00
committed by GitHub
parent 30139a2429
commit c95bd7d1cb
3 changed files with 4 additions and 3 deletions

View File

@@ -19,6 +19,7 @@ module.exports = {
'new-cap': [2, { newIsCapExceptions: ['acl.memoryBackend', 'acl'] }],
'no-bitwise': 0,
'no-caller': 2,
'no-console': 0,
'no-else-return': 0,
'no-empty-class': 0,
'no-multi-spaces': 2,

View File

@@ -17,7 +17,7 @@
// Check if there are additional accounts
function hasConnectedAdditionalSocialAccounts() {
return ($scope.user.additionalProvidersData && Object.keys($scope.user.additionalProvidersData).length);
return (vm.user.additionalProvidersData && Object.keys(vm.user.additionalProvidersData).length);
}
// Check if provider is already in use with current user

View File

@@ -104,7 +104,7 @@ exports.oauthCallback = function (strategy) {
var sessionRedirectURL = req.session.redirect_to;
delete req.session.redirect_to;
passport.authenticate(strategy, function (err, user, redirectURL) {
passport.authenticate(strategy, function (err, user, info) {
if (err) {
return res.redirect('/authentication/signin?err=' + encodeURIComponent(errorHandler.getErrorMessage(err)));
}
@@ -116,7 +116,7 @@ exports.oauthCallback = function (strategy) {
return res.redirect('/authentication/signin');
}
return res.redirect(redirectURL || sessionRedirectURL || '/');
return res.redirect(info || sessionRedirectURL || '/');
});
})(req, res, next);
};