Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .mdeprc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"node": "10.16.3",
"rebuild": ["ms-flakeless", "scrypt"]
"node": "12.13.0",
"rebuild": ["ms-flakeless"]
}
41 changes: 21 additions & 20 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,27 +31,27 @@
"@hapi/bell": "^11.1.0",
"@hapi/hapi": "^18.4.0",
"@hapi/vision": "^5.5.4",
"@microfleet/core": "^15.0.1",
"@microfleet/core": "^15.3.1",
"@microfleet/transport-amqp": "^15.0.0",
"@microfleet/validation": "^8.1.2",
"bluebird": "^3.7.0",
"bluebird": "^3.7.1",
"bytes": "^3.0.0",
"common-errors": "^1.0.5",
"csv-write-stream": "^2.0.0",
"disposable-email-domains": "^1.0.48",
"dlock": "^10.0.0",
"disposable-email-domains": "^1.0.49",
"dlock": "^11.0.0",
"flake-idgen": "^1.1.0",
"get-stdin": "^7.0.0",
"get-value": "^3.0.1",
"handlebars": "^4.4.2",
"handlebars": "^4.5.1",
"ioredis": "^4.14.1",
"is": "^3.3.0",
"jsonwebtoken": "^8.5.1",
"jwa": "^1.4.1",
"lodash": "^4.17.15",
"moment": "^2.23.0",
"ms-conf": "^5.0.2",
"ms-flakeless": "^4.2.0",
"ms-flakeless": "^4.3.0",
"ms-mailer-client": "^8.0.1",
"ms-mailer-templates": "^1.14.1",
"ms-token": "^3.1.0",
Expand All @@ -62,26 +62,26 @@
"redis-filtered-sort": "^2.3.0",
"request": "^2.88.0",
"request-promise": "^4.2.4",
"scrypt": "^6.0.1",
"scrypt-kdf": "^2.0.1",
"serialize-error": "^5.0.0",
"serialize-javascript": "^2.1.0",
"stdout-stream": "^1.4.1",
"tough-cookie": "^3.0.0",
"uuid": "^3.3.3",
"yargs": "^14.0.0",
"yargs": "^14.2.0",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
"@babel/cli": "^7.6.2",
"@babel/core": "^7.6.2",
"@babel/cli": "^7.6.4",
"@babel/core": "^7.6.4",
"@babel/plugin-proposal-class-properties": "^7.5.5",
"@babel/plugin-proposal-object-rest-spread": "^7.6.2",
"@babel/plugin-transform-strict-mode": "^7.2.0",
"@babel/register": "^7.6.2",
"@makeomatic/deploy": "^9.1.1",
"@semantic-release/changelog": "^3.0.4",
"@semantic-release/exec": "^3.3.7",
"@semantic-release/git": "^7.0.16",
"@makeomatic/deploy": "^9.3.2",
"@semantic-release/changelog": "^3.0.5",
"@semantic-release/exec": "^3.3.8",
"@semantic-release/git": "^7.0.17",
"apidoc": "^0.17.7",
"apidoc-plugin-schema": "^0.1.8",
"babel-eslint": "^10.0.3",
Expand All @@ -90,18 +90,19 @@
"cheerio": "^1.0.0-rc.3",
"codecov": "^3.6.1",
"cross-env": "^6.0.3",
"eslint": "^6.5.1",
"eslint-config-makeomatic": "^3.1.0",
"eslint": "^6.6.0",
"eslint-config-makeomatic": "^4.0.0",
"eslint-plugin-import": "^2.18.2",
"eslint-plugin-mocha": "^6.1.1",
"eslint-plugin-mocha": "^6.2.1",
"eslint-plugin-promise": "^4.2.1",
"eslint-plugin-unicorn": "^12.1.0",
"faker": "^4.1.0",
"glob": "^7.1.4",
"glob": "^7.1.5",
"json": "^9.0.6",
"md5": "^2.2.1",
"mocha": "^6.2.1",
"mocha": "^6.2.2",
"nyc": "^14.1.1",
"puppeteer": "1.20.0",
"puppeteer": "2.0.0",
"rimraf": "^3.0.0",
"sinon": "^7.5.0"
},
Expand Down
5 changes: 5 additions & 0 deletions src/actions/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"unicorn/filename-case": 0
}
}
4 changes: 2 additions & 2 deletions src/actions/activate.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ const Promise = require('bluebird');
const redisKey = require('../utils/key.js');
const jwt = require('../utils/jwt.js');
const { getInternalData } = require('../utils/userData');
const getMetadata = require('../utils/getMetadata');
const handlePipeline = require('../utils/pipelineError.js');
const getMetadata = require('../utils/get-metadata');
const handlePipeline = require('../utils/pipeline-error.js');
const {
USERS_INDEX,
USERS_DATA,
Expand Down
6 changes: 3 additions & 3 deletions src/actions/alias.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ const Promise = require('bluebird');
const Errors = require('common-errors');
const { ActionTransport } = require('@microfleet/core');
const { getInternalData } = require('../utils/userData');
const isActive = require('../utils/isActive');
const isBanned = require('../utils/isBanned');
const isActive = require('../utils/is-active');
const isBanned = require('../utils/is-banned');
const key = require('../utils/key');
const handlePipeline = require('../utils/pipelineError');
const handlePipeline = require('../utils/pipeline-error');
const {
USERS_DATA,
USERS_METADATA,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/ban.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const { ActionTransport } = require('@microfleet/core');
const mapValues = require('lodash/mapValues');
const redisKey = require('../utils/key.js');
const { getInternalData } = require('../utils/userData');
const handlePipeline = require('../utils/pipelineError.js');
const handlePipeline = require('../utils/pipeline-error');
const {
USERS_DATA, USERS_METADATA,
USERS_BANNED_FLAG, USERS_TOKENS, USERS_BANNED_DATA,
Expand Down
4 changes: 2 additions & 2 deletions src/actions/challenge.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ const Promise = require('bluebird');
const passThrough = require('lodash/identity');
const { ActionTransport } = require('@microfleet/core');
const { getInternalData } = require('../utils/userData');
const getMetadata = require('../utils/getMetadata');
const isActive = require('../utils/isActive');
const getMetadata = require('../utils/get-metadata');
const isActive = require('../utils/is-active');
const challenge = require('../utils/challenges/challenge');
const {
USERS_ACTION_ACTIVATE,
Expand Down
6 changes: 3 additions & 3 deletions src/actions/disposable-password.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const Promise = require('bluebird');
const { ActionTransport } = require('@microfleet/core');
const challenge = require('../utils/challenges/challenge');
const { getInternalData } = require('../utils/userData');
const isActive = require('../utils/isActive');
const isBanned = require('../utils/isBanned');
const hasNotPassword = require('../utils/hasNotPassword');
const isActive = require('../utils/is-active');
const isBanned = require('../utils/is-banned');
const hasNotPassword = require('../utils/has-no-password');
const { USERS_ACTION_DISPOSABLE_PASSWORD, USERS_USERNAME_FIELD } = require('../constants');

/**
Expand Down
2 changes: 1 addition & 1 deletion src/actions/getMetadata.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const Errors = require('common-errors');
const noop = require('lodash/noop');
const identity = require('lodash/identity');
const get = require('../utils/get-value');
const getMetadata = require('../utils/getMetadata');
const getMetadata = require('../utils/get-metadata');
const { getUserId } = require('../utils/userData');
const { USERS_ALIAS_FIELD } = require('../constants');

Expand Down
2 changes: 1 addition & 1 deletion src/actions/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Promise = require('bluebird');
const mapValues = require('lodash/mapValues');
const passThrough = require('lodash/identity');
const fsort = require('redis-filtered-sort');
const handlePipeline = require('../utils/pipelineError');
const handlePipeline = require('../utils/pipeline-error');
const redisKey = require('../utils/key');
const {
USERS_INDEX,
Expand Down
8 changes: 4 additions & 4 deletions src/actions/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ const is = require('is');
const scrypt = require('../utils/scrypt');
const redisKey = require('../utils/key');
const jwt = require('../utils/jwt');
const isActive = require('../utils/isActive');
const isBanned = require('../utils/isBanned');
const handlePipeline = require('../utils/pipelineError');
const isActive = require('../utils/is-active');
const isBanned = require('../utils/is-banned');
const handlePipeline = require('../utils/pipeline-error');
const { checkMFA } = require('../utils/mfa');
const { verifySignedToken } = require('../auth/oauth/utils/getSignedToken');
const { verifySignedToken } = require('../auth/oauth/utils/get-signed-token');
const {
USERS_ACTION_DISPOSABLE_PASSWORD,
USERS_DISPOSABLE_PASSWORD_MIA,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/mfa/attach.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const { ActionTransport } = require('@microfleet/core');
const Promise = require('bluebird');

const redisKey = require('../../utils/key');
const handlePipeline = require('../../utils/pipelineError');
const handlePipeline = require('../../utils/pipeline-error');
const { checkMFA, generateRecoveryCodes } = require('../../utils/mfa');
const {
USERS_DATA,
Expand Down
4 changes: 2 additions & 2 deletions src/actions/mfa/detach.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
const { ActionTransport } = require('@microfleet/core');
const Promise = require('bluebird');
const redisKey = require('../../utils/key');
const handlePipeline = require('../../utils/pipelineError');
const { checkMFA } = require('../../utils/mfa.js');
const handlePipeline = require('../../utils/pipeline-error');
const { checkMFA } = require('../../utils/mfa');
const {
USERS_DATA,
USERS_MFA_FLAG,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/mfa/regenerate-codes.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { ActionTransport } = require('@microfleet/core');
const Promise = require('bluebird');
const redisKey = require('../../utils/key');
const handlePipeline = require('../../utils/pipelineError');
const handlePipeline = require('../../utils/pipeline-error');
const { checkMFA, generateRecoveryCodes } = require('../../utils/mfa');
const { USERS_MFA_RECOVERY, MFA_TYPE_REQUIRED } = require('../../constants');

Expand Down
2 changes: 1 addition & 1 deletion src/actions/oauth/facebook.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const { ActionTransport } = require('@microfleet/core');
const Promise = require('bluebird');
const { ERROR_AUTH_REQUIRED } = require('../../constants');
const attach = require('../../auth/oauth/utils/attach');
const { getSignedToken } = require('../../auth/oauth/utils/getSignedToken');
const { getSignedToken } = require('../../auth/oauth/utils/get-signed-token');

async function facebookCallbackAction(request) {
const { credentials } = request.auth;
Expand Down
6 changes: 3 additions & 3 deletions src/actions/organization/create.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ const { ActionTransport } = require('@microfleet/core');
const snakeCase = require('lodash/snakeCase');
const mapValues = require('lodash/mapValues');
const redisKey = require('../../utils/key');
const handlePipeline = require('../../utils/pipelineError');
const setOrganizationMetadata = require('../../utils/setOrganizationMetadata');
const addOrganizationMembers = require('../../utils/organization/addOrganizationMembers');
const handlePipeline = require('../../utils/pipeline-error');
const setOrganizationMetadata = require('../../utils/set-organization-metadata');
const addOrganizationMembers = require('../../utils/organization/add-organization-members');
const { getOrganizationId, getOrganizationMetadataAndMembers } = require('../../utils/organization');
const {
ErrorConflictOrganizationExists,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/organization/delete.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { ActionTransport } = require('@microfleet/core');
const snakeCase = require('lodash/snakeCase');
const redisKey = require('../../utils/key');
const handlePipeline = require('../../utils/pipelineError');
const handlePipeline = require('../../utils/pipeline-error');
const { checkOrganizationExists, getInternalData } = require('../../utils/organization');
const {
ORGANIZATIONS_DATA,
Expand Down
4 changes: 2 additions & 2 deletions src/actions/organization/invites/accept.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ const {
USERS_ACTION_ORGANIZATION_INVITE,
ErrorInvitationExpiredOrUsed,
} = require('../../../constants');
const redisKey = require('../../../utils/key.js');
const getUserId = require('../../../utils/userData/getUserId');
const redisKey = require('../../../utils/key');
const getUserId = require('../../../utils/userData/get-user-id');

/**
* Token verification function, on top of it returns extra metadata
Expand Down
6 changes: 3 additions & 3 deletions src/actions/organization/invites/send.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { ActionTransport } = require('@microfleet/core');
const sendInviteMail = require('../../../utils/organization/sendInviteMail');
const getInternalData = require('../../../utils/organization/getInternalData');
const sendInviteMail = require('../../../utils/organization/send-invite-email');
const getInternalData = require('../../../utils/organization/get-internal-data');
const redisKey = require('../../../utils/key');
const { checkOrganizationExists } = require('../../../utils/organization');
const {
Expand All @@ -10,7 +10,7 @@ const {
ORGANIZATIONS_ID_FIELD,
USERS_ACTION_ORGANIZATION_INVITE,
} = require('../../../constants');
const getUserId = require('../../../utils/userData/getUserId');
const getUserId = require('../../../utils/userData/get-user-id');

/**
* @api {amqp} <prefix>.invites.send Send invitation
Expand Down
2 changes: 1 addition & 1 deletion src/actions/organization/list.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const Promise = require('bluebird');
const fsort = require('redis-filtered-sort');
const redisKey = require('../../utils/key');
const { getOrganizationMetadata, getInternalData } = require('../../utils/organization');
const { ORGANIZATIONS_INDEX, ORGANIZATIONS_DATA } = require('../../constants.js');
const { ORGANIZATIONS_INDEX, ORGANIZATIONS_DATA } = require('../../constants');

/**
* @api {amqp} <prefix>.list Retrieve Organizations list
Expand Down
2 changes: 1 addition & 1 deletion src/actions/organization/members/add.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { ActionTransport } = require('@microfleet/core');
const { checkOrganizationExists } = require('../../../utils/organization');
const addOrganizationMembers = require('../../../utils/organization/addOrganizationMembers');
const addOrganizationMembers = require('../../../utils/organization/add-organization-members');

/**
* @api {amqp} <prefix>.members.add Add organization member
Expand Down
3 changes: 1 addition & 2 deletions src/actions/organization/members/list.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
const { ActionTransport } = require('@microfleet/core');
const { checkOrganizationExists } = require('../../../utils/organization');
const { getOrganizationMembers } = require('../../../utils/organization');
const { checkOrganizationExists, getOrganizationMembers } = require('../../../utils/organization');

/**
* @api {amqp} <prefix>.members.list Get organization members
Expand Down
4 changes: 2 additions & 2 deletions src/actions/organization/members/permission.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ const union = require('lodash/union');
const difference = require('lodash/difference');
const { checkOrganizationExists } = require('../../../utils/organization');
const redisKey = require('../../../utils/key');
const handlePipeline = require('../../../utils/pipelineError');
const getUserId = require('../../../utils/userData/getUserId');
const handlePipeline = require('../../../utils/pipeline-error');
const getUserId = require('../../../utils/userData/get-user-id');
const { ErrorUserNotMember, USERS_METADATA, ORGANIZATIONS_MEMBERS } = require('../../../constants');

/**
Expand Down
4 changes: 2 additions & 2 deletions src/actions/organization/members/remove.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const { ActionTransport } = require('@microfleet/core');
const redisKey = require('../../../utils/key');
const getUserId = require('../../../utils/userData/getUserId');
const handlePipeline = require('../../../utils/pipelineError');
const getUserId = require('../../../utils/userData/get-user-id');
const handlePipeline = require('../../../utils/pipeline-error');
const { checkOrganizationExists } = require('../../../utils/organization');
const {
ORGANIZATIONS_MEMBERS,
Expand Down
2 changes: 1 addition & 1 deletion src/actions/organization/updateMetadata.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { ActionTransport } = require('@microfleet/core');
const setOrganizationMetadata = require('../../utils/setOrganizationMetadata');
const setOrganizationMetadata = require('../../utils/set-organization-metadata');
const { checkOrganizationExists, getOrganizationMetadata } = require('../../utils/organization');

/**
Expand Down
14 changes: 7 additions & 7 deletions src/actions/register.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,18 @@ const reduce = require('lodash/reduce');
const last = require('lodash/last');

// internal deps
const setMetadata = require('../utils/updateMetadata');
const setMetadata = require('../utils/update-metadata');
const redisKey = require('../utils/key');
const jwt = require('../utils/jwt');
const isDisposable = require('../utils/isDisposable');
const mxExists = require('../utils/mxExists');
const checkCaptcha = require('../utils/checkCaptcha');
const isDisposable = require('../utils/is-disposable');
const mxExists = require('../utils/mx-exists');
const checkCaptcha = require('../utils/check-captcha');
const { getUserId } = require('../utils/userData');
const aliasExists = require('../utils/aliasExists');
const aliasExists = require('../utils/alias-exists');
const assignAlias = require('./alias');
const checkLimits = require('../utils/checkIpLimits');
const checkLimits = require('../utils/check-ip-limits');
const challenge = require('../utils/challenges/challenge');
const handlePipeline = require('../utils/pipelineError');
const handlePipeline = require('../utils/pipeline-error');
const hashPassword = require('../utils/register/password/hash');
const {
USERS_REF,
Expand Down
4 changes: 2 additions & 2 deletions src/actions/remove.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const intersection = require('lodash/intersection');
const get = require('../utils/get-value');
const key = require('../utils/key');
const { getInternalData } = require('../utils/userData');
const getMetadata = require('../utils/getMetadata');
const handlePipeline = require('../utils/pipelineError');
const getMetadata = require('../utils/get-metadata');
const handlePipeline = require('../utils/pipeline-error');
const {
USERS_INDEX,
USERS_PUBLIC_INDEX,
Expand Down
8 changes: 4 additions & 4 deletions src/actions/requestPassword.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
const Promise = require('bluebird');
const { getInternalData } = require('../utils/userData');
const isActive = require('../utils/isActive.js');
const isBanned = require('../utils/isBanned.js');
const hasPassword = require('../utils/hasPassword.js');
const getMetadata = require('../utils/getMetadata.js');
const isActive = require('../utils/is-active');
const isBanned = require('../utils/is-banned');
const hasPassword = require('../utils/has-password');
const getMetadata = require('../utils/get-metadata');
const challenge = require('../utils/challenges/challenge');
const {
USERS_ACTION_PASSWORD,
Expand Down
Loading