+
-
diff --git a/modules/users/server/controllers/users/users.authentication.server.controller.js b/modules/users/server/controllers/users/users.authentication.server.controller.js
index c4810eda..ae9a51c6 100644
--- a/modules/users/server/controllers/users/users.authentication.server.controller.js
+++ b/modules/users/server/controllers/users/users.authentication.server.controller.js
@@ -10,8 +10,12 @@ var path = require('path'),
passport = require('passport'),
User = mongoose.model('User'),
Invitation = mongoose.model('Invitation'),
+ nodemailer = require('nodemailer'),
traceLogCreate = require(path.resolve('./config/lib/tracelog')).create;
+var smtpTransport = nodemailer.createTransport(config.mailer.options);
+var mtConfig = config.meanTorrentConfig;
+
// URLs for which user can't be redirected on signin
var noReturnUrls = [
'/authentication/signin',
@@ -33,6 +37,9 @@ exports.signup = function (req, res) {
user.displayName = user.firstName + ' ' + user.lastName;
user.passkey = user.randomAsciiString(32);
+ user.signUpActiveToken = user.randomAsciiString(32);
+ user.signUpActiveExpires = Date.now() + mtConfig.sign.signUpActiveTokenExpires;
+
// Then save the user
user.save(function (err) {
if (err) {
@@ -59,14 +66,45 @@ exports.signup = function (req, res) {
user.password = undefined;
user.salt = undefined;
- req.login(user, function (err) {
+ /* send an account active mail */
+ var httpTransport = 'http://';
+ if (config.secure && config.secure.ssl === true) {
+ httpTransport = 'https://';
+ }
+ var baseUrl = req.app.get('domain') || httpTransport + req.headers.host;
+ res.render(path.resolve('modules/users/server/templates/sign-up-active-email'), {
+ name: user.displayName,
+ appName: config.app.title,
+ hours: mtConfig.sign.signUpActiveTokenExpires / (60 * 60 * 1000),
+ url: baseUrl + '/api/auth/active/' + user.signUpActiveToken
+ }, function (err, emailHTML) {
if (err) {
- res.status(400).send(err);
+ return res.status(400).send({
+ message: 'ACTIVE_MAIL_RENDER_ERROR'
+ });
} else {
- res.json(user);
+ var mailOptions = {
+ to: user.email,
+ from: config.mailer.from,
+ subject: 'Sign up account active of ' + config.app.title,
+ html: emailHTML
+ };
+ smtpTransport.sendMail(mailOptions, function (err) {
+ if (!err) {
+ res.send({
+ message: 'SENDING_ACTIVE_MAIL_SUCCESSFULLY'
+ });
+ } else {
+ return res.status(400).send({
+ message: 'SENDING_ACTIVE_MAIL_FAILED'
+ });
+ }
+
+ });
}
});
+
//create trace log
traceLogCreate(req, traceConfig.action.userSignUp, {
user: user._id,
@@ -77,6 +115,43 @@ exports.signup = function (req, res) {
});
};
+/**
+ * active sign up from email token
+ */
+exports.active = function (req, res, next) {
+ User.findOne({
+ signUpActiveToken: req.params.token,
+ status: 'inactive',
+ signUpActiveExpires: {
+ $gt: Date.now()
+ }
+ }, function (err, u) {
+ if (err || !u) {
+ return res.redirect('/authentication/active?method=invalid');
+ } else {
+ u.update({
+ $set: {
+ status: 'normal',
+ signUpActiveToken: undefined,
+ signUpActiveExpires: undefined
+ }
+ }).exec(function (err) {
+ if (err) {
+ return res.redirect('/authentication/active?method=error');
+ } else {
+ req.login(u, function (err) {
+ if (err) {
+ return res.redirect('/authentication/active?method=failed');
+ } else {
+ return res.redirect('/authentication/active?method=successfully');
+ }
+ });
+ }
+ });
+ }
+ });
+};
+
/**
* Signin after passport authentication
*/
diff --git a/modules/users/server/controllers/users/users.password.server.controller.js b/modules/users/server/controllers/users/users.password.server.controller.js
index 7ce6d768..6d8abc27 100644
--- a/modules/users/server/controllers/users/users.password.server.controller.js
+++ b/modules/users/server/controllers/users/users.password.server.controller.js
@@ -126,7 +126,6 @@ exports.validateResetToken = function (req, res) {
});
};
-
/**
* invite sign up from email token
*/
diff --git a/modules/users/server/models/user.server.model.js b/modules/users/server/models/user.server.model.js
index 949be6d7..baf48121 100644
--- a/modules/users/server/models/user.server.model.js
+++ b/modules/users/server/models/user.server.model.js
@@ -129,7 +129,7 @@ var UserSchema = new Schema({
},
status: {
type: String,
- default: 'normal'
+ default: 'inactive'
},
vip_start_at: {
type: Date,
@@ -213,6 +213,13 @@ var UserSchema = new Schema({
type: Date,
default: Date.now
},
+ /* for sing up active */
+ signUpActiveToken: {
+ type: String
+ },
+ signUpActiveExpires: {
+ type: Date
+ },
/* For reset password */
resetPasswordToken: {
type: String
diff --git a/modules/users/server/routes/auth.server.routes.js b/modules/users/server/routes/auth.server.routes.js
index 803791a7..65ff578a 100644
--- a/modules/users/server/routes/auth.server.routes.js
+++ b/modules/users/server/routes/auth.server.routes.js
@@ -15,6 +15,7 @@ module.exports = function (app) {
app.route('/api/auth/reset/:token').post(users.reset);
app.route('/api/auth/invite/:token').get(users.invite);
+ app.route('/api/auth/active/:token').get(users.active);
// Setting up the users authentication api
app.route('/api/auth/signup').post(users.signup);
diff --git a/modules/users/server/templates/sign-up-active-email.server.view.html b/modules/users/server/templates/sign-up-active-email.server.view.html
new file mode 100644
index 00000000..0dfe238e
--- /dev/null
+++ b/modules/users/server/templates/sign-up-active-email.server.view.html
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
Dear {{name}},
+
+
+ You have requested to sign up and register for your account at {{appName}}
+
+
We should verify your email address, Please visit this url to active your account in {{hours}} hours:
+
{{url}}
+
If you didn't make this request, you can ignore this email.
+
+
+
The {{appName}} Support Team
+
+
+