Skip to content
This repository has been archived by the owner on Aug 19, 2022. It is now read-only.

Update udaru-hapi-plugin dependencies to the latest @hapi scope to fix a vulnerability issue #581

Merged
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 packages/udaru-hapi-plugin/lib/authentication.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const Hoek = require('hoek')
const Boom = require('boom')
const Hoek = require('@hapi/hoek')
const Boom = require('@hapi/boom')

async function loadUser (job) {
const { userId } = job
Expand Down
2 changes: 1 addition & 1 deletion packages/udaru-hapi-plugin/lib/authorization.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
'use strict'

const Boom = require('boom')
const Boom = require('@hapi/boom')
const getProperty = require('lodash/get')

module.exports = function (config) {
Expand Down
2 changes: 1 addition & 1 deletion packages/udaru-hapi-plugin/lib/routes/policies.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const Joi = require('@hapi/joi')
const Boom = require('boom')
const Boom = require('@hapi/boom')
const pick = require('lodash/pick')
const validation = require('@nearform/udaru-core/lib/ops/validation').policies
const swagger = require('@nearform/udaru-core/lib/ops/validation').swagger
Expand Down
10 changes: 5 additions & 5 deletions packages/udaru-hapi-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,18 +118,18 @@
"test": "npm run pg:init-test-db && UDARU_SERVICE_logger_pino_level=silent lab"
},
"dependencies": {
"@hapi/boom": "^8.0.1",
"@hapi/hoek": "^8.3.0",
"@hapi/joi": "^15.1.0",
"@nearform/udaru-core": "^5.2.4",
"boom": "^7.2.2",
"hapi": "^18.1.0",
"hoek": "^6.1.3",
"lodash": "^4.17.11"
},
"devDependencies": {
"code": "^5.2.4",
"@hapi/code": "^6.0.0",
"@hapi/hapi": "^18.4.0",
"@hapi/lab": "^20.4.0",
"coveralls": "^3.0.2",
"depcheck": "^0.8.1",
"lab": "^18.0.2",
"sinon": "^7.1.1",
"uuid": "^3.3.2"
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Lab = require('lab')
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()

const server = require('../test-server')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Lab = require('lab')
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()

const server = require('../test-server')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Lab = require('lab')
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()

const server = require('../test-server')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const Lab = require('lab')
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const server = require('../test-server')
const Factory = require('@nearform/udaru-core/test/factory')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

const Lab = require('lab')
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()

const server = require('../test-server')
Expand Down
6 changes: 3 additions & 3 deletions packages/udaru-hapi-plugin/test/edgeCases.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const Lab = require('lab')
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const Hapi = require('hapi')
const expect = require('code').expect
const Hapi = require('@hapi/hapi')
const expect = require('@hapi/code').expect
const sinon = require('sinon')

const server = require('./test-server')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const utils = require('@nearform/udaru-core/test/testUtils')
const serverFactory = require('../test-server')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()

const config = require('../../lib/config')()
Expand Down
4 changes: 2 additions & 2 deletions packages/udaru-hapi-plugin/test/endToEnd/monitor.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const serverFactory = require('../test-server')

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const utils = require('@nearform/udaru-core/test/testUtils')
const uuid = require('uuid/v4')
Expand Down
4 changes: 2 additions & 2 deletions packages/udaru-hapi-plugin/test/endToEnd/policies.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const _ = require('lodash')
const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const utils = require('@nearform/udaru-core/test/testUtils')
const serverFactory = require('../test-server')
Expand Down
4 changes: 2 additions & 2 deletions packages/udaru-hapi-plugin/test/endToEnd/teams.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const utils = require('@nearform/udaru-core/test/testUtils')
const serverFactory = require('../test-server')
Expand Down
4 changes: 2 additions & 2 deletions packages/udaru-hapi-plugin/test/endToEnd/users.test.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict'

const _ = require('lodash')
const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const config = require('../../lib/config')()
const utils = require('@nearform/udaru-core/test/testUtils')
Expand Down
4 changes: 2 additions & 2 deletions packages/udaru-hapi-plugin/test/security/sqlinjection.test.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const expect = require('code').expect
const Lab = require('lab')
const expect = require('@hapi/code').expect
const Lab = require('@hapi/lab')
const lab = exports.lab = Lab.script()
const utils = require('@nearform/udaru-core/test/testUtils')
const udaru = require('@nearform/udaru-core')()
Expand Down
2 changes: 1 addition & 1 deletion packages/udaru-hapi-plugin/test/test-server.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const config = require('../lib/config')()
const Action = config.get('AuthConfig.Action')
const Hapi = require('hapi')
const Hapi = require('@hapi/hapi')

let server = null

Expand Down
2 changes: 1 addition & 1 deletion packages/udaru-hapi-plugin/test/testBuilder.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const _ = require('lodash')
const { expect } = require('code')
const { expect } = require('@hapi/code')
const udaru = require('@nearform/udaru-core')()
const utils = require('@nearform/udaru-core/test/testUtils')

Expand Down