fix(tps): missing host name in some cases

polonel · Mar 20, 2019 · c3704b5 · c3704b5
1 parent 893af61
commit c3704b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/emitter/events.js b/src/emitter/events.js
@@ -161,7 +161,7 @@ var notifications = require('../notifications') // Load Push Events
                           tpsEnabled: tpsEnabled,
                           tpsUsername: tpsUsername,
                           tpsApiKey: tpsApiKey,
-                          hostname: hostname
+                          hostname: hostname || baseUrl
                         },
                         { type: 1, ticket: ticketPushClone }
                       )
@@ -187,7 +187,7 @@ var notifications = require('../notifications') // Load Push Events
                         tpsEnabled: tpsEnabled,
                         tpsUsername: tpsUsername,
                         tpsApiKey: tpsApiKey,
-                        hostname: hostname
+                        hostname: hostname || baseUrl
                       },
                       { type: 1, ticket: ticket }
                     )

diff --git a/src/models/user.js b/src/models/user.js
@@ -522,11 +522,13 @@ userSchema.statics.createUserFromEmail = function (email, callback) {
   if (_.isUndefined(email)) {
     return callback('Invalid User Data - UserSchema.CreatePublicUser()', null)
   }
+
+  var self = this
+
   var settingSchema = require('./setting')
   settingSchema.getSetting('role:user:default', function (err, userRoleDefault) {
     if (err || !userRoleDefault) return callback('Invalid Setting - UserRoleDefault')
 
-    var self = this
     var Chance = require('chance')
 
     var chance = new Chance()
@@ -536,7 +538,7 @@ userSchema.statics.createUserFromEmail = function (email, callback) {
       pool: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890'
     })
 
-    var user = new this({
+    var user = new self({
       username: email,
       email: email,
       password: plainTextPass,