feat(bin): assign affiliate

Author: AVVS

bin/assign-affiliate.js

@@ -0,0 +1,73 @@
+#!/usr/bin/env node
+
+const assert = require('assert');
+const Redis = require('ioredis').Cluster;
+const { argv } = require('yargs')
+  .option('id', {
+    type: 'string',
+    description: 'user id that is being altered',
+    required: true,
+  })
+  .option('code', {
+    type: 'string',
+    description: 'referral code to assign to the user',
+    required: true,
+  })
+  .option('overwrite', {
+    type: 'boolean',
+    description: 'when referral was already set - must pass to overwrite',
+    default: false,
+  });
+
+(async () => {
+  const conf = require('../lib/config');
+  const {
+    USERS_REFERRAL_INDEX,
+    USERS_REFERRAL_FIELD,
+    USERS_METADATA,
+    USERS_ALIAS_TO_ID,
+  } = require('../lib/constants');
+
+  const handleRedisPipelineError = require('../lib/utils/pipelineError');
+  const redisKey = require('../lib/utils/key');
+  const redisConfig = conf.get('/redis', { env: process.env.NODE_ENV });
+  const audience = conf.get('/jwt/defaultAudience', { env: process.env.NODE_ENV });
+  const opts = Object.assign({}, redisConfig.options, { lazyConnect: true });
+  const redis = new Redis(redisConfig.hosts, opts);
+  const metaKey = redisKey(argv.id, USERS_METADATA, audience);
+
+  try {
+    await redis.connect();
+
+    // ensure that this user exists
+    assert.equal(await redis.exists(metaKey), 1, 'user does not exist');
+
+    // ensure that referral was not already set
+    if (argv.overwrite !== true) {
+      assert.equal(
+        await redis.hexists(metaKey, USERS_REFERRAL_FIELD),
+        0,
+        'referral was already set, pass --overwrite to args to force it'
+      );
+    }
+
+    // verify that referral code is valid, which is basically
+    // checking whether that alias exists or not
+    assert.equal(
+      await redis.hexists(USERS_ALIAS_TO_ID, argv.code),
+      1,
+      'referral code is invalid - it does not exist'
+    );
+
+    const commands = [
+      ['hset', audience, `"${argv.code}"`],
+      ['sadd', `${USERS_REFERRAL_INDEX}:${argv.code}`, argv.id],
+    ];
+
+    await redis.pipeline(commands).exec().then(handleRedisPipelineError);
+  } catch (e) {
+    console.error('Failed', e); // eslint-disable-line no-console
+  } finally {
+    redis.disconnect();
+  }
+})();

bin/batch-register.js

@@ -17,7 +17,7 @@ const { CHALLENGE_TYPE_EMAIL } = require('../lib/constants');
 const config = conf.get('/', { env: process.env.NODE_ENV });
 const amqpConfig = omit(config.amqp.transport, ['queue', 'neck', 'listen', 'onComplete']);
 const audience = config.jwt.defaultAudience;
