diff --git a/.github/workflows/on-pullrequest.yml b/.github/workflows/on-pullrequest.yml index 81638d62..306ba8ca 100644 --- a/.github/workflows/on-pullrequest.yml +++ b/.github/workflows/on-pullrequest.yml @@ -255,6 +255,7 @@ jobs: sudo -u postgres psql -U postgres -c "alter user postgres with password '${{env.POSTGRES_PASSWORD}}';" - name: Create .env file + if: matrix.tests.type != 'Unit' run: | # Create a .env file with proper settings touch .env diff --git a/Meadowlark-js/.env.example b/Meadowlark-js/.env.example index b4196a49..fb2614a7 100644 --- a/Meadowlark-js/.env.example +++ b/Meadowlark-js/.env.example @@ -1,5 +1,5 @@ -# The OAUTH_SIGNING_KEY may need quotation marks around the value, unlike other keys. -OAUTH_SIGNING_KEY="" +# OAuth 2.0 signing key: base 64 encoded, 256 bit key. To create a new one, run `npm run createKey`. +OAUTH_SIGNING_KEY= # With the exception of MONGODB_MAX_NUMBER_OF_RETRIES, do not override MongoDB settings here, # because the integration tests use an "in memory" # version of MongoDB that is configured automatically. diff --git a/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json b/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json index 17d78799..ebe7597b 100644 --- a/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json +++ b/Meadowlark-js/backends/meadowlark-elasticsearch-backend/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-elasticsearch-backend", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark backend plugin for elasticsearch", "license": "Apache-2.0", "publishConfig": { @@ -19,8 +19,8 @@ "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose" }, "dependencies": { - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@elastic/elasticsearch": "^8.10.0", "@elastic/transport": "^8.3.4" }, @@ -29,6 +29,6 @@ "copyfiles": "^2.4.1", "dotenv": "^16.3.1", "rimraf": "^5.0.5", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } } diff --git a/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json b/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json index 2fa7ce6b..ab1bbc2e 100644 --- a/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json +++ b/Meadowlark-js/backends/meadowlark-mongodb-backend/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-mongodb-backend", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark backend plugin for MongoDB", "license": "Apache-2.0", "publishConfig": { @@ -19,9 +19,9 @@ "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose" }, "dependencies": { - "@edfi/meadowlark-authz-server": "0.4.0-pre.4", - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-authz-server": "0.4.0-pre.5", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "async-retry": "^1.3.3", "mongodb": "^5.9.0", "ramda": "0.29.1" diff --git a/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json b/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json index 18b960c4..bc10f6be 100644 --- a/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json +++ b/Meadowlark-js/backends/meadowlark-opensearch-backend/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-opensearch-backend", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark backend plugin for OpenSearch", "license": "Apache-2.0", "publishConfig": { @@ -19,8 +19,8 @@ "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose" }, "dependencies": { - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@opensearch-project/opensearch": "^2.4.0" }, "devDependencies": { @@ -28,6 +28,6 @@ "copyfiles": "^2.4.1", "dotenv": "^16.3.1", "rimraf": "^5.0.5", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } } diff --git a/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json b/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json index 872fdb85..5c60622a 100644 --- a/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json +++ b/Meadowlark-js/backends/meadowlark-postgresql-backend/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-postgresql-backend", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark backend plugin for PostgreSQL", "license": "Apache-2.0", "publishConfig": { @@ -19,20 +19,20 @@ "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose" }, "dependencies": { - "@edfi/meadowlark-authz-server": "0.4.0-pre.4", - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-authz-server": "0.4.0-pre.5", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "pg": "^8.11.3", "pg-format": "^1.0.4", "ramda": "0.29.1" }, "devDependencies": { - "@testcontainers/postgresql": "^10.2.1", + "@testcontainers/postgresql": "^10.3.1", "@types/pg": "^8.10.3", "@types/pg-format": "^1.0.3", "copyfiles": "^2.4.1", "dotenv": "^16.3.1", "rimraf": "^5.0.5", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } } diff --git a/Meadowlark-js/lerna.json b/Meadowlark-js/lerna.json index 0091af26..a2c8f30c 100644 --- a/Meadowlark-js/lerna.json +++ b/Meadowlark-js/lerna.json @@ -3,7 +3,7 @@ "packages": [ "packages/*" ], - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "npmClient": "npm", "useWorkspaces": true } diff --git a/Meadowlark-js/package-lock.json b/Meadowlark-js/package-lock.json index 98345507..ba43d21f 100644 --- a/Meadowlark-js/package-lock.json +++ b/Meadowlark-js/package-lock.json @@ -52,11 +52,11 @@ }, "backends/meadowlark-elasticsearch-backend": { "name": "@edfi/meadowlark-elasticsearch-backend", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@elastic/elasticsearch": "^8.10.0", "@elastic/transport": "^8.3.4" }, @@ -65,17 +65,17 @@ "copyfiles": "^2.4.1", "dotenv": "^16.3.1", "rimraf": "^5.0.5", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } }, "backends/meadowlark-mongodb-backend": { "name": "@edfi/meadowlark-mongodb-backend", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { - "@edfi/meadowlark-authz-server": "0.4.0-pre.4", - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-authz-server": "0.4.0-pre.5", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "async-retry": "^1.3.3", "mongodb": "^5.9.0", "ramda": "0.29.1" @@ -88,11 +88,11 @@ }, "backends/meadowlark-opensearch-backend": { "name": "@edfi/meadowlark-opensearch-backend", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@opensearch-project/opensearch": "^2.4.0" }, "devDependencies": { @@ -100,29 +100,29 @@ "copyfiles": "^2.4.1", "dotenv": "^16.3.1", "rimraf": "^5.0.5", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } }, "backends/meadowlark-postgresql-backend": { "name": "@edfi/meadowlark-postgresql-backend", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { - "@edfi/meadowlark-authz-server": "0.4.0-pre.4", - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-authz-server": "0.4.0-pre.5", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "pg": "^8.11.3", "pg-format": "^1.0.4", "ramda": "0.29.1" }, "devDependencies": { - "@testcontainers/postgresql": "^10.2.1", + "@testcontainers/postgresql": "^10.3.1", "@types/pg": "^8.10.3", "@types/pg-format": "^1.0.3", "copyfiles": "^2.4.1", "dotenv": "^16.3.1", "rimraf": "^5.0.5", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } }, "node_modules/@aashutoshrathi/word-wrap": { @@ -4692,19 +4692,21 @@ } }, "node_modules/@testcontainers/mongodb": { - "version": "10.2.1", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@testcontainers/mongodb/-/mongodb-10.3.1.tgz", + "integrity": "sha512-hd7PRLAeqez56+lZlygFHalNTne++g3yfsqIFuxcjil/KLJoMGtxERyOxRZyRFwDDWkafhYE/V2m89Qn/nA8XA==", "dev": true, - "license": "MIT", "dependencies": { - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } }, "node_modules/@testcontainers/postgresql": { - "version": "10.2.1", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/@testcontainers/postgresql/-/postgresql-10.3.1.tgz", + "integrity": "sha512-WeWSJICEZgcfIoYG5wqK49wtsDZUpSMboqH037CJkmoCOjMTHxeq9LMcHuZpcSgTsTQgkV4cQdOv4dhH5kCIyw==", "dev": true, - "license": "MIT", "dependencies": { - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } }, "node_modules/@tootallnate/once": { @@ -4829,15 +4831,36 @@ } }, "node_modules/@types/chance": { - "version": "1.1.4", - "dev": true, - "license": "MIT" + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@types/chance/-/chance-1.1.6.tgz", + "integrity": "sha512-V+pm3stv1Mvz8fSKJJod6CglNGVqEQ6OyuqitoDkWywEODM/eJd1eSuIp9xt6DrX8BWZ2eDSIzbw1tPCUTvGbQ==", + "dev": true }, "node_modules/@types/cookiejar": { "version": "2.1.2", "dev": true, "license": "MIT" }, + "node_modules/@types/docker-modem": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/@types/docker-modem/-/docker-modem-3.0.6.tgz", + "integrity": "sha512-yKpAGEuKRSS8wwx0joknWxsmLha78wNMe9R2S3UNsVOkZded8UqOrV8KoeDXoXsjndxwyF3eIhyClGbO1SEhEg==", + "dev": true, + "dependencies": { + "@types/node": "*", + "@types/ssh2": "*" + } + }, + "node_modules/@types/dockerode": { + "version": "3.3.23", + "resolved": "https://registry.npmjs.org/@types/dockerode/-/dockerode-3.3.23.tgz", + "integrity": "sha512-Lz5J+NFgZS4cEVhquwjIGH4oQwlVn2h7LXD3boitujBnzOE5o7s9H8hchEjoDK2SlRsJTogdKnQeiJgPPKLIEw==", + "dev": true, + "dependencies": { + "@types/docker-modem": "*", + "@types/node": "*" + } + }, "node_modules/@types/eslint": { "version": "8.44.4", "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.44.4.tgz", @@ -4854,9 +4877,10 @@ "license": "MIT" }, "node_modules/@types/fs-extra": { - "version": "11.0.2", + "version": "11.0.4", + "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz", + "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==", "dev": true, - "license": "MIT", "dependencies": { "@types/jsonfile": "*", "@types/node": "*" @@ -5099,9 +5123,9 @@ } }, "node_modules/@types/supertest": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.14.tgz", - "integrity": "sha512-Q900DeeHNFF3ZYYepf/EyJfZDA2JrnWLaSQ0YNV7+2GTo8IlJzauEnDGhya+hauncpBYTYGpVHwGdssJeAQ7eA==", + "version": "2.0.16", + "resolved": "https://registry.npmjs.org/@types/supertest/-/supertest-2.0.16.tgz", + "integrity": "sha512-6c2ogktZ06tr2ENoZivgm7YnprnhYE4ZoXGMY+oA7IuAf17M8FWvujXZGmxLv8y0PTyts4x5A+erSwVUFA8XSg==", "dev": true, "dependencies": { "@types/superagent": "*" @@ -5732,15 +5756,16 @@ "dev": true }, "node_modules/archiver": { - "version": "5.3.1", + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/archiver/-/archiver-5.3.2.tgz", + "integrity": "sha512-+25nxyyznAXF7Nef3y0EbBeqmGZgeN/BxHX29Rs39djAfaFalmQ89SE6CWyDCHzGL0yt/ycBtNOmGTW0FyGWNw==", "dev": true, - "license": "MIT", "dependencies": { "archiver-utils": "^2.1.0", - "async": "^3.2.3", + "async": "^3.2.4", "buffer-crc32": "^0.2.1", "readable-stream": "^3.6.0", - "readdir-glob": "^1.0.0", + "readdir-glob": "^1.1.2", "tar-stream": "^2.2.0", "zip-stream": "^4.1.0" }, @@ -5750,8 +5775,9 @@ }, "node_modules/archiver-utils": { "version": "2.1.0", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz", + "integrity": "sha512-bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw==", "dev": true, - "license": "MIT", "dependencies": { "glob": "^7.1.4", "graceful-fs": "^4.2.0", @@ -5770,13 +5796,15 @@ }, "node_modules/archiver-utils/node_modules/isarray": { "version": "1.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true }, "node_modules/archiver-utils/node_modules/readable-stream": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, - "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -5789,13 +5817,15 @@ }, "node_modules/archiver-utils/node_modules/safe-buffer": { "version": "5.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/archiver-utils/node_modules/string_decoder": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -7568,9 +7598,10 @@ "license": "MIT" }, "node_modules/compress-commons": { - "version": "4.1.1", + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-4.1.2.tgz", + "integrity": "sha512-D3uMHtGc/fcO1Gt1/L7i1e33VOvD4A9hfQLP+6ewd+BvG/gQ84Yh4oftEhAdjSMgBgwGL+jsppT7JYNpo6MHHg==", "dev": true, - "license": "MIT", "dependencies": { "buffer-crc32": "^0.2.13", "crc32-stream": "^4.0.2", @@ -7993,8 +8024,9 @@ }, "node_modules/crc-32": { "version": "1.2.2", + "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", + "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", "dev": true, - "license": "Apache-2.0", "bin": { "crc32": "bin/crc32.njs" }, @@ -8003,9 +8035,10 @@ } }, "node_modules/crc32-stream": { - "version": "4.0.2", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-4.0.3.tgz", + "integrity": "sha512-NT7w2JVU7DFroFdYkeq8cywxrgjPHWkdX1wjpRQXPX5Asews3tA+Ght6lddQO5Mkumffp3X7GEqku3epj2toIw==", "dev": true, - "license": "MIT", "dependencies": { "crc-32": "^1.2.0", "readable-stream": "^3.4.0" @@ -13553,8 +13586,9 @@ }, "node_modules/lazystream": { "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", + "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", "dev": true, - "license": "MIT", "dependencies": { "readable-stream": "^2.0.5" }, @@ -13564,13 +13598,15 @@ }, "node_modules/lazystream/node_modules/isarray": { "version": "1.0.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", + "dev": true }, "node_modules/lazystream/node_modules/readable-stream": { "version": "2.3.8", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", + "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, - "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", "inherits": "~2.0.3", @@ -13583,13 +13619,15 @@ }, "node_modules/lazystream/node_modules/safe-buffer": { "version": "5.1.2", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/lazystream/node_modules/string_decoder": { "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, - "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" } @@ -14457,13 +14495,15 @@ }, "node_modules/lodash.defaults": { "version": "4.2.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz", + "integrity": "sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==", + "dev": true }, "node_modules/lodash.difference": { "version": "4.5.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz", + "integrity": "sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==", + "dev": true }, "node_modules/lodash.flatten": { "version": "4.4.0", @@ -14478,8 +14518,9 @@ }, "node_modules/lodash.isplainobject": { "version": "4.0.6", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", + "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", + "dev": true }, "node_modules/lodash.memoize": { "version": "4.1.2", @@ -14493,8 +14534,9 @@ }, "node_modules/lodash.union": { "version": "4.6.0", - "dev": true, - "license": "MIT" + "resolved": "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz", + "integrity": "sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==", + "dev": true }, "node_modules/log-symbols": { "version": "4.1.0", @@ -18351,14 +18393,19 @@ } }, "node_modules/properties-reader": { - "version": "2.2.0", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/properties-reader/-/properties-reader-2.3.0.tgz", + "integrity": "sha512-z597WicA7nDZxK12kZqHr2TcvwNU1GCfA5UwfDY/HDp3hXPoPlb5rlEx9bwGTiJnc0OqbBTkU975jDToth8Gxw==", "dev": true, - "license": "MIT", "dependencies": { "mkdirp": "^1.0.4" }, "engines": { - "node": ">=10" + "node": ">=14" + }, + "funding": { + "type": "github", + "url": "https://github.com/steveukx/properties?sponsor=1" } }, "node_modules/proto-list": { @@ -19020,25 +19067,28 @@ } }, "node_modules/readdir-glob": { - "version": "1.1.2", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", + "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", "dev": true, - "license": "Apache-2.0", "dependencies": { "minimatch": "^5.1.0" } }, "node_modules/readdir-glob/node_modules/brace-expansion": { "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", "dev": true, - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, "node_modules/readdir-glob/node_modules/minimatch": { "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", "dev": true, - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -21010,26 +21060,48 @@ } }, "node_modules/testcontainers": { - "version": "10.2.1", + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/testcontainers/-/testcontainers-10.3.1.tgz", + "integrity": "sha512-w7WgoAD8p2Hd5gE6CluWd3EBg7qb6u/JcKJGl0TTs/Cdq326Fsfw1ARnHjk4UzYEsp3XZ5YtvgY7bl5E3iudfw==", "dev": true, - "license": "MIT", "dependencies": { "@balena/dockerignore": "^1.0.2", - "archiver": "^5.3.1", + "@types/dockerode": "^3.3.21", + "archiver": "^5.3.2", "async-lock": "^1.4.0", "byline": "^5.0.0", "debug": "^4.3.4", "docker-compose": "^0.24.2", "dockerode": "^3.3.5", "get-port": "^5.1.1", - "node-fetch": "^2.6.12", + "node-fetch": "^2.7.0", "proper-lockfile": "^4.1.2", - "properties-reader": "^2.2.0", + "properties-reader": "^2.3.0", "ssh-remote-port-forward": "^1.0.4", "tar-fs": "^3.0.4", "tmp": "^0.2.1" } }, + "node_modules/testcontainers/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", + "dev": true, + "dependencies": { + "whatwg-url": "^5.0.0" + }, + "engines": { + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { + "encoding": "^0.1.0" + }, + "peerDependenciesMeta": { + "encoding": { + "optional": true + } + } + }, "node_modules/testcontainers/node_modules/rimraf": { "version": "3.0.2", "dev": true, @@ -21055,6 +21127,28 @@ "node": ">=8.17.0" } }, + "node_modules/testcontainers/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "dev": true + }, + "node_modules/testcontainers/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true + }, + "node_modules/testcontainers/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/text-extensions": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz", @@ -22526,25 +22620,67 @@ } }, "node_modules/zip-stream": { - "version": "4.1.0", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-4.1.1.tgz", + "integrity": "sha512-9qv4rlDiopXg4E69k+vMHjNN63YFMe9sZMrdlvKnCjlCRWeCBswPPMPUfx+ipsAWq1LXHe70RcbaHdJJpS6hyQ==", "dev": true, - "license": "MIT", "dependencies": { - "archiver-utils": "^2.1.0", - "compress-commons": "^4.1.0", + "archiver-utils": "^3.0.4", + "compress-commons": "^4.1.2", + "readable-stream": "^3.6.0" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/zip-stream/node_modules/archiver-utils": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-3.0.4.tgz", + "integrity": "sha512-KVgf4XQVrTjhyWmx6cte4RxonPLR9onExufI1jhvw/MQ4BB6IsZD5gT8Lq+u/+pRkWna/6JoHpiQioaqFP5Rzw==", + "dev": true, + "dependencies": { + "glob": "^7.2.3", + "graceful-fs": "^4.2.0", + "lazystream": "^1.0.0", + "lodash.defaults": "^4.2.0", + "lodash.difference": "^4.5.0", + "lodash.flatten": "^4.4.0", + "lodash.isplainobject": "^4.0.6", + "lodash.union": "^4.6.0", + "normalize-path": "^3.0.0", "readable-stream": "^3.6.0" }, "engines": { "node": ">= 10" } }, + "node_modules/zip-stream/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "packages/meadowlark-authz-server": { "name": "@edfi/meadowlark-authz-server", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { "@apideck/better-ajv-errors": "^0.3.6", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "ajv": "^8.12.0", "dotenv": "^16.3.1", "fast-memoize": "^2.5.2", @@ -22593,11 +22729,11 @@ }, "packages/meadowlark-core": { "name": "@edfi/meadowlark-core", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { "@apideck/better-ajv-errors": "^0.3.6", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@isaacs/ttlcache": "^1.4.1", "ajv": "^8.12.0", "ajv-formats": "^2.1.1", @@ -22686,7 +22822,7 @@ }, "packages/meadowlark-utilities": { "name": "@edfi/meadowlark-utilities", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { "pino": "^8.15.4", @@ -22733,12 +22869,12 @@ }, "services/meadowlark-fastify": { "name": "@edfi/meadowlark-fastify", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "dependencies": { - "@edfi/meadowlark-authz-server": "0.4.0-pre.4", - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-authz-server": "0.4.0-pre.5", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@fastify/rate-limit": "^6.0.1", "dotenv": "^16.3.1", "fastify": "^3.29.5" @@ -22751,21 +22887,21 @@ }, "tests/e2e": { "name": "@edfi/meadowlark-e2e-tests", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "license": "Apache-2.0", "devDependencies": { - "@edfi/meadowlark-utilities": "0.4.0-pre.4", - "@testcontainers/mongodb": "^10.2.1", - "@testcontainers/postgresql": "^10.2.1", - "@types/chance": "^1.1.4", - "@types/fs-extra": "^11.0.2", - "@types/supertest": "^2.0.14", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", + "@testcontainers/mongodb": "^10.3.1", + "@testcontainers/postgresql": "^10.3.1", + "@types/chance": "^1.1.6", + "@types/fs-extra": "^11.0.4", + "@types/supertest": "^2.0.16", "chance": "^1.1.11", "dotenv": "^16.3.1", "fast-memoize": "^2.5.2", "fs-extra": "^11.1.1", "supertest": "^6.3.3", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" } }, "tests/e2e/node_modules/fs-extra": { diff --git a/Meadowlark-js/package.json b/Meadowlark-js/package.json index 895379ca..2fce85d0 100644 --- a/Meadowlark-js/package.json +++ b/Meadowlark-js/package.json @@ -86,6 +86,7 @@ "compose:down": "docker compose --env-file .env-docker down", "compose:down:wsl1": "docker.exe compose --env-file .env-docker down", "compose:rm": "docker compose rm --stop --volumes --force && docker volume rm mongo-ml-local-auth && docker volume ls -q --filter label=edfi-ml | xargs docker volume rm", - "compose:rm:wsl1": "docker.exe compose rm --stop --volumes --force && docker.exe volume rm mongo-ml-local-auth && docker.exe volume ls -q --filter label=edfi-ml | xargs docker.exe volume rm" + "compose:rm:wsl1": "docker.exe compose rm --stop --volumes --force && docker.exe volume rm mongo-ml-local-auth && docker.exe volume ls -q --filter label=edfi-ml | xargs docker.exe volume rm", + "createKey": "openssl rand -base64 256" } } diff --git a/Meadowlark-js/packages/meadowlark-authz-server/package.json b/Meadowlark-js/packages/meadowlark-authz-server/package.json index d0f8ed17..4b127eac 100644 --- a/Meadowlark-js/packages/meadowlark-authz-server/package.json +++ b/Meadowlark-js/packages/meadowlark-authz-server/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-authz-server", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark authorization server", "license": "Apache-2.0", "publishConfig": { @@ -14,7 +14,7 @@ ], "dependencies": { "@apideck/better-ajv-errors": "^0.3.6", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "ajv": "^8.12.0", "dotenv": "^16.3.1", "fast-memoize": "^2.5.2", diff --git a/Meadowlark-js/packages/meadowlark-authz-server/src/handler/AuthorizationResponse.ts b/Meadowlark-js/packages/meadowlark-authz-server/src/handler/AuthorizationResponse.ts index c0310bef..74dad915 100644 --- a/Meadowlark-js/packages/meadowlark-authz-server/src/handler/AuthorizationResponse.ts +++ b/Meadowlark-js/packages/meadowlark-authz-server/src/handler/AuthorizationResponse.ts @@ -6,7 +6,6 @@ import { GetAllClientsResponseBody, GetClientResponseBody } from '../model/GetClientResponseBody'; import { ResetClientSecretResponseBody } from '../model/ResetClientSecretResponseBody'; import { TokenErrorResponse, TokenSuccessResponse, VerificationResponse } from '../model/TokenResponse'; -import { SigningKeyResponse } from './CreateSigningKey'; export interface AuthorizationResponse { statusCode: number; @@ -18,7 +17,6 @@ export interface AuthorizationResponse { | ResetClientSecretResponseBody | GetClientResponseBody | GetAllClientsResponseBody - | SigningKeyResponse | undefined; } diff --git a/Meadowlark-js/packages/meadowlark-authz-server/src/handler/CreateSigningKey.ts b/Meadowlark-js/packages/meadowlark-authz-server/src/handler/CreateSigningKey.ts deleted file mode 100644 index c2d9b40f..00000000 --- a/Meadowlark-js/packages/meadowlark-authz-server/src/handler/CreateSigningKey.ts +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-License-Identifier: Apache-2.0 -// Licensed to the Ed-Fi Alliance under one or more agreements. -// The Ed-Fi Alliance licenses this file to you under the Apache License, Version 2.0. -// See the LICENSE and NOTICES files in the project root for more information. -import crypto from 'node:crypto'; -import { AuthorizationRequest } from './AuthorizationRequest'; -import { AuthorizationResponse } from './AuthorizationResponse'; -import { writeRequestToLog } from '../Logger'; - -const moduleName = 'authz.handler.CreateSigningKey'; - -export type SigningKeyResponse = { - key: string; -}; - -/** - * Handler for client creation - */ -export async function createSigningKey(authorizationRequest: AuthorizationRequest): Promise { - writeRequestToLog(moduleName, authorizationRequest, 'createSigningKey'); - return { - body: { key: crypto.randomBytes(256).toString('base64') }, - statusCode: 201, - }; -} diff --git a/Meadowlark-js/packages/meadowlark-authz-server/src/index.ts b/Meadowlark-js/packages/meadowlark-authz-server/src/index.ts index f9a86199..aefe372b 100644 --- a/Meadowlark-js/packages/meadowlark-authz-server/src/index.ts +++ b/Meadowlark-js/packages/meadowlark-authz-server/src/index.ts @@ -9,7 +9,6 @@ export { updateClient } from './handler/UpdateClient'; export { requestToken } from './handler/RequestToken'; export { verifyToken } from './handler/VerifyToken'; export { resetAuthorizationClientSecret } from './handler/ResetClientSecret'; -export { createSigningKey } from './handler/CreateSigningKey'; export { AuthorizationRequest, newAuthorizationRequest } from './handler/AuthorizationRequest'; export { AuthorizationResponse } from './handler/AuthorizationResponse'; export { AuthorizationStorePlugin } from './plugin/AuthorizationStorePlugin'; diff --git a/Meadowlark-js/packages/meadowlark-core/package.json b/Meadowlark-js/packages/meadowlark-core/package.json index 03d2ec2a..e29b0bec 100644 --- a/Meadowlark-js/packages/meadowlark-core/package.json +++ b/Meadowlark-js/packages/meadowlark-core/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-core", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark core functionality", "license": "Apache-2.0", "publishConfig": { @@ -14,7 +14,7 @@ ], "dependencies": { "@apideck/better-ajv-errors": "^0.3.6", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@isaacs/ttlcache": "^1.4.1", "ajv": "^8.12.0", "ajv-formats": "^2.1.1", diff --git a/Meadowlark-js/packages/meadowlark-utilities/package.json b/Meadowlark-js/packages/meadowlark-utilities/package.json index cf6cde93..4a715969 100644 --- a/Meadowlark-js/packages/meadowlark-utilities/package.json +++ b/Meadowlark-js/packages/meadowlark-utilities/package.json @@ -1,7 +1,7 @@ { "name": "@edfi/meadowlark-utilities", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark shared utilities", "license": "Apache-2.0", "publishConfig": { diff --git a/Meadowlark-js/services/meadowlark-fastify/.env.example b/Meadowlark-js/services/meadowlark-fastify/.env.example index 2ef6dea0..a55626c1 100644 --- a/Meadowlark-js/services/meadowlark-fastify/.env.example +++ b/Meadowlark-js/services/meadowlark-fastify/.env.example @@ -1,7 +1,6 @@ #### Environment variables for security -# OAuth 2.0 signing key: base 64 encoded, 256 bit key. To create a new one, -# try running the application and accessing endpoint /{stage}/createSigningKey or run `openssl rand -base64 256`. +# OAuth 2.0 signing key: base 64 encoded, 256 bit key. To create a new one, run `npm run createKey`. OAUTH_SIGNING_KEY= OWN_OAUTH_CLIENT_ID_FOR_CLIENT_AUTH=meadowlark_verify-only_key_1 OWN_OAUTH_CLIENT_SECRET_FOR_CLIENT_AUTH=meadowlark_verify-only_secret_1 diff --git a/Meadowlark-js/services/meadowlark-fastify/package.json b/Meadowlark-js/services/meadowlark-fastify/package.json index ec5b1d9c..9258bea5 100644 --- a/Meadowlark-js/services/meadowlark-fastify/package.json +++ b/Meadowlark-js/services/meadowlark-fastify/package.json @@ -1,6 +1,6 @@ { "name": "@edfi/meadowlark-fastify", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark service using Fastify", "license": "Apache-2.0", "publishConfig": { @@ -12,9 +12,9 @@ "/package.json" ], "dependencies": { - "@edfi/meadowlark-authz-server": "0.4.0-pre.4", - "@edfi/meadowlark-core": "0.4.0-pre.4", - "@edfi/meadowlark-utilities": "0.4.0-pre.4", + "@edfi/meadowlark-authz-server": "0.4.0-pre.5", + "@edfi/meadowlark-core": "0.4.0-pre.5", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", "@fastify/rate-limit": "^6.0.1", "dotenv": "^16.3.1", "fastify": "^3.29.5" @@ -31,7 +31,6 @@ "build:copy-non-ts": "copyfiles -u 1 -e \"**/*.ts\" \"src/**/*\" dist --verbose", "start:local": "node --require=dotenv/config dist/index.js", "start:local:ts": "ts-node --require=dotenv/config src/index.ts", - "createKey": "openssl rand -base64 256", "clinic:flame": "clinic flame -- node dist/index.js", "clinic:doctor": "clinic doctor -- node dist/index.js", "clinic:heapprofiler": "clinic heapprofiler -- node dist/index.js" diff --git a/Meadowlark-js/services/meadowlark-fastify/src/Service.ts b/Meadowlark-js/services/meadowlark-fastify/src/Service.ts index 82452431..f0491253 100644 --- a/Meadowlark-js/services/meadowlark-fastify/src/Service.ts +++ b/Meadowlark-js/services/meadowlark-fastify/src/Service.ts @@ -29,7 +29,6 @@ import { resetAuthorizationClientSecretHandler, updateAuthorizationClientHandler, verifyTokenAuthorizationHandler, - createSigningKeyHandler, getClientByIdHandler, getClientsHandler, } from './handler/authorization/AuthorizationHandler'; @@ -142,6 +141,5 @@ export function buildService(): FastifyInstance { fastify.post(`/${stage}/oauth/token/`, requestTokenAuthorizationHandler); fastify.post(`/${stage}/oauth/verify`, verifyTokenAuthorizationHandler); fastify.post(`/${stage}/oauth/verify/`, verifyTokenAuthorizationHandler); - fastify.get(`/${stage}/oauth/createSigningKey`, createSigningKeyHandler); } } diff --git a/Meadowlark-js/services/meadowlark-fastify/src/handler/authorization/AuthorizationHandler.ts b/Meadowlark-js/services/meadowlark-fastify/src/handler/authorization/AuthorizationHandler.ts index dc418e1c..e4fa3beb 100644 --- a/Meadowlark-js/services/meadowlark-fastify/src/handler/authorization/AuthorizationHandler.ts +++ b/Meadowlark-js/services/meadowlark-fastify/src/handler/authorization/AuthorizationHandler.ts @@ -5,7 +5,6 @@ import { createClient, - createSigningKey, getClientById, getClients, requestToken, @@ -36,10 +35,6 @@ export async function resetAuthorizationClientSecretHandler(request: FastifyRequ respondWith(await resetAuthorizationClientSecret(fromRequest(request)), reply); } -export async function createSigningKeyHandler(request: FastifyRequest, reply: FastifyReply): Promise { - respondWith(await createSigningKey(fromRequest(request)), reply); -} - export async function getClientByIdHandler(request: FastifyRequest, reply: FastifyReply): Promise { respondWith(await getClientById(fromRequest(request)), reply); } diff --git a/Meadowlark-js/tests/e2e/package.json b/Meadowlark-js/tests/e2e/package.json index 54e6dffb..930dc533 100644 --- a/Meadowlark-js/tests/e2e/package.json +++ b/Meadowlark-js/tests/e2e/package.json @@ -1,24 +1,24 @@ { "name": "@edfi/meadowlark-e2e-tests", "main": "dist/index.js", - "version": "0.4.0-pre.4", + "version": "0.4.0-pre.5", "description": "Meadowlark Ed-Fi API end to end tests", "license": "Apache-2.0", "private": true, "files": [], "devDependencies": { - "@edfi/meadowlark-utilities": "0.4.0-pre.4", - "@testcontainers/mongodb": "^10.2.1", - "@testcontainers/postgresql": "^10.2.1", - "@types/chance": "^1.1.4", - "@types/fs-extra": "^11.0.2", - "@types/supertest": "^2.0.14", + "@edfi/meadowlark-utilities": "0.4.0-pre.5", + "@testcontainers/mongodb": "^10.3.1", + "@testcontainers/postgresql": "^10.3.1", + "@types/chance": "^1.1.6", + "@types/fs-extra": "^11.0.4", + "@types/supertest": "^2.0.16", "chance": "^1.1.11", "dotenv": "^16.3.1", "fast-memoize": "^2.5.2", "fs-extra": "^11.1.1", "supertest": "^6.3.3", - "testcontainers": "^10.2.1" + "testcontainers": "^10.3.1" }, "scripts": { "build": "npm run build:clean",