fix some minor issues

Author: riteshsangwan

config/default.js

@@ -31,5 +31,10 @@ module.exports = {
     SMTP_USERNAME: process.env.SMTP_USERNAME,
     SMTP_PASSWORD: process.env.SMTP_PASSWORD,
   },
+  RESET_PASSWORD_SUBJECT: 'Reset your password',
+  RESET_PASSWORD_TEMPLATE: 'You received this email because you send a reset password request to us, ' +
+    'if you never registered, please ignore. ' +
+    'To reset your password <a href=":link">click here</a><br><br> -- Dsp Server Team',
+  // this is a frontend url, the user is redirected to this url from user's mailbox
   RESET_PASSWORD_LINK: 'http://localhost:3000/reset-password?token=:token',
 };

controllers/UserController.js

@@ -50,7 +50,7 @@ function* register(req, res) {
  * @param res the response
  */
 function* registerSocialUser(req, res) {
-  res.json(yield UserService.registerSocialUser(req.body));
+  res.json(yield UserService.registerSocialUser(req.auth, req.body));
 }
 
 /**

enum.js

@@ -7,8 +7,8 @@
  * Contains app enums and constants
  */
 const SocialType = {
-  GOOGLE: 'Google',
-  FACEBOOK: 'Facebook',
+  GOOGLE: 'google-oauth2',
+  FACEBOOK: 'facebook',
 };
 
 const DroneStatus = {

services/UserService.js

@@ -76,6 +76,7 @@ register.schema = {
 
 // the joi schema for register user via social login
 registerSocialUser.schema = {
+  auth: joi.object().required(),
   entity: joi.object().keys({
     name: joi.string().required(),
     email: joi.string().email().required(),
@@ -125,16 +126,23 @@ function* register(entity) {
 /**
  * Register a user via social login
  *
+ * @param {Object}  auth          the currently logged in user context
  * @param {Object}  entity        the post entity from the client
  */
-function* registerSocialUser(entity) {
+function* registerSocialUser(auth, entity) {
   // make sure the email is unique
-  const existingUser = yield User.findOne({email: entity.email});
-
+  // we don't need to check here for social network type, as social network id itself
+  // embed the social network type
+  const existingUser = yield User.findOne({ $or: [{email: entity.email}, {socialNetworkId: auth.sub}] });
+console.log(auth);
   let user;
   if (existingUser) {
-    user = existingUser;
+    // update social network type
+    existingUser.socialNetworkType = auth.sub.substring(0, auth.sub.indexOf('|'));
+    user = yield existingUser.save();
   } else {
+    entity.socialNetworkId = auth.sub;
+    entity.socialNetworkType = auth.sub.substring(0, auth.sub.indexOf('|'));
     entity.role = Role.CONSUMER;
     user = yield User.create(entity);
   }
@@ -211,17 +219,19 @@ forgotPassword.schema = {
  */
 function* forgotPassword(entity) {
   const code = Math.floor(Math.random() * 100000).toString(16);
-  const subject = 'Reset your password';
+  const subject = config.RESET_PASSWORD_SUBJECT;
   const link = config.RESET_PASSWORD_LINK.replace(':token', code);
-  const text = 'You received this email because you send a reset password request to us, ' +
-    'if you never registered, please ignore. ' +
-    `To reset your password <a href="${link}">click here</a><br><br> -- Dsp Server Team`;
+  const text = config.RESET_PASSWORD_TEMPLATE.replace(':link', link);
   const html = `<p>${text}</p>`;
 
   const user = yield User.findOne({email: entity.email});
   if (!user) {
     throw new errors.NotFoundError('user not found with the specified email');
   }
+  // check if the user is social network user, and if yes than don't allow forgot password
+  if (user.socialNetworkId) {
+    throw new errors.ValidationError('social network user cannot reset password', httpStatus.BAD_REQUEST);
+  }
 
   user.resetPasswordCode = code;
   const date = new Date();
@@ -254,6 +264,10 @@ function* resetPassword(entity) {
     user.resetPasswordExpiration.getTime() - new Date().getTime() < 0) {
     throw new errors.HttpStatusError(400, 'invalid code');
   }
+  // check if the user is social network user, and if yes than don't allow forgot password
+  if (user.socialNetworkId) {
+    throw new errors.ValidationError('social network user cannot reset password', httpStatus.BAD_REQUEST);
+  }
 
   user.password = yield helper.hashString(entity.password, config.SALT_WORK_FACTOR);
   user.resetPasswordCode = null;