Skip to content

Commit

Permalink
fix(core): fix ESLint console warnings, Twitter redirect, and and sco…
Browse files Browse the repository at this point in the history
…pe 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)
  • Loading branch information
lirantal authored Jul 6, 2016
1 parent 30139a2 commit c95bd7d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
}
Expand All @@ -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);
};
Expand Down

0 comments on commit c95bd7d

Please sign in to comment.