Merge pull request #45 from JAVACAFE-STUDY/develop

0.6.0 master 반영
JAVACAFE-STUDY · Jun 25, 2019 · b20efdf · b20efdf
2 parents 059cf37 + a3c8c3f
commit b20efdf
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/controllers/mail.controller.js b/controllers/mail.controller.js
@@ -33,7 +33,7 @@ const transporter = nodemailer.createTransport({
  */
 function sendInvitation(req, res, next) {
   var invitationFrom = req.user.name;
-  var invitationLink = config.web.uri  + '/#/invitation/' + encode(req.receiver._id, req.receiver.email);
+  var invitationLink = config.web.uri  + '/#/invitation?token=' + encode(req.receiver._id, req.receiver.email);
 
   ejs.renderFile(__dirname + "/../emails/invite.ejs", {
     'invitationFrom': invitationFrom, 

diff --git a/models/user.model.js b/models/user.model.js
@@ -66,20 +66,26 @@ UserSchema.method({
 
 UserSchema.post('find', function(users) {
   users.forEach(user => {
-    userAvatarPath(user);
+    if(user) {
+      userAvatarPath(user);
+    }
   });
 });
 
 UserSchema.post('findOne', function(user) {
-  userAvatarPath(user);
+  if(user) {
+    userAvatarPath(user);
+  }
 });
 
 UserSchema.post('findById', function(user) {
-  userAvatarPath(user);
+  if(user) {
+    userAvatarPath(user);
+  }
 });
 
 function userAvatarPath(user) {
-  if (user.avatar != undefined) {
+  if (user != undefined && user.avatar != undefined) {
     user.avatar = imageUrl + user.avatar;
     user.thumbnail = imageUrl + user.thumbnail;
   }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chainity-api",
-  "version": "0.5.1",
+  "version": "0.6.0",
   "private": true,
   "scripts": {
     "start": "pm2-dev start ecosystem.config.js",