chore: update tests, disable reconfiguring service after start

Author: AVVS

package.json

@@ -43,7 +43,7 @@
     "flake-idgen": "^1.1.0",
     "get-stdin": "^7.0.0",
     "get-value": "^3.0.1",
-    "handlebars": "^4.3.2",
+    "handlebars": "^4.3.3",
     "ioredis": "^4.14.1",
     "is": "^3.3.0",
     "jsonwebtoken": "^8.5.1",

rfcs/password_validation_limits.md

@@ -20,7 +20,7 @@ Enabling password validator is Breaking change and disabled by default.
 In the nearest future, when everything will be ready, a validator must be enabled.
 
 ## Validator Keyword
-Service validation algorithm based on the AJV validator and all validation requirements are inside schemas. All incoming requests checked. We can add additional custom validator `password` keyword for the `password` field, which performs required checks. 
+Service validation algorithm based on the AJV validator and all validation requirements are inside schemas. All incoming requests checked. We can add additional custom validator `password` keyword for the `password` field, which performs required checks.
 
 Current schema:
 
@@ -51,7 +51,7 @@ The parameter accepts the required strength in the range [0-4] that describes th
 
 According to the registration process, some passwords generated by service, so custom validator should omit password check if `skipPassword` request param provided.
 
-When executed: 
+When executed:
 - checks username does not match provided password
 - calls `zxcvbn` to obtain a complexity of passwords and returns whether the given password matches policy
 
@@ -63,9 +63,9 @@ Also, we can pass user-provided data into `zxcvbn` to check whether some sensiti
 const config = {
   enabled: false,
   minStrength: 3, // Desired strength
-  forceCheckFieldName: 'checkPassword', // force enable password to check if the object field value set..
+  forceCheckFieldName: ['checkPassword'], // force enable password to check if the object field value set..
   inputFieldNames: [ // Linked fields list, allow filter case sensitive data in the password from the parent object.
-    'username', 
+    'username',
     'otherfield'
   ]
 }

schemas/config.json

