compass-user-model 2.0.0 → 2.2.0

package/index.js

@@ -1,3 +1,3 @@
-var Model = require('./lib/model');
+const Model = require('./lib/model');
 
 module.exports = Model;

package/lib/model.js

@@ -1,23 +1,17 @@
-var Model = require('ampersand-model');
-var storageMixin = require('storage-mixin');
-var uuid = require('uuid');
+const Model = require('ampersand-model');
+const storageMixin = require('storage-mixin');
+const uuid = require('uuid');
+const compassUtils = require('@mongodb-js/compass-utils');
+const basepath = (compassUtils.getStoragePaths() || {}).basepath;
 
-var electronApp;
-try {
-  electronApp = require('@electron/remote').app;
-} catch (e) {
-  /* eslint no-console: 0 */
-  console.log('Could not load @electron/remote', e.message);
-}
+// const debug = require('debug')('scout:user');
 
-// var debug = require('debug')('scout:user');
-
-var User = Model.extend(storageMixin, {
+const User = Model.extend(storageMixin, {
   idAttribute: 'id',
   namespace: 'Users',
   storage: {
     backend: 'disk',
-    basepath: electronApp ? electronApp.getPath('userData') : undefined
+    basepath: basepath
   },
   props: {
     id: {
@@ -43,8 +37,8 @@ var User = Model.extend(storageMixin, {
   }
 });
 
-User.getOrCreate = function(id, done) {
-  var user = new User({
+User.getOrCreate = (id) => new Promise((resolve, reject) => {
+  const user = new User({
     id: id || uuid.v4(),
     createdAt: new Date()
   });
@@ -53,12 +47,12 @@ User.getOrCreate = function(id, done) {
       user.save({
         lastUsed: new Date()
       });
-      done(null, user);
+      resolve(user);
     },
     error: function(model, err) {
-      done(err);
+      reject(err);
     }
   });
-};
+});
 
 module.exports = User;

package/package.json

@@ -2,7 +2,7 @@
   "name": "compass-user-model",
   "description": "MongoDB user model.",
   "author": "Lucas Hrabovsky <lucas@mongodb.com>",
-  "version": "2.0.0",
+  "version": "2.2.0",
   "bugs": {
     "url": "https://jira.mongodb.org/projects/COMPASS/issues",
     "email": "compass@mongodb.com"
@@ -40,21 +40,20 @@
     "ampersand-state": "5.0.3",
     "debug": "^2.2.0",
     "lodash.get": "^4.4.2",
-    "mongodb-collection-model": "^5.0.0",
-    "mongodb-database-model": "^2.0.0",
+    "mongodb-collection-model": "^5.2.0",
+    "mongodb-database-model": "^2.2.0",
     "mongodb-ns": "^2.4.0",
     "raf": "^3.4.1",
-    "storage-mixin": "^5.0.0",
+    "storage-mixin": "^5.1.0",
     "uuid": "^3.3.2"
   },
   "devDependencies": {
-    "@electron/remote": "^2.0.8",
+    "@mongodb-js/compass-utils": "^0.1.1",
     "depcheck": "^1.4.1",
-    "electron": "^15.5.7",
     "eslint": "^7.25.0",
     "eslint-config-mongodb-js": "^3.0.1",
     "lodash.result": "^4.5.2",
     "mocha": "^6.0.2"
   },
-  "gitHead": "a30734888ab496a07d58e26870e5e33b374e98f7"
+  "gitHead": "10815be8fd57f3bfd89d061e1592eb7136d4a0fb"
 }