@dhyasama/totem-models 11.145.0 → 12.0.0

package/helpers.js

@@ -3,7 +3,6 @@
 const _ = require('underscore');
 const mongoose = require('mongoose');
 const rangeCheck = require('range_check');
-const request = require('request');
 const utilities = require('@dhyasama/totem-utilities');
 
 const cleanOrg = module.exports.cleanOrg = function cleanOrg(doc, customerId) {
@@ -81,22 +80,29 @@ const getGeolocation = module.exports.getGeolocation = function getGeolocation(i
 
   if (!rangeCheck.validIp(ip)) { return cb(null, {}); }
 
-  request('https://freegeoip.net/json/' + ip, function (error, response, body) {
-
-    if (error) {
+  fetch('https://freegeoip.net/json/' + ip)
+    .then(function(response) {
+      return response.text().then(function(body) {
+        return {
+          body: body,
+          status: response.status
+        };
+      });
+    })
+    .then(function(result) {
+      if (result.status !== 200) {
+        return cb(new Error('non-200 status code from geoip (' + result.status + ')'), null);
+      }
+      else if (!utilities.isValidJson(result.body)) {
+        return cb(new Error('invalid json from geoip'), null);
+      }
+      else {
+        return cb(null, JSON.parse(result.body));
+      }
+    })
+    .catch(function(error) {
       return cb(error, null);
-    }
-    else if (response && response.statusCode !== 200) {
-      return cb(new Error('non-200 status code from geoip (' + response.statusCode + ')'), null);
-    }
-    else if (!utilities.isValidJson(body)) {
-      return cb(new Error('invalid json from geoip'), null);
-    }
-    else {
-      return cb(null, JSON.parse(body));
-    }
-
-  });
+    });
 
 };
 
@@ -140,4 +146,4 @@ const sortPeopleSources = module.exports.sortPeopleSources = function sortPeople
 
   return items;
 
-};
+};

package/index.js

