这是indexloc提供的服务，不要输入任何密码
Skip to content

Release version to master #288

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Mar 29, 2023
Merged

Release version to master #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be86a4c
Add ability to set options into AuthError
ZIMkaRU Mar 21, 2023
a00e76e
Merge pull request #285 from ZIMkaRU/feature/add-invalid-auth-token-f…
prdn Mar 22, 2023
567e671
Add ability to set extra rest_v2 mock methods
ZIMkaRU Mar 23, 2023
bdf8b9d
Merge pull request #286 from ZIMkaRU/feature/add-ability-to-set-extra…
prdn Mar 23, 2023
79c8d48
Bump version up to 4.1.1
ZIMkaRU Mar 29, 2023
0b38236
Merge pull request #287 from ZIMkaRU/feature/release-version
prdn Mar 29, 2023
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
28 changes: 22 additions & 6 deletions test/helpers/helpers.mock-rest-v2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand All @@ -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
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions workers/loc.api/errors/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down