Skip to content

Commit e066994

Browse files
AVVSAVVS
authored
fix: removes username to user id reference (#382)
* fix: removes username to user id reference * chore: lock maintenance * fix: puppeteer * fix: clean up mfa actions * chore: refactor postValidate a bit * chore: style changes
1 parent 4f32c44 commit e066994

39 files changed

Lines changed: 2471 additions & 1599 deletions

‎.babelrc‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
{
22
"plugins": [
3-
"transform-strict-mode",
4-
"transform-class-properties",
5-
["transform-object-rest-spread", { "useBuiltIns": true }]
3+
"@babel/plugin-transform-strict-mode",
4+
"@babel/plugin-proposal-class-properties",
5+
["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": true }]
66
],
77
"env": {
88
"test": {
9-
"plugins": [ "istanbul" ]
9+
"plugins": [
10+
"istanbul"
11+
]
1012
}
1113
}
1214
}

‎.eslintrc‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"extends": "makeomatic",
3+
"parser": "babel-eslint",
34
"rules": {
45
"prefer-destructuring": ["error", {
56
"VariableDeclarator": {

‎.mdeprc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"node": "10.6.0"
2+
"node": "10.9.0"
33
}

‎.nycrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"src/**/*.spec.js"
77
],
88
"require": [
9-
"babel-register"
9+
"@babel/register"
1010
],
1111
"sourceMap": false,
1212
"instrument": false,

‎package.json‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,20 @@
2828
},
2929
"homepage": "https://github.com/makeomatic/ms-users#readme",
3030
"dependencies": {
31-
"@microfleet/core": "^10.7.1",
32-
"@microfleet/transport-amqp": "^13.1.1",
33-
"babel-runtime": "^6.25.0",
31+
"@microfleet/core": "^10.9.1",
32+
"@microfleet/transport-amqp": "^13.1.2",
3433
"bell": "^9.3.1",
3534
"bluebird": "^3.5.1",
3635
"bunyan": "^1.8.12",
3736
"bytes": "^3.0.0",
3837
"common-errors": "^1.0.5",
3938
"csv-write-stream": "^2.0.0",
40-
"disposable-email-domains": "^1.0.34",
41-
"dlock": "^8.0.0",
39+
"disposable-email-domains": "^1.0.36",
40+
"dlock": "^8.1.0",
4241
"flake-idgen": "^1.1.0",
4342
"get-stdin": "^6.0.0",
4443
"handlebars": "^4.0.11",
45-
"hapi": "^17.5.2",
44+
"hapi": "^17.5.3",
4645
"ioredis": "^3.2.2",
4746
"is": "^3.2.1",
4847
"jsonwebtoken": "^8.3.0",
@@ -54,11 +53,11 @@
5453
"ms-mailer-client": "^7.0.0",
5554
"ms-mailer-templates": "^1.10.0",
5655
"ms-token": "^2.0.0",
57-
"ms-validation": "^7.1.0",
58-
"otplib": "^10.0.0",
56+
"ms-validation": "^7.2.0",
57+
"otplib": "^10.0.1",
5958
"password-generator": "^2.2.0",
6059
"redis-filtered-sort": "^2.3.0",
61-
"request": "^2.87.0",
60+
"request": "^2.88.0",
6261
"request-promise": "^4.2.1",
6362
"scrypt": "^6.0.1",
6463
"serialize-error": "^2.1.0",
@@ -70,37 +69,38 @@
7069
"yargs": "^12.0.1"
7170
},
7271
"devDependencies": {
73-
"@makeomatic/deploy": "^6.1.2",
74-
"@semantic-release/changelog": "^2.1.1",
75-
"@semantic-release/exec": "^2.2.4",
76-
"@semantic-release/git": "^6.0.1",
72+
"@makeomatic/deploy": "^7.0.1",
73+
"@semantic-release/changelog": "^3.0.0",
74+
"@semantic-release/exec": "^3.1.0",
75+
"@semantic-release/git": "^7.0.1",
7776
"apidoc": "^0.17.6",
7877
"apidoc-plugin-schema": "^0.1.8",
79-
"babel-cli": "^6.24.1",
80-
"babel-eslint": "^8.2.5",
81-
"babel-plugin-istanbul": "^4.1.6",
82-
"babel-plugin-transform-class-properties": "^6.24.1",
83-
"babel-plugin-transform-object-rest-spread": "^6.23.0",
84-
"babel-plugin-transform-strict-mode": "^6.24.1",
85-
"babel-register": "^6.24.1",
78+
"babel-eslint": "^8.2.6",
79+
"babel-plugin-istanbul": "^5.0.0",
80+
"@babel/cli": "^7.0.0-rc.1",
81+
"@babel/core": "^7.0.0-rc.1",
82+
"@babel/plugin-proposal-class-properties": "^7.0.0-rc.1",
83+
"@babel/plugin-proposal-object-rest-spread": "^7.0.0-rc.1",
84+
"@babel/plugin-transform-strict-mode": "^7.0.0-rc.1",
85+
"@babel/register": "^7.0.0-rc.1",
8686
"chai": "^4.1.1",
8787
"cheerio": "^1.0.0-rc.2",
8888
"codecov": "^3.0.4",
8989
"cross-env": "^5.2.0",
90-
"eslint": "^5.1.0",
91-
"eslint-config-makeomatic": "^2.0.1",
92-
"eslint-plugin-import": "^2.13.0",
93-
"eslint-plugin-mocha": "^5.1.0",
94-
"eslint-plugin-promise": "^3.8.0",
90+
"eslint": "^5.4.0",
91+
"eslint-config-makeomatic": "^3.0.0",
92+
"eslint-plugin-import": "^2.14.0",
93+
"eslint-plugin-mocha": "^5.2.0",
94+
"eslint-plugin-promise": "^4.0.0",
9595
"faker": "^4.1.0",
9696
"glob": "^7.1.2",
9797
"json": "^9.0.6",
9898
"md5": "^2.2.1",
9999
"mocha": "^5.2.0",
100100
"nyc": "^12.0.2",
101-
"puppeteer": "^1.5.0",
101+
"puppeteer": "=1.5.0",
102102
"rimraf": "^2.6.1",
103-
"sinon": "^6.1.3"
103+
"sinon": "^6.1.5"
104104
},
105105
"engines": {
106106
"node": ">= 8.9.0",

‎src/actions/_/me.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
const Promise = require('bluebird');
12
const { ActionTransport } = require('@microfleet/core');
23
const { getInternalData } = require('../../utils/userData');
34
const { USERS_MFA_FLAG } = require('../../constants');
@@ -18,7 +19,9 @@ const { USERS_MFA_FLAG } = require('../../constants');
1819
*/
1920
async function Me({ auth }) {
2021
const { id, metadata } = auth.credentials;
21-
const mfa = await getInternalData.call(this, id).get(USERS_MFA_FLAG);
22+
const mfa = await Promise.bind(this, id)
23+
.then(getInternalData)
24+
.get(USERS_MFA_FLAG);
2225

2326
return { id, mfa, metadata };
2427
}

‎src/actions/challenge.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
const Promise = require('bluebird');
2+
const passThrough = require('lodash/identity');
23
const { getInternalData } = require('../utils/userData');
34
const getMetadata = require('../utils/getMetadata.js');
45
const isActive = require('../utils/isActive.js');
56
const challenge = require('../utils/challenges/challenge.js');
6-
const passThrough = require('lodash/identity');
77
const {
88
USERS_ACTION_ACTIVATE,
99
CHALLENGE_TYPE_EMAIL,

‎src/actions/getInternalData.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const { ActionTransport } = require('@microfleet/core');
22
const Promise = require('bluebird');
3-
const { getInternalData } = require('../utils/userData');
43
const pick = require('lodash/pick');
4+
const { getInternalData } = require('../utils/userData');
55

66
/**
77
* @api {amqp} <prefix>.getInternalData Retrieve Internal Data

‎src/actions/getMetadata.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
const { ActionTransport } = require('@microfleet/core');
22
const Promise = require('bluebird');
33
const Errors = require('common-errors');
4-
const getMetadata = require('../utils/getMetadata.js');
5-
const { getUserId } = require('../utils/userData');
64
const noop = require('lodash/noop');
75
const identity = require('lodash/identity');
86
const get = require('lodash/get');
9-
const { USERS_ALIAS_FIELD } = require('../constants.js');
7+
const getMetadata = require('../utils/getMetadata');
8+
const { getUserId } = require('../utils/userData');
9+
const { USERS_ALIAS_FIELD } = require('../constants');
1010

1111
const { isArray } = Array;
1212

‎src/actions/login.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
const { ActionTransport } = require('@microfleet/core');
22
const Promise = require('bluebird');
33
const Errors = require('common-errors');
4+
const moment = require('moment');
5+
const noop = require('lodash/noop');
6+
const is = require('is');
47
const scrypt = require('../utils/scrypt.js');
58
const redisKey = require('../utils/key.js');
69
const jwt = require('../utils/jwt.js');
7-
const moment = require('moment');
810
const isActive = require('../utils/isActive.js');
911
const isBanned = require('../utils/isBanned.js');
1012
const { getInternalData } = require('../utils/userData');
1113
const handlePipeline = require('../utils/pipelineError.js');
12-
const noop = require('lodash/noop');
13-
const is = require('is');
1414
const {
1515
USERS_ACTION_DISPOSABLE_PASSWORD,
1616
USERS_DISPOSABLE_PASSWORD_MIA,

0 commit comments

Comments
 (0)