From be86a4c285f2d4b0436a8d2e87172d3a79670397 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Tue, 21 Mar 2023 15:23:16 +0200 Subject: [PATCH 1/3] Add ability to set options into AuthError --- workers/loc.api/errors/index.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/workers/loc.api/errors/index.js b/workers/loc.api/errors/index.js index 30c37364..e1b23107 100644 --- a/workers/loc.api/errors/index.js +++ b/workers/loc.api/errors/index.js @@ -34,8 +34,10 @@ class BadRequestError extends BaseError { } class AuthError extends BaseError { - constructor (message = 'ERR_AUTH_UNAUTHORIZED') { - super(message) + constructor (args) { + const _args = getErrorArgs(args, 'ERR_AUTH_UNAUTHORIZED') + + super(_args) this.statusCode = 401 this.statusMessage = 'Unauthorized' From 567e671dc96a5823305a8778ef538ee4414a10f3 Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Thu, 23 Mar 2023 11:52:24 +0200 Subject: [PATCH 2/3] Add ability to set extra rest_v2 mock methods --- test/helpers/helpers.mock-rest-v2.js | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/test/helpers/helpers.mock-rest-v2.js b/test/helpers/helpers.mock-rest-v2.js index 0145a500..45b2bf25 100644 --- a/test/helpers/helpers.mock-rest-v2.js +++ b/test/helpers/helpers.mock-rest-v2.js @@ -5,6 +5,21 @@ const { MockRESTv2Server } = require('bfx-api-mock-srv') const _mockData = require('./mock-data') +class ExtraMockRESTv2Server extends MockRESTv2Server { + constructor (args) { + super(args) + this._extraMockMethods = args?.extraMockMethods ?? new Map() + + for (const [method, route] of this._extraMockMethods) { + for (const [key, val] of Object.entries(route)) { + this._generateRoute(method, key, val) + } + } + + this.listen() + } +} + const getMockData = (methodName, mockData = _mockData) => { if (!mockData.has(methodName)) throw new Error('NO_MOCKING_DATA') @@ -17,12 +32,12 @@ const _fillAllData = (mockRESTv2Srv) => { } } -const _createMockRESTv2Srv = () => { - return new MockRESTv2Server({ listen: true }) +const _createMockRESTv2Srv = (args) => { + return new ExtraMockRESTv2Server(args) } -const createMockRESTv2SrvWithAllData = () => { - const srv = _createMockRESTv2Srv() +const createMockRESTv2SrvWithAllData = (args) => { + const srv = _createMockRESTv2Srv(args) _fillAllData(srv) return srv @@ -207,10 +222,11 @@ const createMockRESTv2SrvWithDate = ( opts = getMockDataOpts(), { _getMockData = getMockData, - _setDataTo = setDataTo + _setDataTo = setDataTo, + extraMockMethods } = {} ) => { - const srv = _createMockRESTv2Srv() + const srv = _createMockRESTv2Srv({ extraMockMethods }) Object.entries(opts).forEach(([key, val]) => { const mockData = _getMockData(key) From 79c8d485aba69724c94ea898d733eff716b6e91b Mon Sep 17 00:00:00 2001 From: Vladimir Voronkov Date: Wed, 29 Mar 2023 07:44:42 +0300 Subject: [PATCH 3/3] Bump version up to 4.1.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8a868236..c2b8148c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bfx-report", - "version": "4.1.0", + "version": "4.1.1", "description": "Reporting tool", "main": "worker.js", "license": "Apache-2.0",