@dhyasama/totem-models 3.2.0 → 3.3.1

package/lib/Account.js

@@ -14,33 +14,9 @@ module.exports = function(mongoose, config) {
   var Account = new Schema({
 
     username: { type: String, required: true, unique: true },
-    password: { type: String, default: '' },
     email: { type: String, required: true, unique: true },
-    reset: {
-      token: { type: String },
-      expiresOn: { type: Date }
-    },
-    setup: {
-      token: { type: String },
-      expiresOn: { type: Date },
-      complete: { type: Boolean},
-      terms: {
-        raw: { type: String },
-        hash: { type: String }
-      }
-    },
-    twoFactorAuth: {
-      enabled: { type: Boolean },
-      phone: { type: String },
-      country: {
-        callingCode: { type: String },
-        abbreviation:  { type: String }
-      },
-      verified: { type: Boolean }
-    },
     admin: { type: Boolean },
     active: { type: Boolean },
-    subscriber: { type: Boolean },
     role: { type: String, enum: ['admin', 'lp-full', 'lp-names', 'welcome', 'none'] },
 
     // Enable this and iLevel links will show on portfolio pages
@@ -85,12 +61,30 @@ module.exports = function(mongoose, config) {
     calendar: {
       active: { type: Boolean, default: false },       // only pull if this is active
       forcePullAll: { type: Boolean, default: false }  // override newest event date as min and go back all the way
+    },
+
+    inbound: {
+      active: { type: Boolean, default: false }
     }
 
   });
 
-  Account.methods.phone = function() {
-    return this.twoFactorAuth.country.callingCode + this.twoFactorAuth.phone;
+  Account.statics.findByEmail = function(email, cb) {
+    this
+      .findOne({ 'email': email})
+      .populate('person')
+      .exec(function (err, account) {
+        cb(err, account);
+      });
+  };
+
+  Account.statics.findByUsername = function(username, cb) {
+    this
+      .findOne({ 'username': new RegExp(username, 'i') })
+      .populate('person')
+      .exec(function (err, account) {
+        cb(err, account);
+      });
   };
 
   Account.statics.getById = function (id, cb) {
@@ -127,91 +121,6 @@ module.exports = function(mongoose, config) {
       .exec(cb);
   };
 
-  Account.statics.upsert = function(account, cb) {
-    account.save(cb);
-  };
-
-  Account.statics.findByUsername = function(username, cb) {
-    this
-      .findOne({ 'username': new RegExp(username, 'i') })
-      .populate('person')
-      .exec(function (err, account) {
-        cb(err, account);
-      });
-  };
-
-  Account.statics.findByEmail = function(email, cb) {
-    this
-      .findOne({ 'email': email})
-      .populate('person')
-      .exec(function (err, account) {
-        cb(err, account);
-      });
-  };
-
-  Account.statics.findByffEmail = function(email, cb) {
-    email = email.toLowerCase();
-
-    if (email.indexOf('@ffvc.com') > -1) {
-      this
-        .findOne({ 'email': email})
-        .populate('person')
-        .exec(function (err, account) {
-          cb(err, account);
-        });
-    } else {
-      //passing in null err so passport hits failureRedirect: '/login'
-      cb(null, null);
-    }
-  };
-
-  Account.statics.findByResetToken = function(token, cb) {
-    this
-      .findOne({ 'reset.token': token})
-      .populate('person')
-      .exec(function (err, account) {
-        cb(err, account);
-      });
-  };
-
-  Account.statics.findBySetupToken = function(token, cb) {
-    this
-      .findOne({ 'setup.token': token})
-      .populate('person')
-      .exec(function (err, account) {
-        cb(err, account);
-      });
-  };
-
-  Account.statics.findByCredentials = function (username, cleartextPassword, cb) {
-
-    this
-      .findOne({ 'username': new RegExp(username, 'i') })
-      .populate('person')
-      .exec(function (err, account) {
-
-        if (err) {
-          return cb(err, null);
-        }
-        else if (account != null) {
-
-          // found user, now check password
-
-          bcrypt.compare(cleartextPassword, account.password, function(err, res) {
-            if (err) { return cb(err, null); } // error
-            else if (res) { return cb(null, account); } // correct password
-            else { return cb(null, null); } // wrong password
-          });
-
-        }
-        else {
-          return cb(null, null); // user not found
-        }
-
-      });
-
-  };
-
   Account.statics.listGoogleAccounts = function(cb) {
 
     this
@@ -252,6 +161,10 @@ module.exports = function(mongoose, config) {
 
   };
 
+  Account.statics.upsert = function(account, cb) {
+    account.save(cb);
+  };
+
   Account.post('remove', function(doc) {
     // CalendarEvent.account
     // Person.account

package/lib/Document.js

@@ -25,7 +25,10 @@ module.exports = function(mongoose, config) {
 
     contentLength: { type: String, required: true },
 
-    s3key: { type: String, required: true }
+    s3: {
+      bucket: { type: String, required: true, trim: true },
+      key: { type: String, required: true, trim: true }
+    }
 
   });
 
@@ -61,7 +64,6 @@ module.exports = function(mongoose, config) {
     };
 
     doc.createdOn = new Date();
-    doc.customer = config.CUSTOMER_ID;
 
     this.create(doc, addToModel);
 

package/lib/Interaction.js

@@ -78,7 +78,7 @@ module.exports = function(mongoose, config) {
 
     var self = this;
     var query = self.find({ totemCustomerId: customerId, _id: { $gt: sinceObjectId } });
-
+    query.populate('attendees.external');
     query.exec(cb);
 
   };

package/lib/Message.js

@@ -25,7 +25,8 @@ module.exports = function(mongoose, config) {
       external: [{ type: Schema.ObjectId,  ref: 'Person', index: true }] // everyone else
     },
     notes: [ { type: Schema.ObjectId, ref: 'Note' } ],
-    documents: [ { type: Schema.ObjectId, ref: 'Document' } ]
+    documents: [ { type: Schema.ObjectId, ref: 'Document' } ],
+    raw: { type: Schema.Types.Mixed, required: true }
 
   });
 

package/lib/Organization.js

@@ -175,6 +175,14 @@ module.exports = function(mongoose, config) {
 
         eshares: {
           firmid: { type: String, unique: true, partialFilterExpression : { type :"string" }, trim: true }
+        },
+
+        calendar: {
+          active: { type: Boolean, default: false }
+        },
+
+        inbound: {
+          active: { type: Boolean, default: false }
         }
 
       },
@@ -722,7 +730,7 @@ module.exports = function(mongoose, config) {
   };
 
   Organization.statics.findBySlugs = function findBySlugs(slugs, cb) {
-    this.find({ 'slug': { $in : slugs }, 'deleted': {$ne: true} }).exec(cb);
+    this.find({ 'slug': { $in : slugs } }).exec(cb);
   };
 
   Organization.statics.findDupes = function findDupes(org, options, cb) {
@@ -1306,7 +1314,7 @@ module.exports = function(mongoose, config) {
       self.people = _.reject(self.people, function(p) { return p.person == null; });
 
       // dedupe
-      self.people = _.uniq(self.people, function(p) { return p.person._id ? p.person._id : p.person; });
+      self.people = _.uniq(self.people, function(p) { return p.person._id ? p.person._id.toString() : p.person.toString(); });
 
     };
 

package/lib/Person.js

@@ -806,7 +806,7 @@ module.exports = function(mongoose, config) {
 
   Person.statics.findBySlugs = function (slugs, cb) {
     this
-      .find({ 'slug': { $in : slugs }, 'deleted': {$ne: true} })
+      .find({ 'slug': { $in : slugs } })
       .exec(cb);
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dhyasama/totem-models",
-  "version": "3.2.0",
+  "version": "3.3.1",
   "author": "Jason Reynolds",
   "license": "UNLICENSED",
   "description": "Models for Totem platform",
@@ -15,8 +15,8 @@
     "@dhyasama/ffvc-crypto": "^1.0.0",
     "@dhyasama/ffvc-geoip": "^1.0.0",
     "@dhyasama/ffvc-s3": "^1.0.0",
-    "@dhyasama/ffvc-utilities": "^2.2.0",
-    "async": "^2.6.0",
+    "@dhyasama/ffvc-utilities": "^2.3.1",
+    "async": "^2.6.1",
     "awesome-phonenumber": "^1.0.14",
     "bcrypt": "^0.8.0",
     "bluebird": "^3.5.0",

package/test/Account.js

@@ -45,10 +45,7 @@ describe('Account', function() {
         var account = new Account();
 
         account.username = 'testy';
-        account.email = 'sebastian+soler@gmail.com'
-        account.reset.token = '123456789';
-        account.setup.token = '987654321';
-        account.password = hash;
+        account.email = 'test@totemvc.com';
         account.person = newPerson;
         account.active = true;
 
@@ -88,37 +85,7 @@ describe('Account', function() {
 
   it('finds by email', function(done) {
 
-    Account.findByEmail('sebastian+soler@gmail.com', function(err, account) {
-      should.not.exist(err);
-      should.exist(account);
-      done();
-    });
-
-  });
-
-  it('finds by reset token', function(done) {
-
-    Account.findByResetToken('123456789', function(err, account) {
-      should.not.exist(err);
-      should.exist(account);
-      done();
-    });
-
-  });
-
-  it('finds by setup token', function(done) {
-
-    Account.findBySetupToken('987654321', function(err, account) {
-      should.not.exist(err);
-      should.exist(account);
-      done();
-    });
-
-  });
-
-  it('finds by username and password', function(done) {
-
-    Account.findByCredentials('testy', 'testy', function(err, account) {
+    Account.findByEmail('test@totemvc.com', function(err, account) {
       should.not.exist(err);
       should.exist(account);
       done();

package/test/Document.js

@@ -51,7 +51,8 @@ describe('Document', function() {
 
     message = new Message({
       webhook: new mongoose.Types.ObjectId(),
-      customer: config.CUSTOMER_ID
+      customer: config.CUSTOMER_ID,
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {
@@ -129,11 +130,15 @@ describe('Document', function() {
   it('creates a document for an interaction', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'your_mom.doc',
       contentType: 'application/doc',
       contentLength: 1248,
-      s3key: '/totem/docs'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Interaction, interaction._id, function(err, result) {
 
       should.not.exist(err);
@@ -151,11 +156,15 @@ describe('Document', function() {
   it('creates a document for a message', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'plain.txt',
       contentType: 'text/plain',
       contentLength: 124,
-      s3key: '/totem/doculate'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Message, message._id, function(err, result) {
 
       should.not.exist(err);
@@ -173,11 +182,15 @@ describe('Document', function() {
   it('creates a document for an organization', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'test_file.jpg',
       contentType: 'image/jpeg',
       contentLength: 12345,
-      s3key: '/totem/documents'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Organization, org._id, function(err, result) {
 
       should.not.exist(err);
@@ -197,11 +210,15 @@ describe('Document', function() {
   it('creates a document for a person', function(done) {
 
     Document.createForModel({
+      customer: config.CUSTOMER_ID,
       createdBy: documentCreator,
       name: 'test.pdf',
       contentType: 'application/pdf',
       contentLength: 54321,
-      s3key: '/documents/totem'
+      s3: {
+        bucket: 'totem',
+        key: 'docs'
+      }
     }, Person, person._id, function(err, result) {
 
       should.not.exist(err);

package/test/Message.js

@@ -34,7 +34,8 @@ describe('Message', function() {
       subject: 'Message one',
       recipients: {
         external: [externalAttendee1]
-      }
+      },
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {
@@ -53,7 +54,8 @@ describe('Message', function() {
       subject: 'Message two',
       recipients: {
         external: [externalAttendee2]
-      }
+      },
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {
@@ -114,7 +116,8 @@ describe('Message', function() {
       subject: 'test 3',
       recipients: {
         external: [new mongoose.Types.ObjectId()]
-      }
+      },
+      raw: { test: 'test' }
     });
 
     Message.upsert(message, function(err, result) {

package/test/Person.js

@@ -537,9 +537,6 @@ describe('Person', function() {
 
     account.username = 'testy';
     account.email = 'test@ffvc.com';
-    account.reset.token = '123456789';
-    account.setup.token = '987654321';
-    account.password = 'piratebooty';
     account.person = person;
 
     Account.upsert(account, function(err, updatedAccount) {

package/.npmignore

@@ -1,14 +0,0 @@
-lib-cov
-*.seed
-*.log
-*.csv
-*.dat
-*.out
-*.pid
-*.gz
-
-npm-debug.log
-node_modules
-
-.DS_Store
-.idea