-const prefix = config.router.routes.prefix;
+const { prefix } = config.router.routes;
 
 /**
  * Registers batch users from stdin

bin/bearer.js

@@ -9,7 +9,7 @@ const assert = require('assert');
 
 const config = conf.get('/', { env: process.env.NODE_ENV });
 const amqpConfig = config.amqp.transport;
-const prefix = config.router.routes.prefix;
+const { prefix } = config.router.routes;
 
 const username = process.argv[2];
 const name = process.argv[3];

bin/dump.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 // quickly dump specific fields for users
-const argv = require('yargs')
+const { argv } = require('yargs')
   .option('field', {
     alias: 'f',
     describe: 'fields to dump',
@@ -57,8 +57,7 @@ const argv = require('yargs')
     filter: JSON.parse,
   })
   .demandOption(['field'], 'Please provide at least 1 field to dump')
-  .help('h')
-  .argv;
+  .help('h');
 
 // deps
 const fs = require('fs');
@@ -123,7 +122,7 @@ switch (argv.output) {
  */
 const writeUserToOutput = (user) => {
   const attributes = user.metadata[audience];
-  const id = user.id;
+  const { id } = user;
   const username = (argv.username && attributes[argv.username]) || attributes[USERS_USERNAME_FIELD];
 
   if (argv.toDate) {

bin/password.js

@@ -7,7 +7,7 @@ const conf = require('../lib/config');
 
 const config = conf.get('/', { env: process.env.NODE_ENV });
 const redisConfig = config.redis;
-const updatePassword = require('../lib/actions/updatePassword').updatePassword;
+const { updatePassword } = require('../lib/actions/updatePassword');
 
 const username = process.argv[2];
 const password = process.argv[3];

package.json

@@ -28,31 +28,31 @@
   },
   "homepage": "https://github.com/makeomatic/ms-users#readme",
   "dependencies": {
-    "@microfleet/core": "^10.6.1",
-    "@microfleet/transport-amqp": "^13.1.0",
+    "@microfleet/core": "^10.7.1",
+    "@microfleet/transport-amqp": "^13.1.1",
     "babel-runtime": "^6.25.0",
     "bell": "^9.3.1",
     "bluebird": "^3.5.1",
     "bunyan": "^1.8.12",
     "bytes": "^3.0.0",
     "common-errors": "^1.0.5",
     "csv-write-stream": "^2.0.0",
-    "disposable-email-domains": "^1.0.33",
+    "disposable-email-domains": "^1.0.34",
     "dlock": "^8.0.0",
     "flake-idgen": "^1.1.0",
     "get-stdin": "^6.0.0",
     "handlebars": "^4.0.11",
-    "hapi": "^17.5.1",
+    "hapi": "^17.5.2",
     "ioredis": "^3.2.2",
     "is": "^3.2.1",
-    "jsonwebtoken": "^8.2.2",
+    "jsonwebtoken": "^8.3.0",
     "jwa": "^1.1.6",
     "lodash": "^4.17.10",
     "moment": "^2.22.2",
     "ms-conf": "^3.1.2",
     "ms-flakeless": "^4.1.0",
     "ms-mailer-client": "^7.0.0",
-    "ms-mailer-templates": "^1.8.0",
+    "ms-mailer-templates": "^1.10.0",
     "ms-token": "^2.0.0",
     "ms-validation": "^7.1.0",
     "otplib": "^10.0.0",
@@ -64,43 +64,43 @@
     "serialize-error": "^2.1.0",
     "serialize-javascript": "^1.5.0",
     "stdout-stream": "^1.4.0",
-    "tough-cookie": "^2.4.2",
-    "uuid": "^3.2.1",
-    "vision": "^5.3.2",
-    "yargs": "^11.0.0"
+    "tough-cookie": "^2.4.3",
+    "uuid": "^3.3.2",
+    "vision": "^5.3.3",
+    "yargs": "^12.0.1"
   },
   "devDependencies": {
     "@makeomatic/deploy": "^6.1.2",
-    "@semantic-release/changelog": "^2.0.2",
+    "@semantic-release/changelog": "^2.1.1",
     "@semantic-release/exec": "^2.2.4",
-    "@semantic-release/git": "^5.0.0",
+    "@semantic-release/git": "^6.0.1",
     "apidoc": "^0.17.6",
     "apidoc-plugin-schema": "^0.1.8",
     "babel-cli": "^6.24.1",
-    "babel-eslint": "^8.2.3",
+    "babel-eslint": "^8.2.5",
     "babel-plugin-istanbul": "^4.1.6",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-object-rest-spread": "^6.23.0",
     "babel-plugin-transform-strict-mode": "^6.24.1",
     "babel-register": "^6.24.1",
     "chai": "^4.1.1",
     "cheerio": "^1.0.0-rc.2",
-    "codecov": "^3.0.2",
-    "cross-env": "^5.1.6",
-    "eslint": "^4.19.1",
+    "codecov": "^3.0.4",
+    "cross-env": "^5.2.0",
+    "eslint": "^5.1.0",
     "eslint-config-makeomatic": "^2.0.1",
-    "eslint-plugin-import": "^2.12.0",
-    "eslint-plugin-mocha": "^5.0.0",
+    "eslint-plugin-import": "^2.13.0",
+    "eslint-plugin-mocha": "^5.1.0",
     "eslint-plugin-promise": "^3.8.0",
     "faker": "^4.1.0",
     "glob": "^7.1.2",
     "json": "^9.0.6",
     "md5": "^2.2.1",
     "mocha": "^5.2.0",
     "nyc": "^12.0.2",
-    "puppeteer": "^1.4.0",
+    "puppeteer": "^1.5.0",
     "rimraf": "^2.6.1",
-    "sinon": "^5.1.0"
+    "sinon": "^6.1.3"
   },
   "engines": {
     "node": ">= 8.9.0",

schemas/alias.json

@@ -8,13 +8,11 @@
     "properties": {
         "username": {
             "type": "string",
-            "minLength": 1
+            "minLength": 1,
+            "maxLength": 64
         },
         "alias": {
-            "type": "string",
-            "minLength": 3,
-            "maxLength": 15,
-            "pattern": "^[a-zA-Z.0-9]+$"
+            "$ref": "common.json#/definitions/alias"
         }
     }
 }

schemas/common.json

@@ -71,6 +71,10 @@
         { "pattern": "^\\d+$" },
         { "pattern": "^(fb|sso)/[\\d_]+$" }
       ]
+    },
+    "alias": {
+      "type": "string",
+      "pattern": "^[a-zA-Z0-9\\-\\.\\_]{3,20}$"
     }
   }
 }

schemas/register.json

@@ -10,10 +10,7 @@
       "$ref": "common.json#/definitions/userId"
     },
     "alias": {
-      "type": "string",
-      "minLength": 3,
-      "maxLength": 20,
-      "pattern": "^[a-zA-Z0-9\\-\\.\\_]+$"
+      "$ref": "common.json#/definitions/alias"
     },
     "password": {
       "type": "string"

test/suites/bin.dump.js

@@ -1,7 +1,7 @@
 const assert = require('assert');
 const path = require('path');
 const fs = require('fs');
-const exec = require('child_process').exec;
+const { exec } = require('child_process');
 
 describe('binary: dump', function suite() {
   const binaryPath = path.resolve(__dirname, '../../bin/dump.js');
@@ -60,7 +60,7 @@ describe('binary: dump', function suite() {
 
   it('is able to use filter, users generated are random, so cant know for sure whats returned', function test(next) {
     exec(`${binaryPath} -f firstName lastName -o csv --filter '${JSON.stringify({
-      'username': '@yahoo.com',
+      username: '@yahoo.com',
     })}'`, { env }, (err, stdout, stderr) => {
       if (err) return next(err);
       if (stderr) return next(new Error(stderr));