diff --git a/packages/@jsonql/koa/package.json b/packages/@jsonql/koa/package.json index 6b7eeb929498c5eabf16f98bf28e323efa698155..52f22d1d3dbfd46299aa20fc0cae8ee05d4944b9 100644 --- a/packages/@jsonql/koa/package.json +++ b/packages/@jsonql/koa/package.json @@ -53,7 +53,7 @@ "debug": "^4.1.1", "fs-extra": "^8.1.0", "jsonql-constants": "^1.8.10", - "jsonql-koa": "^1.4.5", + "jsonql-koa": "^1.4.6", "jsonql-params-validator": "^1.4.11", "koa": "^2.11.0", "koa-bodyparser": "^4.2.1", diff --git a/packages/@jsonql/koa/tests/fixtures/keys/privateKey.pem b/packages/@jsonql/koa/tests/fixtures/keys/privateKey.pem deleted file mode 100644 index 49e03d8f211d0f227ab05bba2ec7e56350b7a663..0000000000000000000000000000000000000000 --- a/packages/@jsonql/koa/tests/fixtures/keys/privateKey.pem +++ /dev/null @@ -1,15 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIICXQIBAAKBgQDGAgRsj3oaUjHGoAU/9mbRwMxfH6aLD3xr+WRtZ0twYEy5gzcx -rAvgFooLCJSditTp+KeAnibb443X90dGd/Y+Frb4eMwvQBfsDT682EdkHdiM+wtQ -Y4/f7v5lUKWelhCJ6HhdKrsRtrK7dsxmC1+jGYMxEqiiwwvtoSjmdzgHVwIDAQAB -AoGBAKAsy5ViLz0RlpB9rCGE2sH8+5ZLjTbazSSvNu1FbQI39HjxS3nUGjspIHwy -cb5Lq1alviJOTVL9biXxM+gubLN5BzA6xtt7+r7xh4x2LnM0kR47I7WiL0dboHGY -KhgZWAg/ryUVEtSx3RsOg30hABw43t8hS23IO99L2YXQ/KOxAkEA+bnHAlxWZyfp -D9exZ7RhgNZ0slTy/0+tbP6z2KFso17RIeyUVsUx4Uc1vozGaQmeEZAKXxVMNn3b -qPxskpLnLwJBAMr7l/gTbBG/XdLQlCFpNcZMQcMqr/mBWFtIQnws7gYRG4MJhfeQ -U0mWg4PJG0/4OnZJtm91HTaW0AiAOBzK2FkCQG/EqkFwOmuo/TLOAuS7YvhbA5fd -VXTXoHMr/Cp09T6ZbViVnj7Hu29sg61pLFROraSGp12vFpE8+1dCwwVHIpkCQD6h -BFHBxF1xe0R5oMrySGpHyx6pxCQq2ZVIpWLlBggPLTrwLEqnWFtjOm7mFSxGfdtT -gRvAuePHAqcs0KNpnvkCQQCkOFLl6pHK4JUr2jWSH2Mk4CFUmY2LUQUZuII9XCGy -z3lh17zp4cmg2JYvA6YtBzE7oDdlU7HAnxSUf6AC0UbK ------END RSA PRIVATE KEY----- diff --git a/packages/@jsonql/koa/tests/fixtures/keys/publicKey.pem b/packages/@jsonql/koa/tests/fixtures/keys/publicKey.pem deleted file mode 100644 index ae7b97b2c789470e011a49f86c73ca7d564e88e7..0000000000000000000000000000000000000000 --- a/packages/@jsonql/koa/tests/fixtures/keys/publicKey.pem +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDGAgRsj3oaUjHGoAU/9mbRwMxf -H6aLD3xr+WRtZ0twYEy5gzcxrAvgFooLCJSditTp+KeAnibb443X90dGd/Y+Frb4 -eMwvQBfsDT682EdkHdiM+wtQY4/f7v5lUKWelhCJ6HhdKrsRtrK7dsxmC1+jGYMx -EqiiwwvtoSjmdzgHVwIDAQAB ------END PUBLIC KEY----- diff --git a/packages/koa/package.json b/packages/koa/package.json index 01b45c5707d432047a9c918cc41cd89234043674..5ff8c1d50a33f312d2ed458ddae9dc6256de14a4 100644 --- a/packages/koa/package.json +++ b/packages/koa/package.json @@ -1,6 +1,6 @@ { "name": "jsonql-koa", - "version": "1.4.6", + "version": "1.4.7", "description": "jsonql Koa middleware", "main": "main.js", "module": "index.js", diff --git a/packages/koa/src/options/process-jwt-keys.js b/packages/koa/src/options/process-jwt-keys.js index 3be63d4568f6bc0085333c7f1bea356b059a4fc9..a610011942baa4f62e6c9c06c6fcf79f16ca613c 100644 --- a/packages/koa/src/options/process-jwt-keys.js +++ b/packages/koa/src/options/process-jwt-keys.js @@ -34,7 +34,6 @@ const getKeysFromCache = (ctx, config) => { return _.extend(config, { publicKey, privateKey }) } } - // debug('getter', getter) } return false; } @@ -51,9 +50,12 @@ const getCreatedKeys = (ctx, config) => { return config[jwtProcessKey] .then( result => _.extend( config, _.mapValues(result, value => fsx.readFileSync(value) ) ) ) .then(keys => { - _.forEach(keys, (value, key) => { - setter(key, value) - }) + // have to make sure the setter is presented + if (typeof setter === 'function') { + _.forEach(keys, (value, key) => { + setter(key, value) + }) + } return keys; }) } diff --git a/packages/koa/tests/config.test.js b/packages/koa/tests/config.test.js index 1f5dfc4854cbde8bfaa3d4d8dd105d5af254e359..77f8a61dbd5d328f0470ff5338c566ab1872a876 100644 --- a/packages/koa/tests/config.test.js +++ b/packages/koa/tests/config.test.js @@ -28,6 +28,7 @@ let ctx = { } test.after( t => { + fsx.removeSync(contractDir) fsx.removeSync(keysDir) })