Nemcio/meanTorrent
1
0
Fork 0
mirror of https://github.com/taobataoma/meanTorrent.git synced 2026-01-29 10:39:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug: remove social account.

Browse Source
This commit is contained in:
Ryan Hutchison
2015-07-09 13:49:48 -04:00
parent 9e19493f50
commit b18a7dda99
1 changed files with 48 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
modules/users/server/controllers/users/users.authentication.server.controller.js
View File

@@ -12,7 +12,7 @@ var path = require('path'),
/**
* Signup
*/
exports.signup = function(req, res) {
exports.signup = function (req, res) {
// For security measurement we remove the roles from the req.body object
delete req.body.roles;
@@ -25,7 +25,7 @@ exports.signup = function(req, res) {
user.displayName = user.firstName + ' ' + user.lastName;
// Then save the user
user.save(function(err) {
user.save(function (err) {
if (err) {
return res.status(400).send({
message: errorHandler.getErrorMessage(err)
@@ -35,7 +35,7 @@ exports.signup = function(req, res) {
user.password = undefined;
user.salt = undefined;
req.login(user, function(err) {
req.login(user, function (err) {
if (err) {
res.status(400).send(err);
} else {
@@ -49,8 +49,8 @@ exports.signup = function(req, res) {
/**
* Signin after passport authentication
*/
exports.signin = function(req, res, next) {
passport.authenticate('local', function(err, user, info) {
exports.signin = function (req, res, next) {
passport.authenticate('local', function (err, user, info) {
if (err || !user) {
res.status(400).send(info);
} else {
@@ -58,7 +58,7 @@ exports.signin = function(req, res, next) {
user.password = undefined;
user.salt = undefined;
req.login(user, function(err) {
req.login(user, function (err) {
if (err) {
res.status(400).send(err);
} else {
@@ -72,7 +72,7 @@ exports.signin = function(req, res, next) {
/**
* Signout
*/
exports.signout = function(req, res) {
exports.signout = function (req, res) {
req.logout();
res.redirect('/');
};
@@ -80,13 +80,13 @@ exports.signout = function(req, res) {
/**
* OAuth callback
*/
exports.oauthCallback = function(strategy) {
return function(req, res, next) {
passport.authenticate(strategy, function(err, user, redirectURL) {
exports.oauthCallback = function (strategy) {
return function (req, res, next) {
passport.authenticate(strategy, function (err, user, redirectURL) {
if (err || !user) {
return res.redirect('/#!/signin');
}
req.login(user, function(err) {
req.login(user, function (err) {
if (err) {
return res.redirect('/#!/signin');
}
@@ -100,7 +100,7 @@ exports.oauthCallback = function(strategy) {
/**
* Helper function to save or update a OAuth user profile
*/
exports.saveOAuthUserProfile = function(req, providerUserProfile, done) {
exports.saveOAuthUserProfile = function (req, providerUserProfile, done) {
if (!req.user) {
// Define a search query fields
var searchMainProviderIdentifierField = 'providerData.' + providerUserProfile.providerIdentifierField;
@@ -120,14 +120,14 @@ exports.saveOAuthUserProfile = function(req, providerUserProfile, done) {
$or: [mainProviderSearchQuery, additionalProviderSearchQuery]
};
User.findOne(searchQuery, function(err, user) {
User.findOne(searchQuery, function (err, user) {
if (err) {
return done(err);
} else {
if (!user) {
var possibleUsername = providerUserProfile.username || ((providerUserProfile.email) ? providerUserProfile.email.split('@')[0] : '');
User.findUniqueUsername(possibleUsername, null, function(availableUsername) {
User.findUniqueUsername(possibleUsername, null, function (availableUsername) {
user = new User({
firstName: providerUserProfile.firstName,
lastName: providerUserProfile.lastName,
@@ -140,7 +140,7 @@ exports.saveOAuthUserProfile = function(req, providerUserProfile, done) {
});
// And save the user
user.save(function(err) {
user.save(function (err) {
return done(err, user);
});
});
@@ -163,7 +163,7 @@ exports.saveOAuthUserProfile = function(req, providerUserProfile, done) {
user.markModified('additionalProvidersData');
// And save the user
user.save(function(err) {
user.save(function (err) {
return done(err, user, '/#!/settings/accounts');
});
} else {
@@ -175,33 +175,39 @@ exports.saveOAuthUserProfile = function(req, providerUserProfile, done) {
/**
* Remove OAuth provider
*/
exports.removeOAuthProvider = function(req, res, next) {
exports.removeOAuthProvider = function (req, res, next) {
var user = req.user;
var provider = req.params.provider;
var provider = req.query.provider;
if (user && provider) {
// Delete the additional provider
if (user.additionalProvidersData[provider]) {
delete user.additionalProvidersData[provider];
// Then tell mongoose that we've updated the additionalProvidersData field
user.markModified('additionalProvidersData');
}
user.save(function(err) {
if (err) {
return res.status(400).send({
message: errorHandler.getErrorMessage(err)
});
} else {
req.login(user, function(err) {
if (err) {
res.status(400).send(err);
} else {
res.json(user);
}
});
}
if (!user) {
return res.status(401).json({
message: 'User is not authenticated'
});
} else if (!provider) {
return res.status(400).send();
}
};
// Delete the additional provider
if (user.additionalProvidersData[provider]) {
delete user.additionalProvidersData[provider];
// Then tell mongoose that we've updated the additionalProvidersData field
user.markModified('additionalProvidersData');
}
user.save(function (err) {
if (err) {
return res.status(400).send({
message: errorHandler.getErrorMessage(err)
});
} else {
req.login(user, function (err) {
if (err) {
return res.status(400).send(err);
} else {
return res.json(user);
}
});
}
});
};