@@ -4,23 +4,12 @@ var bootstrap = function(mongoose, config) {
 
   var env = process.env.NODE_ENV || 'development';
 
-  // Make Mongoose use `findOneAndUpdate()`. Note that this option is `true`
-  // by default, you need to set it to false.
-  mongoose.set('useFindAndModify', false);
-
-  mongoose.set('useNewUrlParser', true);
-  mongoose.set('useUnifiedTopology', true);
-  mongoose.set('useCreateIndex', true);
-
   // TODO: Turn this off for now; It will be nice when we can go through all code to safely utilize it;
   //https://mongoosejs.com/docs/migrating_to_5.html#id-getter
-  mongoose.set('objectIdGetter', false)
+  mongoose.set("objectIdGetter", false);
 
   // turn on debug if in development and not explicitly turned off
-  mongoose.set('debug', (!config.suppressDebugLog && env == 'development'));//mongoose.set('debug',true);
-
-  // use bluebird promises globally within mongoose
-  mongoose.Promise = require('bluebird');
+  mongoose.set("debug", (!config.suppressDebugLog && env == "development"));//mongoose.set('debug',true);
 
   // todo - find a solution to load without worrying about order
 
@@ -59,6 +48,7 @@ var bootstrap = function(mongoose, config) {
   // none of these need to be loaded before anything
   require('./lib/Account.js')(mongoose, config);
   require('./lib/Activity.js')(mongoose, config);
+  require('./lib/ApiKey.js')(mongoose, config);
   require('./lib/CalendarEvent.js')(mongoose, config);
   require('./lib/CapTable.js')(mongoose, config);
   require('./lib/DiffbotArticle')(mongoose, config);

package/lib/Account.js

@@ -104,18 +104,16 @@ module.exports = function(mongoose, config) {
 
     let query = { email: email.toLowerCase() };
 
-    if (options.current || options.customerId) {
+    if (options.current !== undefined || options.customerId !== undefined) {
 
-      if (options.current !== undefined) query.current = options.current;
-      if (options.customerId !== undefined) query.org = options.current;
+      if (options.current !== undefined) { query.current = options.current; }
+      if (options.customerId !== undefined) { query.org = options.customerId; }
         
       self
         .findOne(query)
         .populate('person')
-        .exec(function(err, account) {
-
-          if (err) { return cb(err); }
-          else if (!account) { return cb(null, null); }
+        .exec().then(function(account) {
+      if (!account) { return cb(null, null); }
 
           if (account.populated('person')) {
 
@@ -126,7 +124,7 @@ module.exports = function(mongoose, config) {
 
           return cb(null, account);
 
-        });
+        }).catch(function(err) { cb(err); });
 
     }
 
@@ -134,8 +132,11 @@ module.exports = function(mongoose, config) {
 
       self
         .find(query)
-        .populate('org name')
-        .exec(cb);
+        .populate({
+          path: 'org',
+          select: 'name'
+        })
+        .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
     }
 
@@ -151,10 +152,8 @@ module.exports = function(mongoose, config) {
     self
       .find({ 'email': { $in : emails }})
       .populate('person')
-      .exec(function(err, accounts) {
-
-        if (err) { return cb(err); }
-        else if (!accounts) { return cb(null, null); }
+      .exec().then(function(accounts) {
+      if (!accounts) { return cb(null, null); }
 
         _.each(accounts, function(account) {
 
@@ -169,7 +168,7 @@ module.exports = function(mongoose, config) {
 
         return cb(null, accounts);
 
-      });
+      }).catch(function(err) { cb(err); });
 
   };
 
@@ -186,12 +185,8 @@ module.exports = function(mongoose, config) {
     query.populate('person');
     query.populate('org');
 
-    query.exec(function (err, account) {
-
-      if (err) {
-        return cb(err, null);
-      }
-      else if (account && account.populated('person') && account.populated('org')) {
+    query.exec().then(function(account) {
+      if (account && account.populated('person') && account.populated('org')) {
 
         // Scrub customer info before returning
 
@@ -217,7 +212,7 @@ module.exports = function(mongoose, config) {
         return cb(new Error('Unknown error'), null);
       }
 
-    });
+    }).catch(function(err) { cb(err); });
 
   };
 
@@ -233,7 +228,7 @@ module.exports = function(mongoose, config) {
 
     self
       .find({ 'org': customerId })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -246,18 +241,11 @@ module.exports = function(mongoose, config) {
 
     const self = this;
 
-    self.updateMany({ email: email }, { $set: { current: false } }, function(err, res) {
-
-      if (err) { return cb(err, null); }
+    self.updateMany({ email: email }, { $set: { current: false } }).then(function(res) {self.updateOne({ email: email, org: customerId }, { $set: { current: true } }).then(function(res) {cb(null, res);
       
-      self.updateOne({ email: email, org: customerId }, { $set: { current: true } }, function(err, res) {
+      }).catch(function(err) { cb(err); });
 
-        if (err) { return cb(err, null); }
-        cb(null, res);
-      
-      });
-
-    });
+    }).catch(function(err) { cb(err); });
 
   };
 
@@ -270,12 +258,9 @@ module.exports = function(mongoose, config) {
 
     const self = this;
       
-    self.updateOne({ email: email }, { $set: { org: customerId } }, function(err, res) {
-
-      if (err) { return cb(err, null); }
-      cb(null, res);
+    self.updateOne({ email: email }, { $set: { org: customerId } }).then(function(res) {cb(null, res);
     
-    });
+    }).catch(function(err) { cb(err); });
 
   };
 
@@ -287,7 +272,7 @@ module.exports = function(mongoose, config) {
 
     self
       .find({ 'active': true, 'role': 'admin' })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -303,7 +288,7 @@ module.exports = function(mongoose, config) {
       queryObj['org'] = options.CUSTOMER_ID;
     }
 
-    self.find(queryObj).exec(cb);
+    self.find(queryObj).exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -324,7 +309,7 @@ module.exports = function(mongoose, config) {
       .find({'active': true})
       .populate('person')
       .sort({'person.name.last': 1})
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -341,7 +326,7 @@ module.exports = function(mongoose, config) {
     self
       .find({'active': true})
       .select('active email auth')
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -365,7 +350,7 @@ module.exports = function(mongoose, config) {
         'auth.strategy': 'google',
         'auth.google.refreshToken': { $ne: null }
       })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -389,7 +374,7 @@ module.exports = function(mongoose, config) {
         'auth.strategy': 'microsoft',
         'auth.microsoft.refreshToken': { $ne: null }
       })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -401,7 +386,7 @@ module.exports = function(mongoose, config) {
     if (!id) { return cb(new Error('id is required'), null); }
     if (!mongoose.Types.ObjectId.isValid(id)) { return cb(new Error('id is not a valid ObjectId'), null); }
 
-    self.findByIdAndRemove(id, cb);
+    self.findByIdAndDelete(id).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -409,16 +394,12 @@ module.exports = function(mongoose, config) {
 
     // No population so no need to scrub
 
-    account.save(cb);
+    account.save().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
-
-
-  Account.set('usePushEach', true);
   Account.set('autoIndex', false);
-  Account.set('usePushEach', true);
   Account.on('index', function(err) { console.log('error building account indexes: ' + err); });
 
   mongoose.model('Account', Account);
 
-};
+};

package/lib/Activity.js

@@ -50,11 +50,7 @@ module.exports = function(mongoose, config) {
 
     username = username.toLowerCase();
 
-    self.findOne({ 'username': username }, function(err, activity) {
-
-      if (err) return callback(err, null);
-
-      if (!activity) {
+    self.findOne({ 'username': username }).then(function(activity) {if (!activity) {
         const A = mongoose.model('Activity');
         activity = new A();
         activity.username = username;
@@ -75,20 +71,20 @@ module.exports = function(mongoose, config) {
 
       if (activity) {
         activity.items.unshift(item);
-        activity.save(function(err, result) {
-          return callback(err, item);
-        });
+        activity.save().then(function(result) {
+          return callback(null, item);
+        }).catch(function(err) { callback(err); });
       }
       else {
         return callback(null, null);
       }
 
-    });
+    }).catch(function(err) { callback(err); });
 
   };
 
   Activity.statics.forMessage = function(username, messageId, cb) {
-    this.find({ 'username': username.toLowerCase(), 'items.document.messageId': messageId }, cb);
+    this.find({ 'username': username.toLowerCase(), 'items.document.messageId': messageId }).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   Activity.statics.list = function(username, maxItems, cb) {
@@ -97,13 +93,10 @@ module.exports = function(mongoose, config) {
 
     if (maxItems && maxItems >= 1) { query = query.slice('items', maxItems); }
 
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
-
-  Activity.set('usePushEach', true);
   Activity.set('autoIndex', false);
-  Activity.set('usePushEach', true);
   Activity.on('index', function(err) { console.log('error building activity indexes: ' + err); });
 
   mongoose.model('Activity', Activity);

package/lib/ApiKey.js

@@ -0,0 +1,68 @@
+"use strict";
+
+module.exports = function(mongoose, config) {
+
+  var Schema = mongoose.Schema;
+
+  var ApiKey = new Schema({
+    account:    { type: Schema.ObjectId, ref: 'Account', required: true },
+    customer:   { type: Schema.ObjectId, ref: 'Organization', required: true },
+    email:      { type: String, required: true },
+    scopes:     { type: [String], default: ['read'] },
+    tokenHash:  { type: String, required: true },
+    lastUsedOn: { type: Date },
+    createdOn:  { type: Date, default: Date.now },
+    active:     { type: Boolean, default: true }
+  });
+
+  ApiKey.index({ customer: 1, account: 1 });
+  ApiKey.index({ tokenHash: 1 });
+
+  ApiKey.statics.getByTokenHash = function(hash, cb) {
+
+    var self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!hash) { return cb(new Error('hash is required'), null); }
+
+    self
+      .findOne({ tokenHash: hash })
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+
+  };
+
+  ApiKey.statics.getByAccount = function(accountId, customerId, cb) {
+
+    var self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!accountId) { return cb(new Error('accountId is required'), null); }
+    if (!customerId) { return cb(new Error('customerId is required'), null); }
+
+    self
+      .find({ account: accountId, customer: customerId, active: true })
+      .sort({ createdOn: -1 })
+      .select('scopes createdOn lastUsedOn')
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+
+  };
+
+  ApiKey.statics.revoke = function(tokenId, accountId, customerId, cb) {
+
+    var self = this;
+
+    if (!cb) { throw new Error('cb is required'); }
+    if (!tokenId) { return cb(new Error('tokenId is required'), null); }
+
+    self.findOneAndUpdate(
+      { _id: tokenId, account: accountId, customer: customerId },
+      { active: false },
+      { new: true }).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
+
+  };
+  ApiKey.set('autoIndex', false);
+  ApiKey.on('index', function(err) { console.log('error building ApiKey indexes: ' + err); });
+
+  mongoose.model('ApiKey', ApiKey);
+
+};

package/lib/CalendarEvent.js

@@ -57,33 +57,33 @@ module.exports = function(mongoose, config) {
     var self = this;
 
     self
-      .findByIdAndRemove(calendarEventId)
-      .exec(cb);
+      .findByIdAndDelete(calendarEventId)
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
   CalendarEvent.statics.findByAccountId = function (accountId, cb) {
     this
       .find({ account: accountId })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.findByCreatedRange = function (since, until, cb) {
     this
       .find({ createdOn: { $gt: since, $lt: until } })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.findByCreatedSince = function (since, cb) {
     this
       .find({ createdOn: { $gt: since } })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.findByEmail = function (email, cb) {
     this
       .find({ email: email })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.findByEmailForRange = function (email, startsAfter, startsBefore, cb) {
@@ -91,48 +91,48 @@ module.exports = function(mongoose, config) {
     var self = this;
     var query = self.find({ email: email });
     query.where({ start: { $gte: startsAfter, $lte: startsBefore }});
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
   CalendarEvent.statics.findByEventId = function (eventId, cb) {
     this
       .findOne({ 'eventId': eventId })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.findUnprocessedForAccount = function (id, cb) {
     this
       .find({ account: id, processed: false })
       .populate('account', 'email customer')
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.findByUsername = function (username, cb) {
     this
       .find({ 'account.username': username })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.getById = function (id, cb) {
     this
       .findOne({ '_id': id })
       .populate('account', 'email customer')
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.getNewest = function (email, cb) {
     this
       .findOne({email: email})
       .sort({createdOn: -1})
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.getNewestProcessed = function (email, cb) {
     this
       .findOne({ email: email, processed: true })
       .sort({ createdOn: -1 })
-      .exec(cb);
+      .exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   CalendarEvent.statics.markAsProcessed = function markAsProcessed(id, cb) {
@@ -142,7 +142,7 @@ module.exports = function(mongoose, config) {
     var update = { $set: { processed: true } };
     var options = { 'upsert': false, 'new': true };
 
-    self.findOneAndUpdate(filter, update, options, cb);
+    self.findOneAndUpdate(filter, update, options).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -172,14 +172,10 @@ module.exports = function(mongoose, config) {
       raw: calendarEvent.raw
     };
 
-    self.findOneAndUpdate(query, update, options, cb);
+    self.findOneAndUpdate(query, update, options).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
-
-
-  CalendarEvent.set('usePushEach', true);
   CalendarEvent.set('autoIndex', false);
-  CalendarEvent.set('usePushEach', true);
   CalendarEvent.on('index', function(err) { console.log('error building calendar event indexes: ' + err); });
 
   mongoose.model('CalendarEvent', CalendarEvent);

package/lib/CapTable.js

@@ -165,7 +165,7 @@ module.exports = function(mongoose, config) {
     query.populate('stakeholders.person', 'name avatarUrl title');
     query.sort({ asOfDate: -1 });
 
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -178,7 +178,7 @@ module.exports = function(mongoose, config) {
     if (!mongoose.Types.ObjectId.isValid(customerid)) { return cb(new Error('customerid is not a valid ObjectId'), null); }
     if (!options) { return cb(new Error('options is required'), null); }
 
-    self.deleteMany({ customer: customerid, 'entered.by': { $ne: 'carta-parser' } }, cb);
+    self.deleteMany({ customer: customerid, 'entered.by': { $ne: 'carta-parser' } }).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -217,7 +217,7 @@ module.exports = function(mongoose, config) {
     query.populate('stakeholders.person', 'name avatarUrl title')
     query.sort({ asOfDate: -1 });
 
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -251,7 +251,7 @@ module.exports = function(mongoose, config) {
     }
 
     query.populate('organization', 'name logoUrl')
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -284,7 +284,7 @@ module.exports = function(mongoose, config) {
     }
 
     query.populate('organization', 'name logoUrl')
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -318,7 +318,7 @@ module.exports = function(mongoose, config) {
     }
 
     query.populate('organization', 'name logoUrl')
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -352,7 +352,7 @@ module.exports = function(mongoose, config) {
     }
 
     query.populate('organization', 'name logoUrl')
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -378,7 +378,7 @@ module.exports = function(mongoose, config) {
 
     query.populate('organization', 'name logoUrl');
     query.sort({ 'name': -1 });
-    query.exec(cb);
+    query.exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -420,7 +420,7 @@ module.exports = function(mongoose, config) {
               {
                 equals: {
                   path: 'customer',
-                  value: mongoose.Types.ObjectId(options.CUSTOMER_ID)
+                  value: new mongoose.Types.ObjectId(options.CUSTOMER_ID)
                 }
               }
             ],
@@ -462,7 +462,7 @@ module.exports = function(mongoose, config) {
           highlights: { $meta: "searchHighlights" }
         }
       }
-    ]).exec(cb);
+    ]).exec().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
@@ -470,13 +470,13 @@ module.exports = function(mongoose, config) {
 
     if (!capTable) { return cb(new Error('cap table is required'), null); }
 
-    capTable.save(cb);
+    capTable.save().then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
 
   };
 
   CapTable.statics.delete = function(id, cb) {
     var self = this;
-    self.findByIdAndRemove(id, cb);
+    self.findByIdAndDelete(id).then(function(result) { cb(null, result); }).catch(function(err) { cb(err); });
   };
 
   ///////////////////////////////////////////////////////////////////////////////////////
@@ -487,10 +487,7 @@ module.exports = function(mongoose, config) {
   ///////////////////////////////////////////////////////////////////////////////////////
   // CONFIG
   ///////////////////////////////////////////////////////////////////////////////////////
-
-  CapTable.set('usePushEach', true);
   CapTable.set('toJSON', { virtuals: true });
-  CapTable.set('usePushEach', true);
   CapTable.set('autoIndex', false);
 
   CapTable.index({ organization: 1, customer: 1, asOfDate: -1 });
@@ -498,4 +495,4 @@ module.exports = function(mongoose, config) {
 
   mongoose.model('CapTable', CapTable);
 
-};
+};