From d8e1f2d28b19914cb693bf5af4033ed23e00d826 Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 14:53:01 +0800 Subject: [PATCH 1/9] mapping the jsonql-utils removed method back as local method --- packages/resolver/package.json | 2 +- packages/resolver/src/handle-auth-methods.js | 4 +- packages/resolver/src/resolve-methods.js | 6 +-- packages/resolver/src/utils.js | 52 +++++++++++++++++-- .../tests/fixtures/contract/es/contract.json | 2 +- packages/resolver/tests/throw.test.js | 2 + 6 files changed, 57 insertions(+), 11 deletions(-) diff --git a/packages/resolver/package.json b/packages/resolver/package.json index f1a3ceb1..d6ccc3f2 100644 --- a/packages/resolver/package.json +++ b/packages/resolver/package.json @@ -30,7 +30,7 @@ "jsonql-constants": "^1.8.13", "jsonql-errors": "^1.1.10", "jsonql-jwt": "^1.3.7", - "jsonql-node-client": "^1.2.5", + "jsonql-node-client": "^1.2.6", "jsonql-params-validator": "^1.5.1", "jsonql-utils": "^0.9.2", "lodash.merge": "^4.6.2" diff --git a/packages/resolver/src/handle-auth-methods.js b/packages/resolver/src/handle-auth-methods.js index 1365c15f..7f9b29d4 100644 --- a/packages/resolver/src/handle-auth-methods.js +++ b/packages/resolver/src/handle-auth-methods.js @@ -15,9 +15,9 @@ const { getErrorNameByInstance, UNKNOWN_ERROR } = require('jsonql-errors') -const { handleOutput, packResult, ctxErrorHandler } = require('jsonql-utils') +const { handleOutput, packResult } = require('jsonql-utils') -const { getDebug } = require('./utils') +const { getDebug, ctxErrorHandler } = require('./utils') const { searchResolvers } = require('./search-resolvers') const { validateAndCall } = require('./validate-and-call') diff --git a/packages/resolver/src/resolve-methods.js b/packages/resolver/src/resolve-methods.js index 39fcb9a4..667b43ca 100644 --- a/packages/resolver/src/resolve-methods.js +++ b/packages/resolver/src/resolve-methods.js @@ -13,13 +13,11 @@ const { const { provideUserdata } = require('jsonql-jwt') const { MODULE_TYPE } = require('jsonql-constants') const { - handleOutput, - ctxErrorHandler, packResult, extractArgsFromPayload, findFromContract } = require('jsonql-utils') -const { getDebug } = require('./utils') +const { getDebug, handleOutput, ctxErrorHandler } = require('./utils') const { searchResolvers, importFromModule, requireEsModule } = require('./search-resolvers') const { validateAndCall } = require('./validate-and-call') const { provideNodeClients } = require('./provide-node-clients') @@ -97,7 +95,7 @@ const executeResolver = (opts, type, resolverName, payload, contract, userdata = */ async function resolverRenderHandler(ctx, type, opts, contract) { const { payload, resolverName, userdata } = ctx.state.jsonql; - debug('resolveMethod', resolverName, payload, type) + debug('resolverRenderHandler', resolverName, payload, type) // There must be only one method call const renderHandler = handleOutput(opts) // first try to catch the resolve error diff --git a/packages/resolver/src/utils.js b/packages/resolver/src/utils.js index ffa36f89..70ba629f 100644 --- a/packages/resolver/src/utils.js +++ b/packages/resolver/src/utils.js @@ -1,6 +1,8 @@ const debug = require('debug') const MODULE_NAME = 'jsonql-resolver' +const { getDocLen, packError } = require('jsonql-utils') +const { CONTENT_TYPE, SUCCESS_STATUS } = require('jsonql-constants') /** * return the debug method @@ -11,11 +13,55 @@ const getDebug = function(name) { return debug(MODULE_NAME).extend(name) } -// The following are moved back from utils - +// The following are moved back from utils +/** + * Handle the output + * @param {object} opts configuration + * @return {function} with ctx and body as params + */ +const handleOutput = function(opts) { + return function(ctx, body) { + ctx.size = getDocLen(body) + ctx.type = opts.contentType; + ctx.status = SUCCESS_STATUS; + ctx.body = body; + } +} +/** + * this was in the jsonql-utils then move back to koa + * but now make it stand alone here + * use the ctx to generate error output + * V1.1.0 we render this as a normal output with status 200 + * then on the client side will check against the result object for error + * @param {object} ctx context + * @param {number} code 404 / 500 etc + * @param {object} e actual error + * @param {string} message if there is one + * @param {string} name custom error class name + */ +const ctxErrorHandler = function(ctx, code, e, message = '') { + const render = handleOutput({contentType: CONTENT_TYPE}) + // debug('[ctxErrorHandler]', code, e, message) + let name; + if (typeof code === 'string') { + name = code; + code = jsonqlErrors[name] ? jsonqlErrors[name].statusCode : -1; + } else { + // debug(`[ctxErrorHandler] using getErrorByStatus`) + name = jsonqlErrors.getErrorByStatus(code) + } + // debug(`[ctxErrorHandler.name]`, name) + // preserve the message + if (!message && e && e.message) { + message = e.message; + } + return render(ctx, packError(e, name, code, message)) +} module.exports = { - getDebug + getDebug, + handleOutput, + ctxErrorHandler } diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 1fca3048..123bf854 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1575864328, + "timestamp": 1575872850, "sourceType": "module" } diff --git a/packages/resolver/tests/throw.test.js b/packages/resolver/tests/throw.test.js index 961d918f..ba2018f6 100644 --- a/packages/resolver/tests/throw.test.js +++ b/packages/resolver/tests/throw.test.js @@ -40,6 +40,8 @@ test.cb(`When resolver throw error, it should able to throw back a JsonqlResolve t.context.contract ) .catch(e => { + debug(e) + let errorName = getErrorNameByInstance([ JsonqlResolverNotFoundError, JsonqlAuthorisationError, -- Gitee From d080067460ac5e32f0afcb2d20c8c79ec8de8b06 Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 15:49:49 +0800 Subject: [PATCH 2/9] resolve the call resolver not throw back the resolver app error problem --- packages/resolver/src/search-resolvers.js | 2 +- packages/resolver/src/validate-and-call.js | 23 +++++++++++++++++++--- packages/resolver/tests/throw.test.js | 4 ++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/packages/resolver/src/search-resolvers.js b/packages/resolver/src/search-resolvers.js index 99517855..cbe29853 100644 --- a/packages/resolver/src/search-resolvers.js +++ b/packages/resolver/src/search-resolvers.js @@ -69,7 +69,7 @@ function searchResolvers(name, type, opts, contract) { if (pathToResolver !== false) { return pathToResolver; } - debug(`pathToResolver not found in contract`, contract) + debug(`pathToResolver not found in contract`, type, name, json) // search by running pathToResolver = getPathToFn(name, type, opts) if (pathToResolver) { diff --git a/packages/resolver/src/validate-and-call.js b/packages/resolver/src/validate-and-call.js index d1b4729b..108aa869 100644 --- a/packages/resolver/src/validate-and-call.js +++ b/packages/resolver/src/validate-and-call.js @@ -1,7 +1,7 @@ // validation wrapper const { AUTH_TYPE, HSA_ALGO, RSA_ALGO } = require('jsonql-constants') const { validateSync, isString } = require('jsonql-params-validator') -const { JsonqlValidationError } = require('jsonql-errors') +const { JsonqlValidationError, JsonqlResolverAppError } = require('jsonql-errors') const { extractParamsFromContract } = require('jsonql-utils') const { loginResultToJwt } = require('jsonql-jwt') const { getDebug } = require('./utils') @@ -40,6 +40,24 @@ const applyJwtMethod = (type, name, opts, contract) => { } } +/** + * Break out from the method below, to seperate the process of running the resolver + * @param {string} name the resolver name for report error + * @param {function} fn the resolver function + * @param {array} args the argument + * @return {promise} resolve when success + */ +function runResolver(name, fm, args) { + // @NOTE here is the problem + return new Promise((resolver, rejecter) => { + try { + resolver(Reflect.apply(fn, null, args)) + } catch(e) { + rejecter(new JsonqlResolverAppError(name, e)) + } + }) +} + /** * @TODO we should cut down the parameters here, the opts and contract should merge * also the type, name and args should merge together as one input for the fn @@ -60,8 +78,7 @@ function validateAndCall(fn, args, contract, type, name, opts) { throw new JsonqlValidationError(name, errors) } - return Promise - .resolve(Reflect.apply(fn, null, args)) + return runResolver(name, fn, args) .then(applyJwtMethod(type, name, opts, contract)) } diff --git a/packages/resolver/tests/throw.test.js b/packages/resolver/tests/throw.test.js index ba2018f6..04fa7fb7 100644 --- a/packages/resolver/tests/throw.test.js +++ b/packages/resolver/tests/throw.test.js @@ -49,7 +49,7 @@ test.cb(`When resolver throw error, it should able to throw back a JsonqlResolve JsonqlResolverAppError ], e) - t.is(errorName, UNKNOWN_ERROR) + t.is(errorName, 'JsonqlResolverAppError') t.end() }) @@ -63,6 +63,6 @@ test(`The getLocalValidator should throw a JsonqlResolverNotFoundError`, t => { }, t.context.contract) }, JsonqlResolverNotFoundError, 'There is no validator and should throw error') - debug(error) + // debug(error) }) -- Gitee From 7f68b8818125e6c7591266c9455bf44f8717cc32 Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 15:50:50 +0800 Subject: [PATCH 3/9] commit before continue --- packages/resolver/tests/fixtures/contract/es/contract.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 123bf854..cd33d2ee 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1575872850, + "timestamp": 1575877796, "sourceType": "module" } -- Gitee From b9cface77d615b3b9cc51d1ca2090c42d6417683 Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 16:38:43 +0800 Subject: [PATCH 4/9] jsonql-resolver to 1.0.0 --- packages/resolver/package.json | 3 ++- packages/resolver/src/validate-and-call.js | 5 +++-- packages/resolver/tests/fixtures/contract/es/contract.json | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/resolver/package.json b/packages/resolver/package.json index d6ccc3f2..195220cf 100644 --- a/packages/resolver/package.json +++ b/packages/resolver/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-resolver", - "version": "0.9.12", + "version": "1.0.0", "description": "This is NOT for general use, please do not install it directly. This module is part of the jsonql tools supporting modules.", "main": "index.js", "files": [ @@ -10,6 +10,7 @@ "scripts": { "test": "ava --verbose", "prepare": "npm run test", + "test:base": "DEBUG=jsonql* ava --verbose ./tests/base.test.js", "test:clients": "DEBUG=jsonql* ava --verbose ./tests/clients.test.js", "test:throw": "DEBUG=jsonql-resolver* ava --verbose ./tests/throw.test.js", "test:es": "DEBUG=jsonql-resolver* ava --verbose ./tests/es.test.js", diff --git a/packages/resolver/src/validate-and-call.js b/packages/resolver/src/validate-and-call.js index 108aa869..7c136522 100644 --- a/packages/resolver/src/validate-and-call.js +++ b/packages/resolver/src/validate-and-call.js @@ -42,17 +42,18 @@ const applyJwtMethod = (type, name, opts, contract) => { /** * Break out from the method below, to seperate the process of running the resolver - * @param {string} name the resolver name for report error + * @param {string} name the resolver name for report error * @param {function} fn the resolver function * @param {array} args the argument * @return {promise} resolve when success */ -function runResolver(name, fm, args) { +function runResolver(name, fn, args) { // @NOTE here is the problem return new Promise((resolver, rejecter) => { try { resolver(Reflect.apply(fn, null, args)) } catch(e) { + debug('runResolver', e) rejecter(new JsonqlResolverAppError(name, e)) } }) diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index cd33d2ee..9a144085 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1575877796, + "timestamp": 1575880642, "sourceType": "module" } -- Gitee From c62a8ac872cdb083b535aabe28e9812343ee734a Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 16:42:05 +0800 Subject: [PATCH 5/9] add back the missing jsonqlErrors for jsonql-resolver --- packages/koa/keys/privateKey.pem | 26 +++++++++---------- packages/koa/keys/publicKey.pem | 8 +++--- packages/koa/package.json | 10 +++---- packages/resolver/package.json | 2 +- packages/resolver/src/utils.js | 2 +- .../tests/fixtures/contract/es/contract.json | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/koa/keys/privateKey.pem b/packages/koa/keys/privateKey.pem index 885aed98..26f5242e 100644 --- a/packages/koa/keys/privateKey.pem +++ b/packages/koa/keys/privateKey.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDISseWqVH7QTTuzQ/HQkRMRi3IPEsHJm8gT1RoxD/R3MpWYPFR -14fVE/IXxHZa74XSPxfMfBB8eh+CJu9K9mmgnGhHovgNUMsfshLmvY7dnkepiNE7 -sZsDR63+6BPgogMzHhMxUAcP3AiwPtQz8uKRwroqWMHI1pn2zqKRVLe4+QIDAQAB -AoGAe0OyU6F+5794oSKofDvnJn3mPR4GGq9nop3P1+43TKOyDrj4qyKW4Oa2jjQF -lu9kD0FvFxSfXMwXyhTGHf9Kf0oj0fuMz87EvHRMDAYfGzIz/skqqCcN49viejK8 -09mFtE+GYC8SVKj5qw9J2/pHsUSRTxkeb2hR8CSV8fOx8hUCQQD/dyfMmGsmnou+ -WEjQ4gdYixNzsP7TtmBkS4aBug8QHHsf1L5gQ6ikmuyLa507hAH3WmOx7MNeia2y -xXn8QYdrAkEAyLYR0g1t2qdJQiubZBO8MkGKUFk1NSQSAmatjk/6EAWrJSDuIDH4 -8GOnOKyNbFQ5nG1HTK+1nE9fl+/22BJuKwJAM6UiHaF+n/sTYzKz3c6kD4lmMFBK -5AANspj2I0m6+9XWKlQ2/H0RHd3YDkN+MOb6Ash6OSEVSgppXCfCBnY06wJBAICu -yuojlgUUMBHup2gYhxapkqZFK6nwgGNttWSCvk67c6kQXdvibjqhibr6VonXzkAO -iCIQnZ2j/iQJw/dwiZUCQQDln/vKEmEcnhU+OgmgNb7k8mRhS/2F6j4LCJQ5dMwY -Lnaxh2Zsl93vYSHHm6LG784zN3sPKdGgwGCN/ldWCxo6 +MIICWwIBAAKBgQDOJvM0Mm6sOEVXRGK46M8RdjVptwK6wM0r+mFO6WBwQGNr4ES+ +hC4DlaAhEjf9f8TFYrmz7OekxKV+m4acaCfwPyRiJbo4LVj2q6QPZNH59k6ewzY5 +ir6gW/KAhT76Ech+fQQmBT6m2EliTloCCJqSzkRzA8+xMU6gOW8iMyMKQwIDAQAB +AoGADcfiyCF67n5QfFXw94Vwmi05wtheEVfkH0V8jcbiEH7tZn+2eLnjTZAKBUvv +fD23TK6d1V5H2ebfXUhORlRcHv9reTyVMZIghJrtmitWcUEZp3/Dme43DkMsnmN0 +hJlnJPnNu+8bDuV8vimYx9TSjF8NHqRUtisxRZDA+svQ/fECQQD9332/qQrigTq4 +RJi4cC+0VjMlqzB2LpWpidwt8HXMHKr1026XN1xMFkSK3MjmmPIRb6UAcbjUq8aF +oNuTzavbAkEAz+EbUtEuvAZDbvLyFv0SzRuBGD+7ULE0WNYOZQtQchibyPIXJ3+5 +TpKePY+4xrXE35ImOO43AkVtp/hf77FbuQJAVfROUg781XWlmO/4uTGapTcuOAm+ +7bSWDYHUn2UzrPjj1TlRzzb6M/SyHkXka1bLVqXzOrRGPRMvstykm2VeUwJAWI9+ +JHoZfuDsOYgmusR2Dgt5o+sC0g2sT2xiFYoMa48wTxtT4e/38hFkeLWR8pXdmaGZ +xwc1SDJr1PNra6ITgQJALuP/3d26E2a7oscLVd3XxJQNhk4M9zVAS1QUi/0+s7tp +aw6BCJcYA6ZpErdj7oNanu640jHuMfCqxu/QH+9l7w== -----END RSA PRIVATE KEY----- diff --git a/packages/koa/keys/publicKey.pem b/packages/koa/keys/publicKey.pem index 30b9e94e..ad517f1c 100644 --- a/packages/koa/keys/publicKey.pem +++ b/packages/koa/keys/publicKey.pem @@ -1,6 +1,6 @@ -----BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDISseWqVH7QTTuzQ/HQkRMRi3I -PEsHJm8gT1RoxD/R3MpWYPFR14fVE/IXxHZa74XSPxfMfBB8eh+CJu9K9mmgnGhH -ovgNUMsfshLmvY7dnkepiNE7sZsDR63+6BPgogMzHhMxUAcP3AiwPtQz8uKRwroq -WMHI1pn2zqKRVLe4+QIDAQAB +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOJvM0Mm6sOEVXRGK46M8RdjVp +twK6wM0r+mFO6WBwQGNr4ES+hC4DlaAhEjf9f8TFYrmz7OekxKV+m4acaCfwPyRi +Jbo4LVj2q6QPZNH59k6ewzY5ir6gW/KAhT76Ech+fQQmBT6m2EliTloCCJqSzkRz +A8+xMU6gOW8iMyMKQwIDAQAB -----END PUBLIC KEY----- diff --git a/packages/koa/package.json b/packages/koa/package.json index 59f900f1..11c3a525 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -76,11 +76,11 @@ "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.13", "jsonql-contract": "^1.8.4", - "jsonql-errors": "^1.1.8", - "jsonql-jwt": "^1.3.6", - "jsonql-node-client": "^1.2.5", - "jsonql-params-validator": "^1.5.0", - "jsonql-resolver": "^0.9.11", + "jsonql-errors": "^1.1.10", + "jsonql-jwt": "^1.3.7", + "jsonql-node-client": "^1.2.6", + "jsonql-params-validator": "^1.5.1", + "jsonql-resolver": "^1.0.0", "jsonql-utils": "^0.9.2", "jsonql-web-console": "^0.4.4", "koa-compose": "^4.1.0", diff --git a/packages/resolver/package.json b/packages/resolver/package.json index 195220cf..e2fd7e1a 100644 --- a/packages/resolver/package.json +++ b/packages/resolver/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-resolver", - "version": "1.0.0", + "version": "1.0.1", "description": "This is NOT for general use, please do not install it directly. This module is part of the jsonql tools supporting modules.", "main": "index.js", "files": [ diff --git a/packages/resolver/src/utils.js b/packages/resolver/src/utils.js index 70ba629f..b36f162c 100644 --- a/packages/resolver/src/utils.js +++ b/packages/resolver/src/utils.js @@ -3,7 +3,7 @@ const debug = require('debug') const MODULE_NAME = 'jsonql-resolver' const { getDocLen, packError } = require('jsonql-utils') const { CONTENT_TYPE, SUCCESS_STATUS } = require('jsonql-constants') - +const jsonqlErrors = require('jsonql-errors') /** * return the debug method * @param {string} name the base name diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 9a144085..3a567b10 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1575880642, + "timestamp": 1575880734, "sourceType": "module" } -- Gitee From 49028ad86049ff7c3f118360e3f8619b501903dc Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 16:57:11 +0800 Subject: [PATCH 6/9] Fix the wrong import path in jsonql-resolver --- packages/koa/keys/privateKey.pem | 26 +++++++++---------- packages/koa/keys/publicKey.pem | 8 +++--- packages/koa/package.json | 4 +-- .../koa/src/middlewares/init-middleware.js | 2 +- .../middlewares/public-method-middleware.js | 2 +- packages/koa/tests/jwt.test.js | 1 + packages/resolver/package.json | 2 +- packages/resolver/src/handle-auth-methods.js | 6 ++--- packages/resolver/src/utils.js | 4 +++ .../tests/fixtures/contract/es/contract.json | 2 +- 10 files changed, 31 insertions(+), 26 deletions(-) diff --git a/packages/koa/keys/privateKey.pem b/packages/koa/keys/privateKey.pem index 26f5242e..2531361e 100644 --- a/packages/koa/keys/privateKey.pem +++ b/packages/koa/keys/privateKey.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICWwIBAAKBgQDOJvM0Mm6sOEVXRGK46M8RdjVptwK6wM0r+mFO6WBwQGNr4ES+ -hC4DlaAhEjf9f8TFYrmz7OekxKV+m4acaCfwPyRiJbo4LVj2q6QPZNH59k6ewzY5 -ir6gW/KAhT76Ech+fQQmBT6m2EliTloCCJqSzkRzA8+xMU6gOW8iMyMKQwIDAQAB -AoGADcfiyCF67n5QfFXw94Vwmi05wtheEVfkH0V8jcbiEH7tZn+2eLnjTZAKBUvv -fD23TK6d1V5H2ebfXUhORlRcHv9reTyVMZIghJrtmitWcUEZp3/Dme43DkMsnmN0 -hJlnJPnNu+8bDuV8vimYx9TSjF8NHqRUtisxRZDA+svQ/fECQQD9332/qQrigTq4 -RJi4cC+0VjMlqzB2LpWpidwt8HXMHKr1026XN1xMFkSK3MjmmPIRb6UAcbjUq8aF -oNuTzavbAkEAz+EbUtEuvAZDbvLyFv0SzRuBGD+7ULE0WNYOZQtQchibyPIXJ3+5 -TpKePY+4xrXE35ImOO43AkVtp/hf77FbuQJAVfROUg781XWlmO/4uTGapTcuOAm+ -7bSWDYHUn2UzrPjj1TlRzzb6M/SyHkXka1bLVqXzOrRGPRMvstykm2VeUwJAWI9+ -JHoZfuDsOYgmusR2Dgt5o+sC0g2sT2xiFYoMa48wTxtT4e/38hFkeLWR8pXdmaGZ -xwc1SDJr1PNra6ITgQJALuP/3d26E2a7oscLVd3XxJQNhk4M9zVAS1QUi/0+s7tp -aw6BCJcYA6ZpErdj7oNanu640jHuMfCqxu/QH+9l7w== +MIICXQIBAAKBgQDNnqjVsfQ9+MVCIB8DYeJ26ziY5UCztBzjFvEUwrd4zfp/lVoe +Vm7kMvI3ezOhVed1nKA3P91/3ahHC05KlsYcoE0ZhZvZ8ZqPljTIKcrKK0ng1UHi +9Jk7b+295ywgaS11W/CO0vvTgsTfJvZukxCVwTkjUxELaNlZgZAAP16BJwIDAQAB +AoGBAJ04psIXOrk0AaiJJQ2SB/aD7xfBm5KMstXVEeuc42sEnHh3e5vc3Rex+NEB +bD39kGi2pS75r2T42JXSCEAyPzH9iE54XSE2t1mpUXcEpN4/CS8HVIe135q5ZukU +OkITOck1ghkXk9Tf6Eh2z5uHC5dOjARAJzPJVzb4PbdAxdP5AkEA/mUiNnBSRz3w +YBuKYi6Q/NSwAO4dFOWXkkQOsgB+j8ETZKTsA5PRqPzJcqk72W3WczKbZQYgOFLJ +r+S1JmSnKwJBAM7qwBDfOqsmmI5ydQy8cGqyZwEM+hj7xsNZmT6vp1vsvZk3ynca +fxC1heut1j/+K4fw00gdv+F0LJS8EVI9D/UCQAb4totPYLHbHK9FkfFG3WpQWdJs +tBdSg2javJxcLxu5atKjQmSGtIQxCUQ/Jwi6XdoiVOfb1x40BprvZZd7wqkCQQCZ +QZyCoqSUseCa2UHC7iuhi4PpblArgwikFk//8yBVYNLJkl4eu3xTxu9rMXWYLkzV +wlTrfEVr2p1OiMGXlOylAkAbva+53wYaUk96KdBMOoCK+XpEpAcefp4Vr1p2YtMP +AuDRtOvp1H0W4qbBIEM5CEgz79W9g2HdgC9lzQg2NA+9 -----END RSA PRIVATE KEY----- diff --git a/packages/koa/keys/publicKey.pem b/packages/koa/keys/publicKey.pem index ad517f1c..a9fd0038 100644 --- a/packages/koa/keys/publicKey.pem +++ b/packages/koa/keys/publicKey.pem @@ -1,6 +1,6 @@ -----BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDOJvM0Mm6sOEVXRGK46M8RdjVp -twK6wM0r+mFO6WBwQGNr4ES+hC4DlaAhEjf9f8TFYrmz7OekxKV+m4acaCfwPyRi -Jbo4LVj2q6QPZNH59k6ewzY5ir6gW/KAhT76Ech+fQQmBT6m2EliTloCCJqSzkRz -A8+xMU6gOW8iMyMKQwIDAQAB +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNnqjVsfQ9+MVCIB8DYeJ26ziY +5UCztBzjFvEUwrd4zfp/lVoeVm7kMvI3ezOhVed1nKA3P91/3ahHC05KlsYcoE0Z +hZvZ8ZqPljTIKcrKK0ng1UHi9Jk7b+295ywgaS11W/CO0vvTgsTfJvZukxCVwTkj +UxELaNlZgZAAP16BJwIDAQAB -----END PUBLIC KEY----- diff --git a/packages/koa/package.json b/packages/koa/package.json index 11c3a525..7ed5fb74 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -19,7 +19,7 @@ "test:basic": "DEBUG=jsonql* ava ./tests/koa.test.js", "test:notfound": "DEBUG=jsonql-* ava --verbose ./tests/resolverNotFound.test.js", "test:es6": "DEBUG=jsonql-* ava --verbose ./tests/es6-module.test.js", - "test:jwt": "DEBUG=jsonql-koa*,jsonql-jwt* ava ./tests/jwt.test.js", + "test:jwt": "DEBUG=jsonql-* ava ./tests/jwt.test.js", "test:jwt-auth": "DEBUG=jsonql-koa* ava ./tests/jwt-auth.test.js", "test:fail": "ava ./tests/fail.test.js", "test:contract": "DEBUG=jsonql-koa*,jsonql-contract* ava ./tests/contractWithAuth.test.js", @@ -80,7 +80,7 @@ "jsonql-jwt": "^1.3.7", "jsonql-node-client": "^1.2.6", "jsonql-params-validator": "^1.5.1", - "jsonql-resolver": "^1.0.0", + "jsonql-resolver": "^1.0.1", "jsonql-utils": "^0.9.2", "jsonql-web-console": "^0.4.4", "koa-compose": "^4.1.0", diff --git a/packages/koa/src/middlewares/init-middleware.js b/packages/koa/src/middlewares/init-middleware.js index 11c05436..219e4350 100644 --- a/packages/koa/src/middlewares/init-middleware.js +++ b/packages/koa/src/middlewares/init-middleware.js @@ -40,7 +40,7 @@ export default function initMiddleware(opts) { if (isJsonql) { // its only call once ctx.state.jsonql.contract = await processContract(ctx, opts) - debug('ctx.state.jsonql.contract', ctx.state.jsonql.contract) + // debug('ctx.state.jsonql.contract', ctx.state.jsonql.contract) // @BUG makes no different to define the contract as a property, somewhere still overwrite it // @NOTE see if this works or not to make sure the contract prop is not writable // ctx.state.jsonql = injectToFn(ctx.state.jsonql, 'contract', __contract__) diff --git a/packages/koa/src/middlewares/public-method-middleware.js b/packages/koa/src/middlewares/public-method-middleware.js index 4573f250..e2dabdb7 100644 --- a/packages/koa/src/middlewares/public-method-middleware.js +++ b/packages/koa/src/middlewares/public-method-middleware.js @@ -21,7 +21,7 @@ export default function publicMethodMiddleware(opts) { } else if (resolverType === AUTH_TYPE && resolverName === opts.loginHandlerName) { // @BUG some how the contract here becomes true instead of an object // somewhere changed it! - debug(`This is an auth [${opts.loginHandlerName}] call`, contract) + debug(`This is an auth [${opts.loginHandlerName}] call`) // ctx, resolverName, payload, opts, contract return handleAuthMethods(ctx, resolverName, payload, opts, contract) } diff --git a/packages/koa/tests/jwt.test.js b/packages/koa/tests/jwt.test.js index 10a9d00c..f5b70f31 100644 --- a/packages/koa/tests/jwt.test.js +++ b/packages/koa/tests/jwt.test.js @@ -55,6 +55,7 @@ test('It should able to provide a token that can be decode with the client side t.is(200, res.status) let token = res.body.data; + debug('token', token) t.context.token = token; diff --git a/packages/resolver/package.json b/packages/resolver/package.json index e2fd7e1a..ad3d68b8 100644 --- a/packages/resolver/package.json +++ b/packages/resolver/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-resolver", - "version": "1.0.1", + "version": "1.0.2", "description": "This is NOT for general use, please do not install it directly. This module is part of the jsonql tools supporting modules.", "main": "index.js", "files": [ diff --git a/packages/resolver/src/handle-auth-methods.js b/packages/resolver/src/handle-auth-methods.js index 7f9b29d4..363ed101 100644 --- a/packages/resolver/src/handle-auth-methods.js +++ b/packages/resolver/src/handle-auth-methods.js @@ -15,9 +15,9 @@ const { getErrorNameByInstance, UNKNOWN_ERROR } = require('jsonql-errors') -const { handleOutput, packResult } = require('jsonql-utils') +const { packResult } = require('jsonql-utils') -const { getDebug, ctxErrorHandler } = require('./utils') +const { getDebug, ctxErrorHandler, handleOutput, UNAUTHORIZED_STATUS } = require('./utils') const { searchResolvers } = require('./search-resolvers') const { validateAndCall } = require('./validate-and-call') @@ -79,7 +79,7 @@ const handleAuthMethods = async function(ctx, resolverName, payload, opts, contr JsonqlValidationError ], e) if (errorName === UNKNOWN_ERROR) { - return ctxErrorHandler(ctx, 401, e) + return ctxErrorHandler(ctx, UNAUTHORIZED_STATUS, e) } return ctxErrorHandler(ctx, errorName, e) } diff --git a/packages/resolver/src/utils.js b/packages/resolver/src/utils.js index b36f162c..6f31bf94 100644 --- a/packages/resolver/src/utils.js +++ b/packages/resolver/src/utils.js @@ -4,6 +4,9 @@ const MODULE_NAME = 'jsonql-resolver' const { getDocLen, packError } = require('jsonql-utils') const { CONTENT_TYPE, SUCCESS_STATUS } = require('jsonql-constants') const jsonqlErrors = require('jsonql-errors') +// @TODO port this back to jsonql-constants later +const UNAUTHORIZED_STATUS = 401; + /** * return the debug method * @param {string} name the base name @@ -61,6 +64,7 @@ const ctxErrorHandler = function(ctx, code, e, message = '') { } module.exports = { + UNAUTHORIZED_STATUS, getDebug, handleOutput, ctxErrorHandler diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 3a567b10..183d9708 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1575880734, + "timestamp": 1575880933, "sourceType": "module" } -- Gitee From d4a33dad7850ca19cac9e84c5557572a58bfeffd Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 16:59:02 +0800 Subject: [PATCH 7/9] resolve all the problem with import module for jsonql-koa --- packages/koa/keys/privateKey.pem | 26 +++++++++---------- packages/koa/keys/publicKey.pem | 8 +++--- packages/koa/package.json | 2 +- .../tests/fixtures/contract/es/contract.json | 2 +- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/koa/keys/privateKey.pem b/packages/koa/keys/privateKey.pem index 2531361e..b1424a97 100644 --- a/packages/koa/keys/privateKey.pem +++ b/packages/koa/keys/privateKey.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDNnqjVsfQ9+MVCIB8DYeJ26ziY5UCztBzjFvEUwrd4zfp/lVoe -Vm7kMvI3ezOhVed1nKA3P91/3ahHC05KlsYcoE0ZhZvZ8ZqPljTIKcrKK0ng1UHi -9Jk7b+295ywgaS11W/CO0vvTgsTfJvZukxCVwTkjUxELaNlZgZAAP16BJwIDAQAB -AoGBAJ04psIXOrk0AaiJJQ2SB/aD7xfBm5KMstXVEeuc42sEnHh3e5vc3Rex+NEB -bD39kGi2pS75r2T42JXSCEAyPzH9iE54XSE2t1mpUXcEpN4/CS8HVIe135q5ZukU -OkITOck1ghkXk9Tf6Eh2z5uHC5dOjARAJzPJVzb4PbdAxdP5AkEA/mUiNnBSRz3w -YBuKYi6Q/NSwAO4dFOWXkkQOsgB+j8ETZKTsA5PRqPzJcqk72W3WczKbZQYgOFLJ -r+S1JmSnKwJBAM7qwBDfOqsmmI5ydQy8cGqyZwEM+hj7xsNZmT6vp1vsvZk3ynca -fxC1heut1j/+K4fw00gdv+F0LJS8EVI9D/UCQAb4totPYLHbHK9FkfFG3WpQWdJs -tBdSg2javJxcLxu5atKjQmSGtIQxCUQ/Jwi6XdoiVOfb1x40BprvZZd7wqkCQQCZ -QZyCoqSUseCa2UHC7iuhi4PpblArgwikFk//8yBVYNLJkl4eu3xTxu9rMXWYLkzV -wlTrfEVr2p1OiMGXlOylAkAbva+53wYaUk96KdBMOoCK+XpEpAcefp4Vr1p2YtMP -AuDRtOvp1H0W4qbBIEM5CEgz79W9g2HdgC9lzQg2NA+9 +MIICXAIBAAKBgQDNfs3/jSoFAMN52ArnA0o1e50UQ9A887CVF7atRng/nUYxFZzz +5XB8zD8Y7tCL7U0902pWV6IixMGqL4s2cEtJLF8xMxZN5WeknpB8UUQo3Qf17M80 +tXJfwcG2QaXQ1bJrwfpqYSIfY4pF9BFhjbE32iMD9szd76lUe8ecX9yrkwIDAQAB +AoGACmgsmI+WnDBAtg/55V8mR/UdrGQOzLduru5Hgxj5iAc4Ac5dZ4CsJLXXUDTv +/NYkvkfRr9O6U1ZxlGPaAgTH2zKXwVOVIm9hwm9vc50zxE4lGccAMbsh+/HRQMAc +UshkD85WgQfZLP8d1J1Df4yVBp6wiwdyMdhPOhhVD2yNJXkCQQDmPLU7x6nZmIQ3 +d9FmJtxSYqTwvYvUbnUTdJ4qq/QZgMljKyDdH4qlIg3y4dDTTMlUURjtjjA7modH +LmEKsiC9AkEA5H1aAIcFzysopAoCQhbvX5MyR0ZIv2hpzyTdXVB9RKbb9PYOVBhr +12k+A3220y8x/w7zcb2xIqi5peSbszkKjwJBALnftvzdE73NCKjzPYV3yBVm9/w3 +OmU1C6W6V1rh2b6hH3TFQ9Hg/gCU/qfgMMP10PAWTMa0LTJhbedEhSmqZw0CQH9T +31jV5YXaLi6jqTh9IW3oUCdp4lZP8E7P41AB75zXQ1HR4JA6f7Yt3rIBV2V+MmVJ +Rp6Gr/R5g+MPbzjDu78CQFZO5sVqHCl66OsQ4YUpSAc5MVOuF0OFy7+G0hkWhlKM +PPL67zwrPdgfTJ9K+wqikustYa56rsWpMmLWpo+FfyY= -----END RSA PRIVATE KEY----- diff --git a/packages/koa/keys/publicKey.pem b/packages/koa/keys/publicKey.pem index a9fd0038..16fa9876 100644 --- a/packages/koa/keys/publicKey.pem +++ b/packages/koa/keys/publicKey.pem @@ -1,6 +1,6 @@ -----BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNnqjVsfQ9+MVCIB8DYeJ26ziY -5UCztBzjFvEUwrd4zfp/lVoeVm7kMvI3ezOhVed1nKA3P91/3ahHC05KlsYcoE0Z -hZvZ8ZqPljTIKcrKK0ng1UHi9Jk7b+295ywgaS11W/CO0vvTgsTfJvZukxCVwTkj -UxELaNlZgZAAP16BJwIDAQAB +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNfs3/jSoFAMN52ArnA0o1e50U +Q9A887CVF7atRng/nUYxFZzz5XB8zD8Y7tCL7U0902pWV6IixMGqL4s2cEtJLF8x +MxZN5WeknpB8UUQo3Qf17M80tXJfwcG2QaXQ1bJrwfpqYSIfY4pF9BFhjbE32iMD +9szd76lUe8ecX9yrkwIDAQAB -----END PUBLIC KEY----- diff --git a/packages/koa/package.json b/packages/koa/package.json index 7ed5fb74..da2e86b9 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -80,7 +80,7 @@ "jsonql-jwt": "^1.3.7", "jsonql-node-client": "^1.2.6", "jsonql-params-validator": "^1.5.1", - "jsonql-resolver": "^1.0.1", + "jsonql-resolver": "^1.0.2", "jsonql-utils": "^0.9.2", "jsonql-web-console": "^0.4.4", "koa-compose": "^4.1.0", diff --git a/packages/resolver/tests/fixtures/contract/es/contract.json b/packages/resolver/tests/fixtures/contract/es/contract.json index 183d9708..9e95e5c4 100644 --- a/packages/resolver/tests/fixtures/contract/es/contract.json +++ b/packages/resolver/tests/fixtures/contract/es/contract.json @@ -43,6 +43,6 @@ } }, "auth": {}, - "timestamp": 1575880933, + "timestamp": 1575881837, "sourceType": "module" } -- Gitee From d1f74bc3be2d34507724682f4fba20270c40393b Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 17:04:37 +0800 Subject: [PATCH 8/9] update to the latest jsonql-resolver for jsonql-ws-server --- packages/ws-server/package.json | 6 +++--- packages/ws-server/src/index.js | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/ws-server/package.json b/packages/ws-server/package.json index 6a12df78..bda48b66 100755 --- a/packages/ws-server/package.json +++ b/packages/ws-server/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-ws-server", - "version": "1.4.12", + "version": "1.5.0", "description": "Setup WebSocket server for the jsonql to run on the same host, automatic generate public / private channel using contract", "main": "index.js", "files": [ @@ -34,8 +34,8 @@ "jsonql-constants": "^1.8.13", "jsonql-errors": "^1.1.10", "jsonql-jwt": "^1.3.7", - "jsonql-params-validator": "^1.5.0", - "jsonql-resolver": "^0.9.11", + "jsonql-params-validator": "^1.5.1", + "jsonql-resolver": "^1.0.2", "jsonql-utils": "^0.9.2", "lodash": "^4.17.15", "ws": "^7.2.0" diff --git a/packages/ws-server/src/index.js b/packages/ws-server/src/index.js index 142ea0b7..f68e5433 100644 --- a/packages/ws-server/src/index.js +++ b/packages/ws-server/src/index.js @@ -1,12 +1,13 @@ // re-export here const { wsSetup, wsCreateServer } = require('./core') const { checkConfig, defaultOptions, constProps } = require('./options') - +const wsServerDefaultOptions = defaultOptions +const wsServerConstProps = constProps // re-export module.exports = { // rename them - wsServerDefaultOptions: defaultOptions, - wsServerConstProps: constProps, + wsServerDefaultOptions, + wsServerConstProps, // rest of the exports checkConfig, wsSetup, -- Gitee From dd5284c448911cd34e8f249c1c025a87e5b96878 Mon Sep 17 00:00:00 2001 From: joelchu Date: Mon, 9 Dec 2019 17:06:10 +0800 Subject: [PATCH 9/9] jsonql-koa 1.5.1 --- packages/koa/keys/privateKey.pem | 26 +++++++++++++------------- packages/koa/keys/publicKey.pem | 8 ++++---- packages/koa/package.json | 4 ++-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/packages/koa/keys/privateKey.pem b/packages/koa/keys/privateKey.pem index b1424a97..a44068d3 100644 --- a/packages/koa/keys/privateKey.pem +++ b/packages/koa/keys/privateKey.pem @@ -1,15 +1,15 @@ -----BEGIN RSA PRIVATE KEY----- -MIICXAIBAAKBgQDNfs3/jSoFAMN52ArnA0o1e50UQ9A887CVF7atRng/nUYxFZzz -5XB8zD8Y7tCL7U0902pWV6IixMGqL4s2cEtJLF8xMxZN5WeknpB8UUQo3Qf17M80 -tXJfwcG2QaXQ1bJrwfpqYSIfY4pF9BFhjbE32iMD9szd76lUe8ecX9yrkwIDAQAB -AoGACmgsmI+WnDBAtg/55V8mR/UdrGQOzLduru5Hgxj5iAc4Ac5dZ4CsJLXXUDTv -/NYkvkfRr9O6U1ZxlGPaAgTH2zKXwVOVIm9hwm9vc50zxE4lGccAMbsh+/HRQMAc -UshkD85WgQfZLP8d1J1Df4yVBp6wiwdyMdhPOhhVD2yNJXkCQQDmPLU7x6nZmIQ3 -d9FmJtxSYqTwvYvUbnUTdJ4qq/QZgMljKyDdH4qlIg3y4dDTTMlUURjtjjA7modH -LmEKsiC9AkEA5H1aAIcFzysopAoCQhbvX5MyR0ZIv2hpzyTdXVB9RKbb9PYOVBhr -12k+A3220y8x/w7zcb2xIqi5peSbszkKjwJBALnftvzdE73NCKjzPYV3yBVm9/w3 -OmU1C6W6V1rh2b6hH3TFQ9Hg/gCU/qfgMMP10PAWTMa0LTJhbedEhSmqZw0CQH9T -31jV5YXaLi6jqTh9IW3oUCdp4lZP8E7P41AB75zXQ1HR4JA6f7Yt3rIBV2V+MmVJ -Rp6Gr/R5g+MPbzjDu78CQFZO5sVqHCl66OsQ4YUpSAc5MVOuF0OFy7+G0hkWhlKM -PPL67zwrPdgfTJ9K+wqikustYa56rsWpMmLWpo+FfyY= +MIICXAIBAAKBgQCrEzyQcCrKJvqEPxRFzG86m3secoRETL+GTS6nYk+hwQDmvqdd +BNifKfUNVVPUrAxdupe1PXPdEK1lx2sDI0Ij7f+qvI3iBjYmljnE3okFfjcdYzcK +Dq4CLzCc/zlCanF4jAJMBUWV7WHeVvBAHZ5Rx84usn3Gb7m0QzsKRzRVtwIDAQAB +AoGAIxSjw76sl52cm4fP4WxFltARVDIJe3P9hk3Hdl2LlNDeHXMVINcAkMrqzFwl +/6N0Obgsqea7Hqbv18In6JHPWvbe56V6tr6cBhFqCkZEhJ/khsb8vaDWttul3nww +5jciQR8Y0fdKJBeYtGZ5XjxwCpIoERZvqdWw3KhhBVjjsUECQQDcUpe6bHn6AKy1 +hyUNVZ/agLkYdxLv44ymLUi6MBZlNzvRWSg/a8A2l2XzcyAHduka3njmSVCvNOjg +LOqXM0jXAkEAxscavCMxWgwz9ZyNaPMISpkjg/aa8zM8Dq9vR7IDzql/bqMZmTxs +5GXt9LQ4ffdFlVxN1mahRbciatozic9eIQJAIchkTYiOl3/8+4SycL39WeK8/vxb +If9xNJXi/fGbrX9vo6UZH8hk27oRPugbNCnOinksbps1TPg+8QjSG8cYVwJBAJbd +ToE0BKTfViA3bWwV6FkV2Uqyw++JFy/eHos/pHwZUMpbp3YR0mOWqP9sOOQB5CH0 +KG9s/UG4OLr4WN1jMYECQCPKG9xjcKuwHKRGMZiA+xB/Fyg4dm2KJ5SjIHxXvxm+ +qP5aTse/013yeOyalzcWddQUD8IwnXptoy4EOJ6uwEM= -----END RSA PRIVATE KEY----- diff --git a/packages/koa/keys/publicKey.pem b/packages/koa/keys/publicKey.pem index 16fa9876..8a1914c3 100644 --- a/packages/koa/keys/publicKey.pem +++ b/packages/koa/keys/publicKey.pem @@ -1,6 +1,6 @@ -----BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDNfs3/jSoFAMN52ArnA0o1e50U -Q9A887CVF7atRng/nUYxFZzz5XB8zD8Y7tCL7U0902pWV6IixMGqL4s2cEtJLF8x -MxZN5WeknpB8UUQo3Qf17M80tXJfwcG2QaXQ1bJrwfpqYSIfY4pF9BFhjbE32iMD -9szd76lUe8ecX9yrkwIDAQAB +MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCrEzyQcCrKJvqEPxRFzG86m3se +coRETL+GTS6nYk+hwQDmvqddBNifKfUNVVPUrAxdupe1PXPdEK1lx2sDI0Ij7f+q +vI3iBjYmljnE3okFfjcdYzcKDq4CLzCc/zlCanF4jAJMBUWV7WHeVvBAHZ5Rx84u +sn3Gb7m0QzsKRzRVtwIDAQAB -----END PUBLIC KEY----- diff --git a/packages/koa/package.json b/packages/koa/package.json index da2e86b9..c547180b 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-koa", - "version": "1.5.0", + "version": "1.5.1", "description": "jsonql Koa middleware", "main": "main.js", "module": "index.js", @@ -88,7 +88,7 @@ }, "devDependencies": { "ava": "^2.4.0", - "jsonql-ws-server": "^1.4.11", + "jsonql-ws-server": "^1.5.0", "jwt-decode": "^2.2.0", "koa": "^2.11.0", "koa-bodyparser": "^4.2.1", -- Gitee