@@ -291,10 +291,17 @@
         },
         "minStrength": {
           "type": "integer",
-          "default" : 4
+          "default" : 4,
+          "minimum": 0,
+          "maximum": 4
         },
         "forceCheckFieldName": {
-          "type": "string"
+          "type": "array",
+          "items": {
+            "type": "string",
+            "minLength": 1
+          },
+          "default": []
         },
         "inputFieldNames": {
           "type": "array",

src/configs/core.js

@@ -76,7 +76,7 @@ exports.logger = {
 exports.passwordValidator = {
   enabled: false,
   minStrength: 4, // 0..4
-  forceCheckFieldName: 'checkPassword',
+  forceCheckFieldName: ['checkPassword'],
   inputFieldNames: [
     'username',
   ],

src/users.js

@@ -9,6 +9,7 @@ const RedisCluster = require('ioredis').Cluster;
 const Flakeless = require('ms-flakeless');
 const conf = require('./config');
 const get = require('./utils/get-value');
+const attachPasswordKeyword = require('./utils/passwordValidator.js');
 
 /**
  * @namespace Users
@@ -125,9 +126,8 @@ module.exports = class Users extends Microfleet {
       return this.dlock;
     });
 
-    this.addConnector(ConnectorsTypes.application, () => {
-      const pValidator = require('./utils/passwordValidator.js');
-      pValidator(this);
+    this.addConnector(ConnectorsTypes.essential, () => {
+      attachPasswordKeyword(this);
     });
 
     // init account seed

src/utils/passwordValidator.js

@@ -1,12 +1,10 @@
 const zxcvbn = require('zxcvbn');
 const assert = require('assert');
-const {
-  NotFoundError,
-} = require('common-errors');
+const { NotFoundError } = require('common-errors');
 
 const regKeyword = 'password';
-
-const has = Object.prototype.hasOwnProperty;
+const { hasOwnProperty } = Object.prototype;
+const { isArray } = Array;
 
 /**
  * Generates readable error including some Suggestions and Reasons
@@ -22,7 +20,8 @@ function validatorError(result, dataPath) {
     if (warning !== '') {
       message = `${message}. ${warning}`;
     }
-    if (suggestions instanceof Array && suggestions.length > 0) {
+
+    if (isArray(suggestions) && suggestions.length > 0) {
       message = `${message}. ${suggestions.join(' ')}`;
     }
   }
@@ -35,21 +34,29 @@ function validatorError(result, dataPath) {
  * @param {validatorConfig} config
  */
 function getValidatorFn(config) {
-  const { forceCheckFieldName, inputFieldNames } = config;
+  // service may not have its config changed after start
+  const { forceCheckFieldName, inputFieldNames, minStrength, enabled } = config;
 
   return function validate(schema, data, parentSchema, currentPath, parentObject) {
-    const { minStrength, enabled } = config;
-    const forceValidate = has.call(parentObject, forceCheckFieldName);
-    const validatorEnabled = forceValidate || enabled;
+    let forceValidate;
+    if (Array.isArray(forceCheckFieldName) && forceCheckFieldName.length > 0) {
+      forceValidate = forceCheckFieldName.reduce((prev, fieldName) => {
+        if (prev) return prev;
+        if (parentObject[fieldName]) return true;
+        return false;
+      }, false);
+    }
 
+    const validatorEnabled = forceValidate || enabled;
     if (!validatorEnabled) {
       return true;
     }
 
     const userInput = inputFieldNames.reduce((prev, fieldName) => {
-      if (has.call(parentObject, fieldName)) {
-        return [...prev, parentObject[fieldName]];
+      if (hasOwnProperty.call(parentObject, fieldName)) {
+        prev.push(parentObject[fieldName]);
       }
+
       return prev;
     }, []);
 

test/helpers/organization.js

@@ -1,7 +1,6 @@
 const faker = require('faker');
 const Promise = require('bluebird');
 const times = require('lodash/times');
-const { inspectPromise } = require('@makeomatic/deploy');
 
 async function createMembers(totalUsers = 1, register = false) {
   this.userNames = [];
@@ -36,9 +35,8 @@ exports.createOrganization = async function createOrganization(customOpts = {},
     members: this.userNames.slice(0, totalUsers),
     ...customOpts,
   };
-  const organization = await this.dispatch('users.organization.create', params)
-    .reflect()
-    .then(inspectPromise(true));
+
+  const organization = await this.dispatch('users.organization.create', params);
 
   this.organization = {
     ...organization.data.attributes,

test/suites/organization/create.js

@@ -38,17 +38,14 @@ describe('#create organization', function registerSuite() {
       members: this.userNames.slice(0, 2),
     };
 
-    await this.dispatch('users.organization.create', params)
-      .reflect()
-      .then(inspectPromise(true))
-      .then((response) => {
-        const createdOrganization = response.data.attributes;
-        assert(createdOrganization.name === params.name);
-        assert(createdOrganization.metadata.description === params.metadata.description);
-        assert(createdOrganization.members.length === 1);
-        assert.ok(createdOrganization.id);
-        assert(createdOrganization.active === false);
-      });
+    const response = await this.dispatch('users.organization.create', params);
+
+    const createdOrganization = response.data.attributes;
+    assert(createdOrganization.name === params.name);
+    assert(createdOrganization.metadata.description === params.metadata.description);
+    assert(createdOrganization.members.length === 1);
+    assert.ok(createdOrganization.id);
+    assert(createdOrganization.active === false);
 
     const [registeredMember] = await sendInviteMailSpy.returnValues[0];
     const registeredMemberPassword = generatePasswordSpy.firstCall.args[0];

test/suites/organization/get.js

@@ -26,8 +26,6 @@ describe('#get organization', function registerSuite() {
   it('must be able to get organization', async function test() {
     const { invites, ...organization } = this.organization;
     return this.dispatch('users.organization.get', { organizationId: this.organization.id })
-      .reflect()
-      .then(inspectPromise(true))
       .then((response) => {
         assert.deepEqual(response.data.attributes, organization);
       });

test/suites/organization/getMetadata.js

@@ -29,8 +29,6 @@ describe('#organization members metadata', function registerSuite() {
     };
 
     return this.dispatch('users.organization.getMetadata', opts)
-      .reflect()
-      .then(inspectPromise(true))
       .then((response) => {
         assert.ok(response.data.attributes);
         assert.deepEqual(response.data.attributes, this.organization.metadata);