Skip to content

Commit 8a120ef

Browse files
committed
feat: upgrade dependencies
1 parent ef79b9d commit 8a120ef

11 files changed

Lines changed: 781 additions & 837 deletions

File tree

.mdeprc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{
2-
"node": "10.14.1",
2+
"node": "10.15.1",
33
"rebuild": ["ms-flakeless", "scrypt"]
44
}

package.json

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -30,40 +30,41 @@
3030
"dependencies": {
3131
"@microfleet/core": "^13.4.0",
3232
"@microfleet/transport-amqp": "^13.1.3",
33-
"@microfleet/validation": "^8.1.0",
33+
"@microfleet/validation": "^8.1.1",
3434
"bell": "^9.4.0",
3535
"bluebird": "^3.5.3",
3636
"bytes": "^3.0.0",
3737
"common-errors": "^1.0.5",
3838
"csv-write-stream": "^2.0.0",
39-
"disposable-email-domains": "^1.0.41",
39+
"disposable-email-domains": "^1.0.42",
4040
"dlock": "^8.1.0",
4141
"flake-idgen": "^1.1.0",
4242
"get-stdin": "^6.0.0",
4343
"get-value": "^3.0.1",
4444
"handlebars": "^4.0.12",
45-
"hapi": "^17.7.0",
45+
"hapi": "^18.0.0",
4646
"ioredis": "^4.3.0",
4747
"is": "^3.3.0",
4848
"jsonwebtoken": "^8.4.0",
4949
"jwa": "^1.1.6",
5050
"lodash": "^4.17.11",
5151
"moment": "^2.23.0",
5252
"ms-conf": "^3.3.3",
53-
"ms-flakeless": "^4.1.0",
53+
"ms-flakeless": "^4.1.1",
5454
"ms-mailer-client": "^8.0.1",
5555
"ms-mailer-templates": "^1.10.0",
5656
"ms-token": "^3.0.0",
5757
"otplib": "^10.0.1",
5858
"password-generator": "^2.2.0",
59+
"prom-client": "^11.2.1",
5960
"redis-filtered-sort": "^2.3.0",
6061
"request": "^2.88.0",
6162
"request-promise": "^4.2.1",
6263
"scrypt": "^6.0.1",
6364
"serialize-error": "^3.0.0",
64-
"serialize-javascript": "^1.5.0",
65+
"serialize-javascript": "^1.6.1",
6566
"stdout-stream": "^1.4.1",
66-
"tough-cookie": "^2.4.3",
67+
"tough-cookie": "^3.0.0",
6768
"uuid": "^3.3.2",
6869
"vision": "^5.4.4",
6970
"yargs": "^12.0.4"
@@ -75,10 +76,10 @@
7576
"@babel/plugin-proposal-object-rest-spread": "^7.2.0",
7677
"@babel/plugin-transform-strict-mode": "^7.2.0",
7778
"@babel/register": "^7.0.0",
78-
"@makeomatic/deploy": "^8.2.3",
79-
"@semantic-release/changelog": "^3.0.1",
80-
"@semantic-release/exec": "^3.3.1",
81-
"@semantic-release/git": "^7.0.6",
79+
"@makeomatic/deploy": "^8.3.1",
80+
"@semantic-release/changelog": "^3.0.2",
81+
"@semantic-release/exec": "^3.3.2",
82+
"@semantic-release/git": "^7.0.7",
8283
"apidoc": "^0.17.7",
8384
"apidoc-plugin-schema": "^0.1.8",
8485
"babel-eslint": "^10.0.1",
@@ -87,19 +88,19 @@
8788
"cheerio": "^1.0.0-rc.2",
8889
"codecov": "^3.1.0",
8990
"cross-env": "^5.2.0",
90-
"eslint": "^5.10.0",
91+
"eslint": "^5.12.0",
9192
"eslint-config-makeomatic": "^3.0.0",
9293
"eslint-plugin-import": "^2.14.0",
93-
"eslint-plugin-mocha": "^5.2.0",
94+
"eslint-plugin-mocha": "^5.2.1",
9495
"eslint-plugin-promise": "^4.0.1",
9596
"faker": "^4.1.0",
9697
"glob": "^7.1.3",
9798
"json": "^9.0.6",
9899
"md5": "^2.2.1",
99100
"mocha": "^5.2.0",
100101
"nyc": "^13.1.0",
101-
"puppeteer": "1.4.0",
102-
"rimraf": "^2.6.1",
102+
"puppeteer": "1.9.0",
103+
"rimraf": "^2.6.3",
103104
"sinon": "^7.2.2"
104105
},
105106
"engines": {

schemas/challenge.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"properties": {
99
"type": {
1010
"type": "string",
11-
"const": "email"
11+
"enum": ["email", "phone"]
1212
},
1313
"username": {
1414
"type": "string",
@@ -22,4 +22,4 @@
2222
"type": "object"
2323
}
2424
}
25-
}
25+
}

