feat: abstract DB Adapter

src/actions/activate.js

@@ -2,7 +2,7 @@ const Promise = require('bluebird');
 const emailVerification = require('../utils/send-email.js');
 const jwt = require('../utils/jwt.js');
 const { User } = require('../model/usermodel');
-const { ModelError } = require('../model/modelError');
+const { httpErrorMapper } = require('../model/modelError');
 
 module.exports = function verifyChallenge(opts) {
   // TODO: add security logs
@@ -26,5 +26,5 @@ module.exports = function verifyChallenge(opts) {
     .tap(hook)
     .then(user => [user, audience])
     .spread(jwt.login)
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/alias.js

@@ -3,7 +3,7 @@ const isActive = require('../utils/isActive');
 const isBanned = require('../utils/isBanned');
 
 const { User } = require('../model/usermodel');
-const { ModelError } = require('../model/modelError');
+const { httpErrorMapper } = require('../model/modelError');
 
 
 module.exports = function assignAlias(opts) {
@@ -16,5 +16,5 @@ module.exports = function assignAlias(opts) {
     .tap(isBanned)
     .then(data => ({ username, alias, data }))
     .then(User.User.setAlias)
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/ban.js

@@ -1,6 +1,6 @@
 const Promise = require('bluebird');
 const { User } = require('../model/usermodel');
-const { ModelError } = require('../model/modelError');
+const { httpErrorMapper } = require('../model/modelError');
 
 /**
  * Bans/unbans existing user
@@ -13,5 +13,5 @@ module.exports = function banUser(opts) {
     .then(User.getUsername)
     .then(username => ({ username, opts }))
     .then(opts.ban ? User.lock : User.unlock)
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/challenge.js

@@ -2,7 +2,7 @@ const Promise = require('bluebird');
 const emailChallenge = require('../utils/send-email.js');
 const isActive = require('../utils/isActive');
 const { User } = require('../model/usermodel');
-const { ModelError, ERR_USERNAME_ALREADY_ACTIVE } = require('../model/modelError');
+const { ModelError, httpErrorMapper, ERR_USERNAME_ALREADY_ACTIVE } = require('../model/modelError');
 
 module.exports = function sendChallenge(message) {
   const { username } = message;
@@ -17,5 +17,5 @@ module.exports = function sendChallenge(message) {
     .throw(new ModelError(ERR_USERNAME_ALREADY_ACTIVE, username))
     .catchReturn({ statusCode: 412 }, username)
     .then(emailChallenge.send)
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/getInternalData.js

@@ -2,7 +2,7 @@ const Promise = require('bluebird');
 const pick = require('lodash/pick');
 
 const { User } = require('../model/usermodel');
-const { ModelError } = require('../model/modelError');
+const { httpErrorMapper } = require('../model/modelError');
 
 module.exports = function internalData(message) {
   const { fields } = message;
@@ -13,5 +13,5 @@ module.exports = function internalData(message) {
     .then(data => {
       return fields ? pick(data, fields) : data;
     })
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/getMetadata.js

@@ -1,6 +1,6 @@
 const Promise = require('bluebird');
 const { User } = require('../model/usermodel');
-const { ModelError } = require('../model/modelError');
+const { httpErrorMapper } = require('../model/modelError');
 
 module.exports = function getMetadataAction(message) {
   const { audience, username, fields } = message;
@@ -10,5 +10,5 @@ module.exports = function getMetadataAction(message) {
     .then(User.getUsername)
     .then(realUsername => [realUsername, audience, fields, message.public])
     .spread(User.getMeta)
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/list.js

@@ -1,11 +1,11 @@
 const Promise = require('bluebird');
 const { User } = require('../model/usermodel');
-const { ModelError } = require('../model/modelError');
+const { httpErrorMapper } = require('../model/modelError');
 
 
 module.exports = function iterateOverActiveUsers(opts) {
   return Promise
     .bind(this, opts)
     .then(User.getList)
-    .catch(e => { throw (e instanceof ModelError ? e : e.mapToHttp); });
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/login.js

@@ -2,9 +2,10 @@ const Promise = require('bluebird');
 const scrypt = require('../utils/scrypt.js');
 const jwt = require('../utils/jwt.js');
 const noop = require('lodash/noop');
-
-const Users = require('../db/adapter');
-
+const isActive = require('../utils/isActive');
+const isBanned = require('../utils/isBanned');
+const { User, Attempts } = require('../model/usermodel');
+const { httpErrorMapper } = require('../model/modelError');
 
 module.exports = function login(opts) {
   const config = this.config.jwt;
@@ -25,21 +26,21 @@ module.exports = function login(opts) {
 
   function enrichError(err) {
     if (remoteip) {
-      err.loginAttempts = Users.getAttempts();
+      err.loginAttempts = Attempts.count();
     }
 
-    throw err;
+    return err;
   }
 
   return Promise
     .bind(this, opts.username)
-    .then(Users.getUser)
+    .then(User.getOne)
     .then(data => [data, remoteip])
-    .tap(verifyIp ? Users.checkLoginAttempts : noop)
+    .tap(verifyIp ? Attempts.check : noop)
     .tap(verifyHash)
-    .tap(verifyIp ? Users.dropAttempts : noop)
-    .tap(Users.isActive)
-    .tap(Users.isBanned)
+    .tap(verifyIp ? Attempts.drop : noop)
+    .tap(isActive)
+    .tap(isBanned)
     .then(getUserInfo)
-    .catch(verifyIp ? enrichError : e => { throw e; });
+    .catch(e => { throw httpErrorMapper(verifyIp ? enrichError(e) : e); });
 };

src/actions/remove.js

@@ -1,21 +1,23 @@
 const Promise = require('bluebird');
-const Errors = require('common-errors');
 const { USERS_ADMIN_ROLE } = require('../constants');
-const Users = require('../db/adapter');
+const { User } = require('../model/usermodel');
+const { ModelError, httpErrorMapper, ERR_ADMIN_IS_UNTOUCHABLE } = require('../model/modelError');
+
 
 module.exports = function removeUser({ username }) {
   const audience = this.config.jwt.defaultAudience;
 
   return Promise.props({
-    internal: Users.getUser(username),
-    meta: Users.getMetadata(username, audience),
+    internal: User.getOne.call(this, username),
+    meta: User.getMeta.call(this, username, audience),
   })
   .then(({ internal, meta }) => {
     const isAdmin = (meta[audience].roles || []).indexOf(USERS_ADMIN_ROLE) >= 0;
     if (isAdmin) {
-      throw new Errors.HttpStatusError(400, 'can\'t remove admin user from the system');
+      throw new ModelError(ERR_ADMIN_IS_UNTOUCHABLE);
     }
 
-    return Users.removeUser(username, internal);
-  });
+    return User.remove.call(this, username, internal);
+  })
+  .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/requestPassword.js

@@ -1,6 +1,10 @@
 const Promise = require('bluebird');
 const emailValidation = require('../utils/send-email.js');
-const Users = require('../db/adapter');
+const isActive = require('../utils/isActive');
+const isBanned = require('../utils/isBanned');
+const { User } = require('../model/usermodel');
+const { httpErrorMapper } = require('../model/modelError');
+
 
 module.exports = function requestPassword(opts) {
   const { username, generateNewPassword } = opts;
@@ -11,9 +15,10 @@ module.exports = function requestPassword(opts) {
 
   return Promise
     .bind(this, username)
-    .then(Users.getUser)
-    .tap(Users.isActive)
-    .tap(Users.isBanned)
+    .then(User.getOne)
+    .tap(isActive)
+    .tap(isBanned)
     .then(() => emailValidation.send.call(this, username, action))
-    .return({ success: true });
+    .return({ success: true })
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/updateMetadata.js

@@ -1,10 +1,12 @@
 const Promise = require('bluebird');
-const Users = require('../db/adapter');
+const { User } = require('../model/usermodel');
+const { httpErrorMapper } = require('../model/modelError');
 
 module.exports = function updateMetadataAction(message) {
   return Promise
     .bind(this, message.username)
-    .then(Users.isExists)
+    .then(User.getUsername)
     .then(username => ({ ...message, username }))
-    .then(Users.updateMetadata);
+    .then(message.script ? User.executeUpdateMetaScript : User.setMeta)
+    .catch(e => { throw httpErrorMapper(e); });
 };

src/actions/updatePassword.js

@@ -2,7 +2,13 @@ const Promise = require('bluebird');
 const scrypt = require('../utils/scrypt.js');
 const jwt = require('../utils/jwt.js');
 const emailChallenge = require('../utils/send-email.js');
-const Users = require('../db/adapter');
+
+const isActive = require('../utils/isActive');
+const isBanned = require('../utils/isBanned');
+
+const { User, Attempts } = require('../model/usermodel');
+const { httpErrorMapper } = require('../model/modelError');
+
 
 /**
  * Verifies token and deletes it if it matches
@@ -20,11 +26,12 @@ function tokenReset(token) {
 function usernamePasswordReset(username, password) {
   return Promise
     .bind(this, username)
-    .then(Users.getUser)
-    .tap(Users.isActive)
-    .tap(Users.isBanned)
+    .then(User.getOne)
+    .tap(isActive)
+    .tap(isBanned)
     .tap(data => scrypt.verify(data.password, password))
-    .return(username);
+    .return(username)
+    .catch(e => { throw httpErrorMapper(e); });
 }
 
 /**
@@ -35,12 +42,13 @@ function usernamePasswordReset(username, password) {
 function setPassword(_username, password) {
   return Promise
     .bind(this, _username)
-    .then(Users.isExists)
+    .then(User.getUsername)
     .then(username => Promise.props({
       username,
       hash: scrypt.hash(password),
     }))
-    .then(Users.setPassword);
+    .then(User.setPassword)
+    .catch(e => { throw httpErrorMapper(e); });
 }
 
 module.exports = exports = function updatePassword(opts) {
@@ -65,7 +73,7 @@ module.exports = exports = function updatePassword(opts) {
 
   if (remoteip) {
     promise = promise.tap(function resetLock(username) {
-      return Users.resetIPLock(username, remoteip);
+      return Attempts.drop(username, remoteip);
     });
   }
 

src/actions/verify.js

@@ -1,6 +1,7 @@
 const Promise = require('bluebird');
 const jwt = require('../utils/jwt.js');
-const Users = require('../db/adapter');
+const { User } = require('../model/usermodel');
+const { httpErrorMapper } = require('../model/modelError');
 
 /**
  * Verifies that passed token is signed correctly, returns associated metadata with it
@@ -25,7 +26,8 @@ module.exports = function verify(opts) {
       const username = decoded.username;
       return Promise.props({
         username,
-        metadata: Users.getMetadata(username, audience),
+        metadata: User.getMeta.call(this, username, audience),
       });
-    });
+    })
+    .catch(e => { throw httpErrorMapper(e); });
 };