src/actions/challenge.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
const Promise = require('bluebird');
22
const passThrough = require('lodash/identity');
3+
const { ActionTransport } = require('@microfleet/core');
34
const { getInternalData } = require('../utils/userData');
4-
const getMetadata = require('../utils/getMetadata.js');
5-
const isActive = require('../utils/isActive.js');
6-
const challenge = require('../utils/challenges/challenge.js');
5+
const getMetadata = require('../utils/getMetadata');
6+
const isActive = require('../utils/isActive');
7+
const challenge = require('../utils/challenges/challenge');
78
const {
89
USERS_ACTION_ACTIVATE,
9-
CHALLENGE_TYPE_EMAIL,
1010
USER_ALREADY_ACTIVE,
1111
USERS_USERNAME_FIELD,
12-
} = require('../constants.js');
12+
} = require('../constants');
1313

1414
/**
1515
* Predicate for inactive status
@@ -86,7 +86,7 @@ module.exports = function sendChallenge({ params }) {
8686
const service = this;
8787
const { config } = service;
8888
const { defaultAudience } = config.jwt;
89-
const { throttle, ttl } = config.token[CHALLENGE_TYPE_EMAIL];
89+
const { throttle, ttl } = config.token[params.type];
9090

9191
const ctx = {
9292
service,
@@ -107,4 +107,4 @@ module.exports = function sendChallenge({ params }) {
107107
.then(createChallenge);
108108
};
109109

110-
module.exports.transports = [require('@microfleet/core').ActionTransport.amqp];
110+
module.exports.transports = [ActionTransport.amqp];

src/auth/oauth/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ module.exports = async function authHandler({ action, transportRequest }) {
141141

142142
let response;
143143
try {
144-
const credentials = await http.auth.test(strategy, transportRequest);
144+
const { credentials } = await http.auth.test(strategy, transportRequest);
145145
response = [null, credentials];
146146
} catch (err) {
147147
response = [err];

src/auth/oauth/strategies/facebook.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ const FIELDS = [
1212
'first_name',
1313
'last_name',
1414
'middle_name',
15-
'gender',
1615
'link',
1716
'locale',
1817
'timezone',
@@ -34,7 +33,6 @@ function defaultProfileHandler(profile) {
3433
credentials.profile = {
3534
id,
3635
displayName: profile.name,
37-
gender: profile.gender,
3836
age_range: profile.age_range,
3937
name: {
4038
first: profile.first_name,

src/configs/router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ exports.router = {
3737
},
3838
extensions: {
3939
enabled: ['preRequest', 'postRequest', 'postValidate', 'preResponse'],
40-
register: [autoSchema, preResponse, auditLog],
40+
register: [autoSchema, preResponse, auditLog()],
4141
},
4242
auth: {
4343
strategies: {

test/docker-compose.sentinel.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ services:
7676
shm_size: 512m
7777
expose:
7878
- "3000"
79-
image: makeomatic/node:10.14.1-chrome-tester
79+
image: makeomatic/node:10.15.1-chrome-tester
8080
links:
8181
- redis
8282
- rabbitmq

test/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ services:
6060
shm_size: 512m
6161
expose:
6262
- "3000"
63-
image: makeomatic/node:10.14.1-chrome-tester
63+
image: makeomatic/node:10.15.1-chrome-tester
6464
links:
6565
- redis
6666
- rabbitmq

test/suites/oauth/facebook.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ describe('#facebook', function oauthFacebookSuite() {
275275
assert.ok(metadata[defaultAudience].facebook, 'facebook profile not present');
276276
assert.ok(metadata[defaultAudience].facebook.id, 'facebook scoped is not present');
277277
assert.ok(metadata[defaultAudience].facebook.displayName, 'fb display name not present');
278-
assert.ok(metadata[defaultAudience].facebook.gender, 'fb gender not present');
279278
assert.ok(metadata[defaultAudience].facebook.name, 'fb name not present');
280279
assert.ok(metadata[defaultAudience].facebook.uid, 'internal fb uid not present');
281280
});

0 commit comments

Comments
 (0)