From 033ecd48a7ae1593b74f9baed995c461473b6a03 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Aug 2021 17:14:30 +0000 Subject: [PATCH 1/3] Bump apollo-server-lambda from 2.21.0 to 3.1.2 in /services/app-api Bumps [apollo-server-lambda](https://github.com/apollographql/apollo-server/tree/HEAD/packages/apollo-server-lambda) from 2.21.0 to 3.1.2. - [Release notes](https://github.com/apollographql/apollo-server/releases) - [Changelog](https://github.com/apollographql/apollo-server/blob/main/CHANGELOG.md) - [Commits](https://github.com/apollographql/apollo-server/commits/apollo-server-lambda@3.1.2/packages/apollo-server-lambda) --- updated-dependencies: - dependency-name: apollo-server-lambda dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- services/app-api/package.json | 2 +- services/app-api/yarn.lock | 589 ++++++++++++++++++++++++++++------ 2 files changed, 490 insertions(+), 101 deletions(-) diff --git a/services/app-api/package.json b/services/app-api/package.json index f62a2b166e..65fc1b2739 100644 --- a/services/app-api/package.json +++ b/services/app-api/package.json @@ -14,7 +14,7 @@ "@types/aws-lambda": "^8.10.71", "@types/request": "^2.48.7", "@types/uuid": "^8.3.1", - "apollo-server-lambda": "^2.21.0", + "apollo-server-lambda": "^3.1.2", "apollo-server-testing": "^2.25.2", "aws-sdk": "^2.966.0", "eslint-config-prettier": "^7.2.0", diff --git a/services/app-api/yarn.lock b/services/app-api/yarn.lock index 0fdc755a44..d5ccab9e60 100644 --- a/services/app-api/yarn.lock +++ b/services/app-api/yarn.lock @@ -29,37 +29,11 @@ "@types/node" "^10.1.0" long "^4.0.0" -"@apollo/protobufjs@^1.0.3": - version "1.0.5" - resolved "https://registry.yarnpkg.com/@apollo/protobufjs/-/protobufjs-1.0.5.tgz#a78b726147efc0795e74c8cb8a11aafc6e02f773" - integrity sha512-ZtyaBH1icCgqwIGb3zrtopV2D5Q8yxibkJzlaViM08eOhTQc7rACdYu0pfORFfhllvdMZ3aq69vifYHszY4gNA== - dependencies: - "@protobufjs/aspromise" "^1.1.2" - "@protobufjs/base64" "^1.1.2" - "@protobufjs/codegen" "^2.0.4" - "@protobufjs/eventemitter" "^1.1.0" - "@protobufjs/fetch" "^1.1.0" - "@protobufjs/float" "^1.0.2" - "@protobufjs/inquire" "^1.1.0" - "@protobufjs/path" "^1.1.2" - "@protobufjs/pool" "^1.1.0" - "@protobufjs/utf8" "^1.1.0" - "@types/long" "^4.0.0" - "@types/node" "^10.1.0" - long "^4.0.0" - -"@apollographql/apollo-tools@^0.5.0": +"@apollographql/apollo-tools@^0.5.0", "@apollographql/apollo-tools@^0.5.1": version "0.5.1" resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.1.tgz#f0baef739ff7e2fafcb8b98ad29f6ac817e53e32" integrity sha512-ZII+/xUFfb9ezDU2gad114+zScxVFMVlZ91f8fGApMzlS1kkqoyLnC4AJaQ1Ya/X+b63I20B4Gd+eCL8QuB4sA== -"@apollographql/graphql-playground-html@1.6.26": - version "1.6.26" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.26.tgz#2f7b610392e2a872722912fc342b43cf8d641cb3" - integrity sha512-XAwXOIab51QyhBxnxySdK3nuMEUohhDsHQ5Rbco/V1vjlP75zZ0ZLHD9dTpXTN8uxKxopb2lUvJTq+M4g2Q0HQ== - dependencies: - xss "^1.0.6" - "@apollographql/graphql-playground-html@1.6.27": version "1.6.27" resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#bc9ab60e9445aa2a8813b4e94f152fa72b756335" @@ -67,6 +41,13 @@ dependencies: xss "^1.0.8" +"@apollographql/graphql-playground-html@1.6.29": + version "1.6.29" + resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" + integrity sha512-xCcXpoz52rI4ksJSdOCxeOCn2DLocxwHf9dVT/Q90Pte1LX+LY+91SFtJF3KXVHH8kEin+g1KKCQPKBjZJfWNA== + dependencies: + xss "^1.0.8" + "@apollographql/graphql-upload-8-fork@^8.1.3": version "8.1.3" resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc" @@ -1111,6 +1092,41 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" +"@graphql-tools/merge@8.0.1": + version "8.0.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/merge/-/merge-8.0.1.tgz#4cb94998e7c61abc6ebec54edca5c19f06c3330d" + integrity sha512-YAozogbjC2Oun+UcwG0LZFumhlCiHBmqe68OIf7bqtBdp4pbPAiVuK/J9oJqRVJmzvUqugo6RD9zz1qDTKZaiQ== + dependencies: + "@graphql-tools/utils" "8.1.1" + tslib "~2.3.0" + +"@graphql-tools/mock@^8.1.2": + version "8.2.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/mock/-/mock-8.2.1.tgz#a08d7facb323b19d6b5aaab0c87787cce6f27d56" + integrity sha512-/DyU742thZ3wSR8NxbzeV2K5sxtfPcnRJDuaN+WuHDOE1X1lsFiS49J0TouEnZCfLuAmhSjUMT/2GbD0xu6ggw== + dependencies: + "@graphql-tools/schema" "^8.1.1" + "@graphql-tools/utils" "8.1.1" + fast-json-stable-stringify "^2.1.0" + tslib "~2.3.0" + +"@graphql-tools/schema@^8.0.0", "@graphql-tools/schema@^8.1.1": + version "8.1.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/schema/-/schema-8.1.1.tgz#5de95a8f6cedaf91fa2f9e9e7fa9fae1d27a7c4f" + integrity sha512-u+0kxPtuP+GcKnGNt459Ob7iIpzesIJeJTmPPailaG7ZhB5hkXIizl4uHrzEIAh2Ja1P/VA8sEBYpu1N0n6Mmg== + dependencies: + "@graphql-tools/merge" "8.0.1" + "@graphql-tools/utils" "8.1.1" + tslib "~2.3.0" + value-or-promise "1.0.10" + +"@graphql-tools/utils@8.1.1", "@graphql-tools/utils@^8.0.0": + version "8.1.1" + resolved "https://registry.yarnpkg.com/@graphql-tools/utils/-/utils-8.1.1.tgz#2ef056a1d6e1e909085e1115d3bb48f890c2a2b6" + integrity sha512-QbFNoBmBiZ+ej4y6mOv8Ba4lNhcrTEKXAhZ0f74AhdEXi7b9xbGUH/slO5JaSyp85sGQYIPmxjRPpXBjLklbmw== + dependencies: + tslib "~2.3.0" + "@hapi/accept@^3.2.4": version "3.2.4" resolved "https://registry.yarnpkg.com/@hapi/accept/-/accept-3.2.4.tgz#687510529493fe1d7d47954c31aff360d9364bd1" @@ -1982,22 +1998,17 @@ resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== -"@types/accepts@*": +"@types/accepts@*", "@types/accepts@^1.3.5": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== dependencies: "@types/node" "*" -"@types/aws-lambda@^8.10.31": - version "8.10.72" - resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.72.tgz#af2a6eeaf39be9674e3856f1870d9d15cf75e2e0" - integrity sha512-jOrTwAhSiUtBIN/QsWNKlI4+4aDtpZ0sr2BRvKW6XQZdspgHUSHPcuzxbzCRiHUiDQ+0026u5TSE38VyIhNnfA== - -"@types/aws-lambda@^8.10.71": - version "8.10.71" - resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.71.tgz#ab3084038411ce42f63b975e67aafb163f3aa353" - integrity sha512-l0Lag6qq06AlKllprAJ3pbgVUbXCjRGRb7VpHow8IMn2BMHTPR0t5OD97/w8CR1+wA5XZuWQoXLjYvdlk2kQrQ== +"@types/aws-lambda@^8.10.71", "@types/aws-lambda@^8.10.76": + version "8.10.82" + resolved "https://registry.yarnpkg.com/@types/aws-lambda/-/aws-lambda-8.10.82.tgz#336062d3270f52d2156eeb7d9e497fd63684572a" + integrity sha512-sJo8pz8hu+OzLRAj7Do2g66zYLizWtB3kGK6K45RWmGW+S54XXMoK3sNbvzKXfndBxYiSVExHoCNiSlt2gPmxw== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": version "7.1.14" @@ -2040,6 +2051,14 @@ "@types/connect" "*" "@types/node" "*" +"@types/body-parser@1.19.1": + version "1.19.1" + resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c" + integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg== + dependencies: + "@types/connect" "*" + "@types/node" "*" + "@types/cacheable-request@^6.0.1": version "6.0.2" resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9" @@ -2077,6 +2096,20 @@ "@types/keygrip" "*" "@types/node" "*" +"@types/cors@2.8.12": + version "2.8.12" + resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" + integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw== + +"@types/express-serve-static-core@4.17.24": + version "4.17.24" + resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07" + integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA== + dependencies: + "@types/node" "*" + "@types/qs" "*" + "@types/range-parser" "*" + "@types/express-serve-static-core@^4.17.18": version "4.17.18" resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.18.tgz#8371e260f40e0e1ca0c116a9afcd9426fa094c40" @@ -2096,6 +2129,16 @@ "@types/qs" "*" "@types/serve-static" "*" +"@types/express@4.17.13": + version "4.17.13" + resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" + integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA== + dependencies: + "@types/body-parser" "*" + "@types/express-serve-static-core" "^4.17.18" + "@types/qs" "*" + "@types/serve-static" "*" + "@types/fs-capacitor@*": version "2.0.0" resolved "https://registry.yarnpkg.com/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e" @@ -2436,6 +2479,11 @@ "@typescript-eslint/types" "4.29.1" eslint-visitor-keys "^2.0.0" +"@vendia/serverless-express@^4.3.9": + version "4.3.9" + resolved "https://registry.yarnpkg.com/@vendia/serverless-express/-/serverless-express-4.3.9.tgz#0ed1deb79ad177bf0e97fcdd31f99a5db9e532fa" + integrity sha512-lfnnnJ/J9rpa4tDqkPzDMmJr+c489YI81i7P9JWZyf3zAKowaF0t1SeR3g9zUJYmTOn9glmqjiaG+OvNvxY7UQ== + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2603,6 +2651,14 @@ abab@^2.0.3, abab@^2.0.5: resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== +accepts@^1.3.5, accepts@~1.3.7: + version "1.3.7" + resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd" + integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA== + dependencies: + mime-types "~2.1.24" + negotiator "0.6.2" + acorn-globals@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz#46cdd39f0f8ff08a876619b55f5ac8a6dc770b45" @@ -2781,6 +2837,14 @@ apollo-datasource@^0.9.0: apollo-server-caching "^0.7.0" apollo-server-env "^3.1.0" +apollo-datasource@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.0.3.tgz#616ccf2cbfaa6d9bf04520bf7d80da0e372eee5c" + integrity sha512-oboGz50DbGW6LNaNvB/bpJRypXvYFE1SRO5VxYSUnkz1P7TDcemWfJLRjNnfxCIMVyd0hmmwrmSaGKPQZvmT9Q== + dependencies: + apollo-server-caching "^3.0.1" + apollo-server-env "^4.0.3" + apollo-graphql@^0.9.0: version "0.9.3" resolved "https://registry.yarnpkg.com/apollo-graphql/-/apollo-graphql-0.9.3.tgz#1ca6f625322ae10a66f57a39642849a07a7a5dc9" @@ -2800,13 +2864,6 @@ apollo-link@^1.2.14: tslib "^1.9.3" zen-observable-ts "^0.8.21" -apollo-reporting-protobuf@^0.6.2: - version "0.6.2" - resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.2.tgz#5572866be9b77f133916532b10e15fbaa4158304" - integrity sha512-WJTJxLM+MRHNUxt1RTl4zD0HrLdH44F2mDzMweBj1yHL0kSt8I1WwoiF/wiGVSpnG48LZrBegCaOJeuVbJTbtw== - dependencies: - "@apollo/protobufjs" "^1.0.3" - apollo-reporting-protobuf@^0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz#ae9d967934d3d8ed816fc85a0d8068ef45c371b9" @@ -2814,12 +2871,12 @@ apollo-reporting-protobuf@^0.8.0: dependencies: "@apollo/protobufjs" "1.2.2" -apollo-server-caching@^0.5.3: - version "0.5.3" - resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.5.3.tgz#cf42a77ad09a46290a246810075eaa029b5305e1" - integrity sha512-iMi3087iphDAI0U2iSBE9qtx9kQoMMEWr6w+LwXruBD95ek9DWyj7OeC2U/ngLjRsXM43DoBDXlu7R+uMjahrQ== +apollo-reporting-protobuf@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.0.0.tgz#a53966b76a3f373d9336bc953f0bc6dede487270" + integrity sha512-jmCD+6gECt8KS7PxP460hztT/5URTbv2Kg0zgnR6iWPGce88IBmSUjcqf1Z6wJJq7Teb8Hu7WbyyMhn0vN5TxQ== dependencies: - lru-cache "^6.0.0" + "@apollo/protobufjs" "1.2.2" apollo-server-caching@^0.7.0: version "0.7.0" @@ -2828,7 +2885,14 @@ apollo-server-caching@^0.7.0: dependencies: lru-cache "^6.0.0" -apollo-server-core@^2.21.0, apollo-server-core@^2.25.2: +apollo-server-caching@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-3.0.1.tgz#bb6e51442266cb3ff05611c24c4e2f2fe8d6949e" + integrity sha512-Cd0imFQlU6IKrkm+RNY0MQvKTMBTME+518EuwCaw3TKNUYDpir1vOuIdc4bALXDANilOR73k/UQs/oPxayXfrg== + dependencies: + lru-cache "^6.0.0" + +apollo-server-core@^2.25.2: version "2.25.2" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.25.2.tgz#ff65da5e512d9b5ca54c8e5e8c78ee28b5987247" integrity sha512-lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA== @@ -2859,13 +2923,32 @@ apollo-server-core@^2.21.0, apollo-server-core@^2.25.2: subscriptions-transport-ws "^0.9.19" uuid "^8.0.0" -apollo-server-env@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.0.0.tgz#0157c51f52b63aee39af190760acf789ffc744d9" - integrity sha512-tPSN+VttnPsoQAl/SBVUpGbLA97MXG990XIwq6YUnJyAixrrsjW1xYG7RlaOqetxm80y5mBZKLrRDiiSsW/vog== - dependencies: - node-fetch "^2.1.2" - util.promisify "^1.0.0" +apollo-server-core@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.1.2.tgz#a9d24b9453b7aad89df464f6527d80e2f46b0a6f" + integrity sha512-bFmzPDGBT97vMzdhhjlycL9Ey4YDa0eCVaHjI5TcYQM8Vphzvndd033DvvQFVRPWoZr8uwupeUyVa82Ne/iM6A== + dependencies: + "@apollographql/apollo-tools" "^0.5.1" + "@apollographql/graphql-playground-html" "1.6.29" + "@graphql-tools/mock" "^8.1.2" + "@graphql-tools/schema" "^8.0.0" + "@graphql-tools/utils" "^8.0.0" + "@josephg/resolvable" "^1.0.0" + apollo-datasource "^3.0.3" + apollo-graphql "^0.9.0" + apollo-reporting-protobuf "^3.0.0" + apollo-server-caching "^3.0.1" + apollo-server-env "^4.0.3" + apollo-server-errors "^3.0.1" + apollo-server-plugin-base "^3.1.1" + apollo-server-types "^3.1.1" + async-retry "^1.2.1" + fast-json-stable-stringify "^2.1.0" + graphql-tag "^2.11.0" + loglevel "^1.6.8" + lru-cache "^6.0.0" + sha.js "^2.4.11" + uuid "^8.0.0" apollo-server-env@^3.1.0: version "3.1.0" @@ -2875,22 +2958,50 @@ apollo-server-env@^3.1.0: node-fetch "^2.6.1" util.promisify "^1.0.0" +apollo-server-env@^4.0.3: + version "4.0.3" + resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.0.3.tgz#082a5c1dd4dfb3b34de5e1fa7dc170dd15a5062f" + integrity sha512-B32+RUOM4GUJAwnQqQE1mT1BG7+VfW3a0A87Bp3gv/q8iNnhY2BIWe74Qn03pX8n27g3EGVCt0kcBuHhjG5ltA== + dependencies: + node-fetch "^2.6.1" + apollo-server-errors@^2.5.0: version "2.5.0" resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz#5d1024117c7496a2979e3e34908b5685fe112b68" integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA== -apollo-server-lambda@^2.21.0: - version "2.21.0" - resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-2.21.0.tgz#24080382aacfffe5f61480143be73c6424d3e54b" - integrity sha512-j96eA4hoo6Umjml3EqjgNd8cdlYHHQY1bMoTYIZO63CYemYRGkuB4j9fumNp+fGwZ1KaENm+H53iTM011VSjpw== +apollo-server-errors@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.0.1.tgz#0dfcc1fe8b10eab311fc7e4f6da93189ea6bcdae" + integrity sha512-PSp64IFeN1YK5EYZ3V/8iDRESMMyE00h1vE5aCr83wHL3T0mN7VRiMKoOIZ+2rUtnn7CpK73o6QLmouhxPtXsQ== + +apollo-server-express@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/apollo-server-express/-/apollo-server-express-3.1.2.tgz#274c71c0269fb126d1c6fd30889fbcd661493f4e" + integrity sha512-GeeQlFjFqugiGfLApBNmgLtyDXGVqacLdGhBccn7GQaxzpJ9YSsREUsoN+Fze6RVQ4/Igaq3QoNgBhrahXwBBQ== + dependencies: + "@types/accepts" "^1.3.5" + "@types/body-parser" "1.19.1" + "@types/cors" "2.8.12" + "@types/express" "4.17.13" + "@types/express-serve-static-core" "4.17.24" + accepts "^1.3.5" + apollo-server-core "^3.1.2" + apollo-server-types "^3.1.1" + body-parser "^1.19.0" + cors "^2.8.5" + parseurl "^1.3.3" + +apollo-server-lambda@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/apollo-server-lambda/-/apollo-server-lambda-3.1.2.tgz#db6eabce24e76dad88fe8d84bf5b827f577cba5b" + integrity sha512-jGWvrigreC2JbIYc7OL+FY43MOKeMuu/Bb3KxjVdmFSS3KQIeqRbSCpu8XcS4g8kMcBjkztwDKhsRzbWij8b1Q== dependencies: - "@apollographql/graphql-playground-html" "1.6.26" - "@types/aws-lambda" "^8.10.31" - apollo-server-core "^2.21.0" - apollo-server-env "^3.0.0" - apollo-server-types "^0.6.3" - graphql-tools "^4.0.8" + "@types/aws-lambda" "^8.10.76" + "@vendia/serverless-express" "^4.3.9" + apollo-server-core "^3.1.2" + apollo-server-express "^3.1.2" + express "^4.17.1" apollo-server-plugin-base@^0.13.0: version "0.13.0" @@ -2899,6 +3010,13 @@ apollo-server-plugin-base@^0.13.0: dependencies: apollo-server-types "^0.9.0" +apollo-server-plugin-base@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.1.1.tgz#b2d8d50c52af7c004fd63e04c53f2d2bf800c4df" + integrity sha512-gkV/UtMji6SrX8CdZ5/3IlRBVE57CM+DL6x9MA3pjNEc357OOC3dnh1SXNmp0cvqn66CB1kODGrqKGRxyl/qpA== + dependencies: + apollo-server-types "^3.1.1" + apollo-server-testing@^2.25.2: version "2.25.2" resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.25.2.tgz#0043e98b1a03720352e94b409215fb4782ae2e50" @@ -2906,15 +3024,6 @@ apollo-server-testing@^2.25.2: dependencies: apollo-server-core "^2.25.2" -apollo-server-types@^0.6.3: - version "0.6.3" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.6.3.tgz#f7aa25ff7157863264d01a77d7934aa6e13399e8" - integrity sha512-aVR7SlSGGY41E1f11YYz5bvwA89uGmkVUtzMiklDhZ7IgRJhysT5Dflt5IuwDxp+NdQkIhVCErUXakopocFLAg== - dependencies: - apollo-reporting-protobuf "^0.6.2" - apollo-server-caching "^0.5.3" - apollo-server-env "^3.0.0" - apollo-server-types@^0.9.0: version "0.9.0" resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b" @@ -2924,6 +3033,15 @@ apollo-server-types@^0.9.0: apollo-server-caching "^0.7.0" apollo-server-env "^3.1.0" +apollo-server-types@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.1.1.tgz#a45bf4d7c978340dc7c7dff317628629bdc53443" + integrity sha512-dTNlRxqdo+wnrcOFpFfzehdmcYHl6MQKuLnCCRzAHuVR5yOiuhQ5CIGhIjvMx2bP9ZoyON1SvXOIDTyTaU9gaQ== + dependencies: + apollo-reporting-protobuf "^3.0.0" + apollo-server-caching "^3.0.1" + apollo-server-env "^4.0.3" + apollo-tracing@^0.15.0: version "0.15.0" resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a" @@ -3023,6 +3141,11 @@ arr-union@^3.1.0: resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4" integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ= +array-flatten@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2" + integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI= + array-union@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/array-union/-/array-union-2.1.0.tgz#b798420adbeb1de828d84acd8a2e23d3efe85e8d" @@ -3396,6 +3519,22 @@ bn.js@^5.0.0, bn.js@^5.1.1: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.0.tgz#358860674396c6997771a9d051fcc1b57d4ae002" integrity sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw== +body-parser@1.19.0, body-parser@^1.19.0: + version "1.19.0" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a" + integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw== + dependencies: + bytes "3.1.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "1.7.2" + iconv-lite "0.4.24" + on-finished "~2.3.0" + qs "6.7.0" + raw-body "2.4.0" + type-is "~1.6.17" + boxen@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/boxen/-/boxen-4.2.0.tgz#e411b62357d6d6d36587c8ac3d5d974daa070e64" @@ -3635,6 +3774,11 @@ busboy@^0.3.1: dependencies: dicer "0.3.0" +bytes@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" + integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg== + cacache@^12.0.2: version "12.0.4" resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz#668bcbd105aeb5f1d92fe25570ec9525c8faa40c" @@ -4215,13 +4359,18 @@ constants-browserify@^1.0.0: resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U= -content-disposition@^0.5.3: +content-disposition@0.5.3, content-disposition@^0.5.3: version "0.5.3" resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd" integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g== dependencies: safe-buffer "5.1.2" +content-type@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b" + integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== + convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442" @@ -4229,6 +4378,16 @@ convert-source-map@^1.4.0, convert-source-map@^1.6.0, convert-source-map@^1.7.0: dependencies: safe-buffer "~5.1.1" +cookie-signature@1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c" + integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw= + +cookie@0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba" + integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg== + cookiejar@^2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/cookiejar/-/cookiejar-2.1.2.tgz#dd8a235530752f988f9a0844f3fc589e3111125c" @@ -4291,6 +4450,14 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cors@^2.8.5: + version "2.8.5" + resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29" + integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g== + dependencies: + object-assign "^4" + vary "^1" + cosmiconfig@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-6.0.0.tgz#da4fee853c52f6b1e6935f41c1a2fc50bd4a9982" @@ -4489,6 +4656,13 @@ dayjs@^1.10.4, dayjs@^1.10.6: resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63" integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw== +debug@2.6.9, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3: + version "2.6.9" + resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" + integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== + dependencies: + ms "2.0.0" + debug@4: version "4.3.2" resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b" @@ -4496,13 +4670,6 @@ debug@4: dependencies: ms "2.1.2" -debug@^2.1.3, debug@^2.2.0, debug@^2.3.3: - version "2.6.9" - resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - debug@^3.1.0, debug@^3.1.1: version "3.2.7" resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a" @@ -4704,6 +4871,11 @@ des.js@^1.0.0: inherits "^2.0.1" minimalistic-assert "^1.0.0" +destroy@~1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80" + integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA= + detect-indent@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" @@ -4860,6 +5032,11 @@ ecdsa-sig-formatter@1.0.11: dependencies: safe-buffer "^5.0.1" +ee-first@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" + integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0= + electron-to-chromium@^1.3.723: version "1.3.725" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.725.tgz#04fc83f9189169aff50f0a00c6b4090b910cba85" @@ -4905,6 +5082,11 @@ enabled@1.0.x: dependencies: env-variable "0.0.x" +encodeurl@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" + integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k= + end-of-stream@^1.0.0, end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4: version "1.4.4" resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.4.tgz#5ae64a5f45057baf3626ec14da0ca5e4b2431eb0" @@ -5087,6 +5269,11 @@ escape-goat@^2.0.0: resolved "https://registry.yarnpkg.com/escape-goat/-/escape-goat-2.1.1.tgz#1b2dc77003676c457ec760b2dc68edb648188675" integrity sha512-8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q== +escape-html@~1.0.3: + version "1.0.3" + resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" + integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= + escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -5291,6 +5478,11 @@ esutils@^2.0.2: resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== +etag@~1.8.1: + version "1.8.1" + resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" + integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc= + event-emitter@^0.3.5, event-emitter@~0.3.5: version "0.3.5" resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" @@ -5400,6 +5592,42 @@ expect@^26.6.2: jest-message-util "^26.6.2" jest-regex-util "^26.0.0" +express@^4.17.1: + version "4.17.1" + resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134" + integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g== + dependencies: + accepts "~1.3.7" + array-flatten "1.1.1" + body-parser "1.19.0" + content-disposition "0.5.3" + content-type "~1.0.4" + cookie "0.4.0" + cookie-signature "1.0.6" + debug "2.6.9" + depd "~1.1.2" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + finalhandler "~1.1.2" + fresh "0.5.2" + merge-descriptors "1.0.1" + methods "~1.1.2" + on-finished "~2.3.0" + parseurl "~1.3.3" + path-to-regexp "0.1.7" + proxy-addr "~2.0.5" + qs "6.7.0" + range-parser "~1.2.1" + safe-buffer "5.1.2" + send "0.17.1" + serve-static "1.14.1" + setprototypeof "1.1.1" + statuses "~1.5.0" + type-is "~1.6.18" + utils-merge "1.0.1" + vary "~1.1.2" + ext-list@^2.0.0: version "2.2.2" resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37" @@ -5496,7 +5724,7 @@ fast-glob@^3.1.1, fast-glob@^3.2.4, fast-glob@^3.2.5, fast-glob@^3.2.7: merge2 "^1.3.0" micromatch "^4.0.4" -fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0: +fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-stable-stringify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== @@ -5659,6 +5887,19 @@ fill-range@^7.0.1: dependencies: to-regex-range "^5.0.1" +finalhandler@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d" + integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA== + dependencies: + debug "2.6.9" + encodeurl "~1.0.2" + escape-html "~1.0.3" + on-finished "~2.3.0" + parseurl "~1.3.3" + statuses "~1.5.0" + unpipe "~1.0.0" + find-cache-dir@^2.0.0, find-cache-dir@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7" @@ -5790,6 +6031,11 @@ formidable@^1.2.0: resolved "https://registry.yarnpkg.com/formidable/-/formidable-1.2.2.tgz#bf69aea2972982675f00865342b982986f6b8dd9" integrity sha512-V8gLm+41I/8kguQ4/o1D3RIHRmhYFG4pnNyonvua+40rqcEmT4+V71yaZ3B457xbbgCsCfjSPi65u/W6vK1U5Q== +forwarded@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811" + integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow== + fragment-cache@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19" @@ -5797,6 +6043,11 @@ fragment-cache@^0.2.1: dependencies: map-cache "^0.2.2" +fresh@0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7" + integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac= + from2@^2.1.0: version "2.3.0" resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af" @@ -6322,6 +6573,17 @@ http-cache-semantics@^4.0.0: resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz#49e91c5cbf36c9b94bcfcd71c23d5249ec74e390" integrity sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ== +http-errors@1.7.2: + version "1.7.2" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f" + integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg== + dependencies: + depd "~1.1.2" + inherits "2.0.3" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-errors@^1.7.3: version "1.8.0" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" @@ -6333,6 +6595,17 @@ http-errors@^1.7.3: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" +http-errors@~1.7.2: + version "1.7.3" + resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" + integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw== + dependencies: + depd "~1.1.2" + inherits "2.0.4" + setprototypeof "1.1.1" + statuses ">= 1.5.0 < 2" + toidentifier "1.0.0" + http-signature@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/http-signature/-/http-signature-1.2.0.tgz#9aecd925114772f3d95b65a60abb8f7c18fbace1" @@ -6540,6 +6813,11 @@ inquirer@^7.3.3: strip-ansi "^6.0.0" through "^2.3.6" +ipaddr.js@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" + integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g== + is-accessor-descriptor@^0.1.6: version "0.1.6" resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6" @@ -7833,7 +8111,7 @@ logform@^2.1.1: ms "^2.1.1" triple-beam "^1.3.0" -loglevel@^1.6.7: +loglevel@^1.6.7, loglevel@^1.6.8: version "1.7.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== @@ -8008,6 +8286,11 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" +merge-descriptors@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" + integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E= + merge-stream@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60" @@ -8018,7 +8301,7 @@ merge2@^1.3.0: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== -methods@^1.1.1: +methods@^1.1.1, methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4= @@ -8087,7 +8370,7 @@ mime-types@~2.1.24: dependencies: mime-db "1.49.0" -mime@^1.4.1: +mime@1.6.0, mime@^1.4.1: version "1.6.0" resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg== @@ -8240,6 +8523,11 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +ms@2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" + integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== + ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" @@ -8320,6 +8608,11 @@ ncjsm@^4.1.0, ncjsm@^4.2.0: fs2 "^0.3.9" type "^2.5.0" +negotiator@0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" + integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw== + neo-async@^2.5.0, neo-async@^2.6.1, neo-async@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f" @@ -8364,7 +8657,7 @@ node-dir@^0.1.17: dependencies: minimatch "^3.0.2" -node-fetch@^2.1.2, node-fetch@^2.6.0, node-fetch@^2.6.1: +node-fetch@^2.6.0, node-fetch@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== @@ -8515,7 +8808,7 @@ oauth-sign@~0.9.0: resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455" integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ== -object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: +object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -8592,6 +8885,13 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +on-finished@~2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" + integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc= + dependencies: + ee-first "1.1.1" + once@^1.3.0, once@^1.3.1, once@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -8848,6 +9148,11 @@ parseuri@0.0.6: resolved "https://registry.yarnpkg.com/parseuri/-/parseuri-0.0.6.tgz#e1496e829e3ac2ff47f39a4dd044b32823c4a25a" integrity sha512-AUjen8sAkGgao7UyCX6Ahv0gIK2fABKmYjvP4xmy5JaKvcbTRueIqIPHLAfq30xJddqSE033IOMUSOMCcK3Sow== +parseurl@^1.3.3, parseurl@~1.3.3: + version "1.3.3" + resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" + integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ== + pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" @@ -8901,6 +9206,11 @@ path-parse@^1.0.6: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c" integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw== +path-to-regexp@0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c" + integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w= + path-type@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/path-type/-/path-type-4.0.0.tgz#84ed01c0a7ba380afe09d90a8c180dcd9d03043b" @@ -9235,6 +9545,14 @@ protobufjs@^6.9.0: "@types/node" ">=13.7.0" long "^4.0.0" +proxy-addr@~2.0.5: + version "2.0.7" + resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025" + integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg== + dependencies: + forwarded "0.2.0" + ipaddr.js "1.9.1" + prr@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" @@ -9317,6 +9635,11 @@ qrcode-terminal@^0.12.0: resolved "https://registry.yarnpkg.com/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz#bb5b699ef7f9f0505092a3748be4464fe71b5819" integrity sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ== +qs@6.7.0: + version "6.7.0" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc" + integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ== + qs@^6.5.1: version "6.10.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.10.1.tgz#4931482fa8d647a5aab799c5271d2133b981fb6a" @@ -9379,6 +9702,21 @@ randomfill@^1.0.3: randombytes "^2.0.5" safe-buffer "^5.1.0" +range-parser@~1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031" + integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg== + +raw-body@2.4.0: + version "2.4.0" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332" + integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q== + dependencies: + bytes "3.1.0" + http-errors "1.7.2" + iconv-lite "0.4.24" + unpipe "1.0.0" + raw-loader@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6" @@ -9945,6 +10283,25 @@ semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +send@0.17.1: + version "0.17.1" + resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" + integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg== + dependencies: + debug "2.6.9" + depd "~1.1.2" + destroy "~1.0.4" + encodeurl "~1.0.2" + escape-html "~1.0.3" + etag "~1.8.1" + fresh "0.5.2" + http-errors "~1.7.2" + mime "1.6.0" + ms "2.1.1" + on-finished "~2.3.0" + range-parser "~1.2.1" + statuses "~1.5.0" + serialize-javascript@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa" @@ -9959,6 +10316,16 @@ serialize-javascript@^5.0.1: dependencies: randombytes "^2.1.0" +serve-static@1.14.1: + version "1.14.1" + resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9" + integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg== + dependencies: + encodeurl "~1.0.2" + escape-html "~1.0.3" + parseurl "~1.3.3" + send "0.17.1" + serverless-associate-waf@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/serverless-associate-waf/-/serverless-associate-waf-1.2.1.tgz#30efcfe94038a34fba6a00a954df43e176b8ccc9" @@ -10168,6 +10535,11 @@ setimmediate@^1.0.4: resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU= +setprototypeof@1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" + integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== + setprototypeof@1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" @@ -10523,7 +10895,7 @@ static-extend@^0.1.1: define-property "^0.2.5" object-copy "^0.1.0" -"statuses@>= 1.5.0 < 2": +"statuses@>= 1.5.0 < 2", statuses@~1.5.0: version "1.5.0" resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c" integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow= @@ -11198,6 +11570,11 @@ tslib@^2.1.0, tslib@~2.2.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c" integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w== +tslib@~2.3.0: + version "2.3.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01" + integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw== + tsutils@^3.17.1, tsutils@^3.21.0: version "3.21.0" resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" @@ -11261,7 +11638,7 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== -type-is@^1.6.16: +type-is@^1.6.16, type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g== @@ -11375,6 +11752,11 @@ universalify@^2.0.0: resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== +unpipe@1.0.0, unpipe@~1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" + integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= + unset-value@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559" @@ -11499,6 +11881,11 @@ util@^0.11.0: dependencies: inherits "2.0.3" +utils-merge@1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" + integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM= + uuid@3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" @@ -11536,6 +11923,16 @@ validate-npm-package-license@^3.0.1: spdx-correct "^3.0.0" spdx-expression-parse "^3.0.0" +value-or-promise@1.0.10: + version "1.0.10" + resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.10.tgz#5bf041f1e9a8e7043911875547636768a836e446" + integrity sha512-1OwTzvcfXkAfabk60UVr5NdjtjJ0Fg0T5+B1bhxtrOEwSH2fe8y4DnLgoksfCyd8yZCOQQHB0qLMQnwgCjbXLQ== + +vary@^1, vary@~1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc" + integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw= + velocityjs@^2.0.0: version "2.0.3" resolved "https://registry.yarnpkg.com/velocityjs/-/velocityjs-2.0.3.tgz#cc772f687061997127b7d8a827dbef3af8a0bbe6" @@ -11854,14 +12251,6 @@ xmlhttprequest-ssl@~1.6.2: resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.6.3.tgz#03b713873b01659dfa2c1c5d056065b27ddc2de6" integrity sha512-3XfeQE/wNkvrIktn2Kf0869fC0BN6UpydVasGIeSm2B1Llihf7/0UfZM+eCkOw3P7bP4+qPgqhm7ZoxuJtFU0Q== -xss@^1.0.6: - version "1.0.8" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.8.tgz#32feb87feb74b3dcd3d404b7a68ababf10700535" - integrity sha512-3MgPdaXV8rfQ/pNn16Eio6VXYPTkqwa0vc7GkiymmY/DqR1SE/7VPAAVZz1GJsJFrllMYO3RHfEaiUGjab6TNw== - dependencies: - commander "^2.20.3" - cssfilter "0.0.10" - xss@^1.0.8: version "1.0.9" resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.9.tgz#3ffd565571ff60d2e40db7f3b80b4677bec770d2" From 8beeccdec9b7f4e8a3f8aeace131ee99c080dec2 Mon Sep 17 00:00:00 2001 From: MacRae Linton Date: Fri, 20 Aug 2021 16:28:40 -0700 Subject: [PATCH 2/3] remove apollo-server-testing --- services/app-api/package.json | 1 - .../resolvers/createDraftSubmission.test.ts | 15 +- .../resolvers/fetchCurrentUser.test.ts | 19 +- .../resolvers/fetchDraftSubmission.test.ts | 44 +- .../resolvers/fetchStateSubmission.test.ts | 38 +- .../resolvers/indexSubmissions.test.ts | 24 +- .../resolvers/submitDraftSubmission.test.ts | 46 +- .../resolvers/updateDraftSubmission.test.ts | 148 ++++--- services/app-api/testHelpers/gqlHelpers.ts | 69 +-- services/app-api/yarn.lock | 394 +----------------- 10 files changed, 191 insertions(+), 607 deletions(-) diff --git a/services/app-api/package.json b/services/app-api/package.json index 65fc1b2739..5a582557d7 100644 --- a/services/app-api/package.json +++ b/services/app-api/package.json @@ -15,7 +15,6 @@ "@types/request": "^2.48.7", "@types/uuid": "^8.3.1", "apollo-server-lambda": "^3.1.2", - "apollo-server-testing": "^2.25.2", "aws-sdk": "^2.966.0", "eslint-config-prettier": "^7.2.0", "eslint-plugin-jest": "^24.4.0", diff --git a/services/app-api/resolvers/createDraftSubmission.test.ts b/services/app-api/resolvers/createDraftSubmission.test.ts index 1b96a17701..bc79434310 100644 --- a/services/app-api/resolvers/createDraftSubmission.test.ts +++ b/services/app-api/resolvers/createDraftSubmission.test.ts @@ -1,5 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' - import { CreateDraftSubmissionInput } from '../gen/gqlServer' import CREATE_DRAFT_SUBMISSION from '../../app-graphql/src/mutations/createDraftSubmission.graphql' import { constructTestServer } from '../testHelpers/gqlHelpers' @@ -8,21 +6,19 @@ describe('createDraftSubmission', () => { it('returns draft submission payload with a draft submission', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - const input: CreateDraftSubmissionInput = { programID: 'managed-medical-assistance', submissionType: 'CONTRACT_ONLY', submissionDescription: 'A real submission', } - const res = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const res = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input }, }) expect(res.errors).toBeUndefined() - const draft = res.data.createDraftSubmission.draftSubmission + const draft = res.data?.createDraftSubmission.draftSubmission expect(draft.submissionDescription).toBe('A real submission') expect(draft.submissionType).toBe('CONTRACT_ONLY') @@ -38,14 +34,13 @@ describe('createDraftSubmission', () => { it('returns an error if the program id is not in valid', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) const input: CreateDraftSubmissionInput = { programID: 'xyz123', submissionType: 'CONTRACT_ONLY', submissionDescription: 'A real submission', } - const res = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const res = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input }, }) diff --git a/services/app-api/resolvers/fetchCurrentUser.test.ts b/services/app-api/resolvers/fetchCurrentUser.test.ts index bb66a9a3ce..9974a89121 100644 --- a/services/app-api/resolvers/fetchCurrentUser.test.ts +++ b/services/app-api/resolvers/fetchCurrentUser.test.ts @@ -1,4 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' import { Context } from '../handlers/apollo_gql' import { constructTestServer } from '../testHelpers/gqlHelpers' @@ -7,17 +6,16 @@ import FETCH_CURRENT_USER from '../../app-graphql/src/queries/fetchCurrentUser.g describe('currentUser', () => { it('returns the currentUser', async () => { const server = constructTestServer() - const { query } = createTestClient(server) // make a mock request - const res = await query({ query: FETCH_CURRENT_USER }) + const res = await server.executeOperation({ query: FETCH_CURRENT_USER }) // confirm that we get what we got expect(res.errors).toBeUndefined() - expect(res.data.fetchCurrentUser.email).toBe('james@example.com') - expect(res.data.fetchCurrentUser.state.code).toBe('FL') - expect(res.data.fetchCurrentUser.state.programs).toHaveLength(4) + expect(res.data?.fetchCurrentUser.email).toBe('james@example.com') + expect(res.data?.fetchCurrentUser.state.code).toBe('FL') + expect(res.data?.fetchCurrentUser.state.programs).toHaveLength(4) }) it('returns a state with no programs if the state is not in valid state list', async () => { @@ -31,17 +29,16 @@ describe('currentUser', () => { } const server = constructTestServer({ context: customContext }) - const { query } = createTestClient(server) // make a mock request - const res = await query({ query: FETCH_CURRENT_USER }) + const res = await server.executeOperation({ query: FETCH_CURRENT_USER }) // confirm that we get what we got expect(res.errors).toBeUndefined() - expect(res.data.fetchCurrentUser.email).toBe('james@example.com') - expect(res.data.fetchCurrentUser.state.code).toBe('MI') - expect(res.data.fetchCurrentUser.state.name).toBe( + expect(res.data?.fetchCurrentUser.email).toBe('james@example.com') + expect(res.data?.fetchCurrentUser.state.code).toBe('MI') + expect(res.data?.fetchCurrentUser.state.name).toBe( 'This state is not part of the pilot' ) }) diff --git a/services/app-api/resolvers/fetchDraftSubmission.test.ts b/services/app-api/resolvers/fetchDraftSubmission.test.ts index 01a9a93ce6..2992c0151a 100644 --- a/services/app-api/resolvers/fetchDraftSubmission.test.ts +++ b/services/app-api/resolvers/fetchDraftSubmission.test.ts @@ -1,5 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' - import { CreateDraftSubmissionInput } from '../gen/gqlServer' import CREATE_DRAFT_SUBMISSION from '../../app-graphql/src/mutations/createDraftSubmission.graphql' import FETCH_DRAFT_SUBMISSION from '../../app-graphql/src/queries/fetchDraftSubmission.graphql' @@ -9,35 +7,33 @@ describe('fetchDraftSubmission', () => { it('returns draft submission payload with a draft submission', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - // First, create a new submission const createInput: CreateDraftSubmissionInput = { programID: 'managed-medical-assistance', submissionType: 'CONTRACT_ONLY', submissionDescription: 'A real submission', } - const createResult = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const createResult = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input: createInput }, }) const createdID = - createResult.data.createDraftSubmission.draftSubmission.id + createResult.data?.createDraftSubmission.draftSubmission.id // then see if we can fetch that same submission const input = { submissionID: createdID, } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_DRAFT_SUBMISSION, variables: { input }, }) expect(result.errors).toBeUndefined() - const resultDraft = result.data.fetchDraftSubmission.draftSubmission + const resultDraft = result.data?.fetchDraftSubmission.draftSubmission expect(resultDraft.id).toEqual(createdID) expect(resultDraft.program.id).toEqual('managed-medical-assistance') expect(resultDraft.program.name).toBe('Managed Medical Assistance') @@ -49,40 +45,36 @@ describe('fetchDraftSubmission', () => { it('returns null if the ID does not exist', async () => { const server = constructTestServer() - const { query } = createTestClient(server) - // then see if we can fetch that same submission const input = { submissionID: 'deadbeef-3292323-foo-bar', } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_DRAFT_SUBMISSION, variables: { input }, }) expect(result.errors).toBeUndefined() - expect(result.data.fetchDraftSubmission.draftSubmission).toBeNull() + expect(result.data?.fetchDraftSubmission.draftSubmission).toBeNull() }) it('a different user from the same state can fetch the draft', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - // First, create a new submission const createInput: CreateDraftSubmissionInput = { programID: 'smmc', submissionType: 'CONTRACT_ONLY', submissionDescription: 'A real submission', } - const createResult = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const createResult = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input: createInput }, }) const createdID = - createResult.data.createDraftSubmission.draftSubmission.id + createResult.data?.createDraftSubmission.draftSubmission.id // then see if we can fetch that same submission const input = { @@ -101,9 +93,7 @@ describe('fetchDraftSubmission', () => { }, }) - const { query } = createTestClient(otherUserServer) - - const result = await query({ + const result = await otherUserServer.executeOperation({ query: FETCH_DRAFT_SUBMISSION, variables: { input }, }) @@ -116,21 +106,19 @@ describe('fetchDraftSubmission', () => { it('returns an error if you are requesting for a different state (403)', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - // First, create a new submission const createInput: CreateDraftSubmissionInput = { programID: 'smmc', submissionType: 'CONTRACT_ONLY', submissionDescription: 'A real submission', } - const createResult = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const createResult = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input: createInput }, }) const createdID = - createResult.data.createDraftSubmission.draftSubmission.id + createResult.data?.createDraftSubmission.draftSubmission.id // then see if we can fetch that same submission const input = { @@ -149,9 +137,7 @@ describe('fetchDraftSubmission', () => { }, }) - const { query } = createTestClient(otherUserServer) - - const result = await query({ + const result = await otherUserServer.executeOperation({ query: FETCH_DRAFT_SUBMISSION, variables: { input }, }) diff --git a/services/app-api/resolvers/fetchStateSubmission.test.ts b/services/app-api/resolvers/fetchStateSubmission.test.ts index f296cbcb09..533592d97d 100644 --- a/services/app-api/resolvers/fetchStateSubmission.test.ts +++ b/services/app-api/resolvers/fetchStateSubmission.test.ts @@ -1,5 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' - import FETCH_STATE_SUBMISSION from '../../app-graphql/src/queries/fetchStateSubmission.graphql' import { constructTestServer, @@ -11,10 +9,8 @@ describe('fetchStateSubmission', () => { it('returns draft submission payload with a draft submission', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - // First, create a new submission - const stateSubmission = await createTestStateSubmission(mutate) + const stateSubmission = await createTestStateSubmission(server) const createdID = stateSubmission.id @@ -23,14 +19,14 @@ describe('fetchStateSubmission', () => { submissionID: createdID, } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_STATE_SUBMISSION, variables: { input }, }) expect(result.errors).toBeUndefined() - const resultSub = result.data.fetchStateSubmission.submission + const resultSub = result.data?.fetchStateSubmission.submission expect(resultSub.id).toEqual(createdID) expect(resultSub.program.id).toEqual('cnet') expect(resultSub.program.name).toBe('CNET') @@ -50,17 +46,15 @@ describe('fetchStateSubmission', () => { it('returns an error if the submission is a draft', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - // First, create a new submission - const draft = await createAndUpdateTestDraftSubmission(mutate) + const draft = await createAndUpdateTestDraftSubmission(server) // then see if we can fetch that same submission const input = { submissionID: draft.id, } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_STATE_SUBMISSION, variables: { input }, }) @@ -81,29 +75,25 @@ describe('fetchStateSubmission', () => { it('returns null if the ID does not exist', async () => { const server = constructTestServer() - const { query } = createTestClient(server) - // then see if we can fetch that same submission const input = { submissionID: 'deadbeef-3292323-foo-bar', } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_STATE_SUBMISSION, variables: { input }, }) expect(result.errors).toBeUndefined() - expect(result.data.fetchStateSubmission.submission).toBeNull() + expect(result.data?.fetchStateSubmission.submission).toBeNull() }) it('a different user from the same state can fetch the draft', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - // First, create a new submission - const stateSubmission = await createTestStateSubmission(mutate) + const stateSubmission = await createTestStateSubmission(server) const createdID = stateSubmission.id @@ -124,9 +114,7 @@ describe('fetchStateSubmission', () => { }, }) - const { query } = createTestClient(otherUserServer) - - const result = await query({ + const result = await otherUserServer.executeOperation({ query: FETCH_STATE_SUBMISSION, variables: { input }, }) @@ -139,10 +127,8 @@ describe('fetchStateSubmission', () => { it('returns an error if you are requesting for a different state (403)', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - // First, create a new submission - const stateSubmission = await createTestStateSubmission(mutate) + const stateSubmission = await createTestStateSubmission(server) const createdID = stateSubmission.id @@ -163,9 +149,7 @@ describe('fetchStateSubmission', () => { }, }) - const { query } = createTestClient(otherUserServer) - - const result = await query({ + const result = await otherUserServer.executeOperation({ query: FETCH_STATE_SUBMISSION, variables: { input }, }) diff --git a/services/app-api/resolvers/indexSubmissions.test.ts b/services/app-api/resolvers/indexSubmissions.test.ts index bca1582c62..6f23197612 100644 --- a/services/app-api/resolvers/indexSubmissions.test.ts +++ b/services/app-api/resolvers/indexSubmissions.test.ts @@ -1,5 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' - import INDEX_SUBMISSIONS from '../../app-graphql/src/queries/indexSubmissions.graphql' import { constructTestServer, @@ -17,20 +15,18 @@ describe('indexDraftSubmission', () => { it('returns some submissions', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - // First, create a new submission - const draftSub = await createTestDraftSubmission(mutate) - const stateSub = await createTestStateSubmission(mutate) + const draftSub = await createTestDraftSubmission(server) + const stateSub = await createTestStateSubmission(server) // then see if we can get that same submission back from the index - const result = await query({ + const result = await server.executeOperation({ query: INDEX_SUBMISSIONS, }) expect(result.errors).toBeUndefined() - const submissionsIndex = result.data.indexSubmissions + const submissionsIndex = result.data?.indexSubmissions expect(submissionsIndex.totalCount).toBeGreaterThan(1) @@ -69,11 +65,9 @@ describe('indexDraftSubmission', () => { it('returns no submissions for a different user', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - // First, create a new submission - const draftSub = await createTestDraftSubmission(mutate) - const stateSub = await createTestStateSubmission(mutate) + const draftSub = await createTestDraftSubmission(server) + const stateSub = await createTestStateSubmission(server) const otherUserServer = constructTestServer({ context: { @@ -86,16 +80,14 @@ describe('indexDraftSubmission', () => { }, }) - const { query: otherStateQuery } = createTestClient(otherUserServer) - // then see if we can get that same submission back from the index - const result = await otherStateQuery({ + const result = await otherUserServer.executeOperation({ query: INDEX_SUBMISSIONS, }) expect(result.errors).toBeUndefined() - const submissionsIndex = result.data.indexSubmissions + const submissionsIndex = result.data?.indexSubmissions // Since we don't wipe the DB between tests, here we filter out all // the extraneous submissions and grab the two we started with. diff --git a/services/app-api/resolvers/submitDraftSubmission.test.ts b/services/app-api/resolvers/submitDraftSubmission.test.ts index 89d1a9a87b..8c37a98171 100644 --- a/services/app-api/resolvers/submitDraftSubmission.test.ts +++ b/services/app-api/resolvers/submitDraftSubmission.test.ts @@ -1,4 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' import SUBMIT_DRAFT_SUBMISSION from '../../app-graphql/src/mutations/submitDraftSubmission.graphql' import { constructTestServer, @@ -10,16 +9,14 @@ describe('submitDraftSubmission', () => { it('returns a StateSubmission if complete', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - // setup - const draft = await createAndUpdateTestDraftSubmission(mutate) + const draft = await createAndUpdateTestDraftSubmission(server) const draftID = draft.id // submit await new Promise((resolve) => setTimeout(resolve, 2000)) - const submitResult = await mutate({ - mutation: SUBMIT_DRAFT_SUBMISSION, + const submitResult = await server.executeOperation({ + query: SUBMIT_DRAFT_SUBMISSION, variables: { input: { submissionID: draftID, @@ -32,7 +29,10 @@ describe('submitDraftSubmission', () => { submitResult?.data?.submitDraftSubmission.submission.id // test result - const resultDraft = await fetchTestStateSubmissionById(query, createdID) + const resultDraft = await fetchTestStateSubmissionById( + server, + createdID + ) // The submission fields should still be set expect(resultDraft.id).toEqual(createdID) @@ -68,15 +68,13 @@ describe('submitDraftSubmission', () => { it('returns an error if there are no documents attached', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - - const draft = await createAndUpdateTestDraftSubmission(mutate, { + const draft = await createAndUpdateTestDraftSubmission(server, { documents: [], }) const draftID = draft.id - const submitResult = await mutate({ - mutation: SUBMIT_DRAFT_SUBMISSION, + const submitResult = await server.executeOperation({ + query: SUBMIT_DRAFT_SUBMISSION, variables: { input: { submissionID: draftID, @@ -97,17 +95,15 @@ describe('submitDraftSubmission', () => { it('returns an error if there are no contract details fields', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - - const draft = await createAndUpdateTestDraftSubmission(mutate, { + const draft = await createAndUpdateTestDraftSubmission(server, { contractType: undefined, managedCareEntities: [], federalAuthorities: [], }) const draftID = draft.id - const submitResult = await mutate({ - mutation: SUBMIT_DRAFT_SUBMISSION, + const submitResult = await server.executeOperation({ + query: SUBMIT_DRAFT_SUBMISSION, variables: { input: { submissionID: draftID, @@ -128,9 +124,7 @@ describe('submitDraftSubmission', () => { it('returns an error if there are missing rate details fields for submission type', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - - const draft = await createAndUpdateTestDraftSubmission(mutate, { + const draft = await createAndUpdateTestDraftSubmission(server, { submissionType: 'CONTRACT_AND_RATES', rateType: undefined, rateDateStart: undefined, @@ -139,8 +133,8 @@ describe('submitDraftSubmission', () => { }) const draftID = draft.id - const submitResult = await mutate({ - mutation: SUBMIT_DRAFT_SUBMISSION, + const submitResult = await server.executeOperation({ + query: SUBMIT_DRAFT_SUBMISSION, variables: { input: { submissionID: draftID, @@ -161,9 +155,7 @@ describe('submitDraftSubmission', () => { it('returns an error if there are invalid rate details fields for submission type', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - - const draft = await createAndUpdateTestDraftSubmission(mutate, { + const draft = await createAndUpdateTestDraftSubmission(server, { submissionType: 'CONTRACT_ONLY', rateDateStart: '2025-05-01', rateDateEnd: '2026-04-30', @@ -171,8 +163,8 @@ describe('submitDraftSubmission', () => { }) const draftID = draft.id - const submitResult = await mutate({ - mutation: SUBMIT_DRAFT_SUBMISSION, + const submitResult = await server.executeOperation({ + query: SUBMIT_DRAFT_SUBMISSION, variables: { input: { submissionID: draftID, diff --git a/services/app-api/resolvers/updateDraftSubmission.test.ts b/services/app-api/resolvers/updateDraftSubmission.test.ts index 860ea9fa48..9e4b12e005 100644 --- a/services/app-api/resolvers/updateDraftSubmission.test.ts +++ b/services/app-api/resolvers/updateDraftSubmission.test.ts @@ -1,5 +1,3 @@ -import { createTestClient } from 'apollo-server-testing' - import { DraftSubmissionType } from '../../app-web/src/common-code/domain-models' import { DraftSubmissionUpdates, @@ -213,9 +211,7 @@ describe('updateDraftSubmission', () => { it('updates a submission if the state matches', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-06' const endDate = '2021-07-12' @@ -240,8 +236,8 @@ describe('updateDraftSubmission', () => { actuaryContacts: [], } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -252,7 +248,10 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() - const resultDraft = await fetchTestDraftSubmissionById(query, createdID) + const resultDraft = await fetchTestDraftSubmissionById( + server, + createdID + ) // General expect(resultDraft.id).toEqual(createdID) expect(resultDraft.submissionType).toEqual('CONTRACT_AND_RATES') @@ -288,9 +287,8 @@ describe('updateDraftSubmission', () => { it('updates a submission to have documents', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-06' const endDate = '2021-07-12' @@ -315,7 +313,7 @@ describe('updateDraftSubmission', () => { name: 'Test Person', titleRole: 'A Role', email: 'test@test.com', - } + }, ], actuaryContacts: [ { @@ -324,13 +322,13 @@ describe('updateDraftSubmission', () => { email: 'test@test.com', actuarialFirm: 'MERCER' as const, actuarialFirmOther: '', - } + }, ], actuaryCommunicationPreference: 'OACT_TO_ACTUARY' as const, } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -342,7 +340,7 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() const resultDraft1 = - updateResult.data.updateDraftSubmission.draftSubmission + updateResult.data?.updateDraftSubmission.draftSubmission expect(resultDraft1.id).toEqual(createdID) expect(resultDraft1.documents).toEqual([ { @@ -390,13 +388,13 @@ describe('updateDraftSubmission', () => { email: 'test@test.com', actuarialFirm: 'MERCER' as const, actuarialFirmOther: '', - } + }, ], actuaryCommunicationPreference: 'OACT_TO_ACTUARY' as const, } - const updateResult2 = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult2 = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -405,16 +403,15 @@ describe('updateDraftSubmission', () => { }, }) const resultDraft2 = - updateResult2.data.updateDraftSubmission.draftSubmission + updateResult2.data?.updateDraftSubmission.draftSubmission expect(resultDraft2.documents.length).toEqual(2) expect(resultDraft2.documents[0].name).toEqual('myfile2.pdf') }) it('updates a submission to have state contacts', async () => { const server = constructTestServer() - const { mutate, query } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const updatedDraft = { @@ -435,7 +432,7 @@ describe('updateDraftSubmission', () => { email: 'test@test.com', actuarialFirm: 'MERCER' as const, actuarialFirmOther: '', - } + }, ], actuaryCommunicationPreference: 'OACT_TO_ACTUARY' as const, documents: [], @@ -446,8 +443,8 @@ describe('updateDraftSubmission', () => { federalAuthorities: [], } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -459,7 +456,7 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() const resultDraft1 = - updateResult.data.updateDraftSubmission.draftSubmission + updateResult.data?.updateDraftSubmission.draftSubmission expect(resultDraft1.id).toEqual(createdID) expect(resultDraft1.stateContacts).toEqual([ { @@ -479,23 +476,25 @@ describe('updateDraftSubmission', () => { }, ]) - const fetchedDraft = await fetchTestDraftSubmissionById(query, createdID) + const fetchedDraft = await fetchTestDraftSubmissionById( + server, + createdID + ) expect(fetchedDraft.id).toEqual(createdID) expect(fetchedDraft.stateContacts).toEqual([ - { - name: 'test name', - titleRole: 'fancy person', - email: 'test@test.com', - }, + { + name: 'test name', + titleRole: 'fancy person', + email: 'test@test.com', + }, ]) }) it('updates a submission to have contract amendment details', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-06' @@ -521,8 +520,8 @@ describe('updateDraftSubmission', () => { }, } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -534,7 +533,7 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() const resultDraft = - updateResult.data.updateDraftSubmission.draftSubmission + updateResult.data?.updateDraftSubmission.draftSubmission expect(resultDraft.id).toEqual(createdID) expect(resultDraft.contractAmendmentInfo.itemsBeingAmended).toEqual([ @@ -551,9 +550,8 @@ describe('updateDraftSubmission', () => { it('updates a submission with conditionals in contract amendment details', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-06' @@ -583,8 +581,8 @@ describe('updateDraftSubmission', () => { actuaryContacts: [], } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -596,11 +594,11 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() const resultDraft = - updateResult.data.updateDraftSubmission.draftSubmission + updateResult.data?.updateDraftSubmission.draftSubmission // also check on the fetch of the same const fetchedDraft = await fetchTestDraftSubmissionById( - query, + server, createdID ) @@ -628,9 +626,8 @@ describe('updateDraftSubmission', () => { it('updates a submission to have a new rate', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-01' const endDate = '2022-06-30' @@ -653,8 +650,8 @@ describe('updateDraftSubmission', () => { ...rateDetails, } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -666,7 +663,7 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() const resultDraft = - updateResult.data.updateDraftSubmission.draftSubmission + updateResult.data?.updateDraftSubmission.draftSubmission expect(resultDraft.id).toEqual(createdID) expect(resultDraft.rateType).toEqual(rateDetails.rateType) @@ -680,9 +677,8 @@ describe('updateDraftSubmission', () => { it('updates a submission to have a rate amendment', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-01' const endDate = '2022-06-30' @@ -709,8 +705,8 @@ describe('updateDraftSubmission', () => { ...rateAmendment, } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -722,7 +718,7 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() const resultDraft = - updateResult.data.updateDraftSubmission.draftSubmission + updateResult.data?.updateDraftSubmission.draftSubmission expect(resultDraft.id).toEqual(createdID) expect(resultDraft.rateType).toEqual(rateAmendment.rateType) @@ -741,9 +737,8 @@ describe('updateDraftSubmission', () => { it('updates a submission to remove existing documents', async () => { const server = constructTestServer() - const { query, mutate } = createTestClient(server) - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const updatedDraftWithDocs = { @@ -772,13 +767,13 @@ describe('updateDraftSubmission', () => { email: 'test@test.com', actuarialFirm: 'MERCER' as const, actuarialFirmOther: '', - } + }, ], actuaryCommunicationPreference: 'OACT_TO_ACTUARY' as const, } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -789,7 +784,10 @@ describe('updateDraftSubmission', () => { expect(updateResult.errors).toBeUndefined() - const resultDraft = await fetchTestDraftSubmissionById(query, createdID) + const resultDraft = await fetchTestDraftSubmissionById( + server, + createdID + ) expect(resultDraft.id).toEqual(createdID) expect(resultDraft.documents).toEqual([ { @@ -820,13 +818,13 @@ describe('updateDraftSubmission', () => { email: 'test@test.com', actuarialFirm: 'MERCER' as const, actuarialFirmOther: '', - } + }, ], actuaryCommunicationPreference: 'OACT_TO_ACTUARY' as const, } - const updateResult2 = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult2 = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -835,14 +833,13 @@ describe('updateDraftSubmission', () => { }, }) const resultDraft2 = - updateResult2.data.updateDraftSubmission.draftSubmission + updateResult2.data?.updateDraftSubmission.draftSubmission expect(resultDraft2.documents).toEqual([]) }) it('errors if the ID does not exist', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) const startDate = '2021-07-06' const endDate = '2021-07-12' @@ -860,8 +857,8 @@ describe('updateDraftSubmission', () => { actuaryContacts: [], } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: 'foo-bar-123', @@ -886,23 +883,21 @@ describe('updateDraftSubmission', () => { it('returns an error if you are requesting for a different state (403)', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - // SETUP: First, create a new submission const createInput: CreateDraftSubmissionInput = { programID: 'smmc', submissionType: 'CONTRACT_ONLY', submissionDescription: 'A created submission', } - const createResult = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const createResult = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input: createInput }, }) expect(createResult.errors).toBeUndefined() const createdDraft = - createResult.data.createDraftSubmission.draftSubmission + createResult.data?.createDraftSubmission.draftSubmission // ACT: next, update that submission but from a user from a diferent state const createdID = createdDraft.id @@ -919,7 +914,6 @@ describe('updateDraftSubmission', () => { }, }) - const { mutate: otherMutate } = createTestClient(otherUserServer) const startDate = '2021-07-06' const endDate = '2021-07-12' const updatedDraft = { @@ -936,8 +930,8 @@ describe('updateDraftSubmission', () => { actuaryContacts: [], } - const updateResult = await otherMutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await otherUserServer.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, @@ -958,9 +952,7 @@ describe('updateDraftSubmission', () => { it('returns an error if you try and set a programID thats not valid', async () => { const server = constructTestServer() - const { mutate } = createTestClient(server) - - const createdDraft = await createTestDraftSubmission(mutate) + const createdDraft = await createTestDraftSubmission(server) const createdID = createdDraft.id const startDate = '2021-07-06' const endDate = '2021-07-12' @@ -979,8 +971,8 @@ describe('updateDraftSubmission', () => { actuaryContacts: [], } - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: createdID, diff --git a/services/app-api/testHelpers/gqlHelpers.ts b/services/app-api/testHelpers/gqlHelpers.ts index ff868f07a3..203a8ddf4f 100644 --- a/services/app-api/testHelpers/gqlHelpers.ts +++ b/services/app-api/testHelpers/gqlHelpers.ts @@ -1,5 +1,4 @@ import { ApolloServer } from 'apollo-server-lambda' -import { ApolloServerTestClient } from 'apollo-server-testing' import { getTestStore } from '../testHelpers/storeHelpers' import CREATE_DRAFT_SUBMISSION from '../../app-graphql/src/mutations/createDraftSubmission.graphql' @@ -39,37 +38,39 @@ const constructTestServer = ( new ApolloServer({ typeDefs, resolvers: testResolvers, - playground: { - endpoint: '/local/graphql', - }, context, }) const createTestDraftSubmission = async ( - mutate: ApolloServerTestClient['mutate'] + server: ApolloServer ): Promise => { const input: CreateDraftSubmissionInput = { programID: 'smmc', submissionType: 'CONTRACT_ONLY' as const, submissionDescription: 'A created submission', } - const result = await mutate({ - mutation: CREATE_DRAFT_SUBMISSION, + const result = await server.executeOperation({ + query: CREATE_DRAFT_SUBMISSION, variables: { input }, }) - if (result.errors) + if (result.errors) { throw new Error('createTestDraftSubmission mutation failed with errors') + } + + if (!result.data) { + throw new Error('createTestDraftSubmission returned nothing') + } return result.data.createDraftSubmission.draftSubmission } const updateTestDraftSubmission = async ( - mutate: ApolloServerTestClient['mutate'], + server: ApolloServer, id: string, updates: DraftSubmissionUpdates ): Promise => { - const updateResult = await mutate({ - mutation: UPDATE_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: UPDATE_DRAFT_SUBMISSION, variables: { input: { submissionID: id, @@ -83,16 +84,20 @@ const updateTestDraftSubmission = async ( throw new Error('updateTestDraftSubmission mutation failed with errors') } + if (!updateResult.data) { + throw new Error('updateTestDraftSubmission returned nothing') + } + return updateResult.data.updateDraftSubmission.draftSubmission } const createAndUpdateTestDraftSubmission = async ( - mutate: ApolloServerTestClient['mutate'], + server: ApolloServer, partialDraftSubmissionUpdates?: Partial< UpdateDraftSubmissionInput['draftSubmissionUpdates'] > ): Promise => { - const draft = await createTestDraftSubmission(mutate) + const draft = await createTestDraftSubmission(server) const startDate = '2025-05-01' const endDate = '2026-04-30' const dateCertified = '2025-03-15' @@ -112,7 +117,7 @@ const createAndUpdateTestDraftSubmission = async ( name: 'test name', titleRole: 'test title', email: 'email@test.com', - } + }, ], actuaryContacts: [ { @@ -121,7 +126,7 @@ const createAndUpdateTestDraftSubmission = async ( email: 'email@test.com', actuarialFirm: 'MERCER' as const, actuarialFirmOther: '', - } + }, ], actuaryCommunicationPreference: 'OACT_TO_ACTUARY' as const, contractType: 'BASE' as const, @@ -137,7 +142,7 @@ const createAndUpdateTestDraftSubmission = async ( } const updatedDraft = await updateTestDraftSubmission( - mutate, + server, draft.id, updates ) @@ -146,11 +151,11 @@ const createAndUpdateTestDraftSubmission = async ( } const submitTestDraftSubmission = async ( - mutate: ApolloServerTestClient['mutate'], + server: ApolloServer, submissionID: string ) => { - const updateResult = await mutate({ - mutation: SUBMIT_DRAFT_SUBMISSION, + const updateResult = await server.executeOperation({ + query: SUBMIT_DRAFT_SUBMISSION, variables: { input: { submissionID, @@ -163,25 +168,29 @@ const submitTestDraftSubmission = async ( throw new Error('updateTestDraftSubmission mutation failed with errors') } + if (updateResult.data === undefined || updateResult.data === null) { + throw new Error('updateTestDraftSubmission returned nothing') + } + return updateResult.data.submitDraftSubmission.submission } const createTestStateSubmission = async ( - mutate: ApolloServerTestClient['mutate'] + server: ApolloServer ): Promise => { - const draft = await createAndUpdateTestDraftSubmission(mutate) + const draft = await createAndUpdateTestDraftSubmission(server) - const updatedSubmission = await submitTestDraftSubmission(mutate, draft.id) + const updatedSubmission = await submitTestDraftSubmission(server, draft.id) return updatedSubmission } const fetchTestDraftSubmissionById = async ( - query: ApolloServerTestClient['query'], + server: ApolloServer, submissionID: string ): Promise => { const input = { submissionID } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_DRAFT_SUBMISSION, variables: { input }, }) @@ -189,15 +198,19 @@ const fetchTestDraftSubmissionById = async ( if (result.errors) throw new Error('fetchTestDraftSubmission query failed with errors') + if (!result.data) { + throw new Error('fetchTestDraftSubmission returned nothing') + } + return result.data.fetchDraftSubmission.draftSubmission } const fetchTestStateSubmissionById = async ( - query: ApolloServerTestClient['query'], + server: ApolloServer, submissionID: string ): Promise => { const input = { submissionID } - const result = await query({ + const result = await server.executeOperation({ query: FETCH_STATE_SUBMISSION, variables: { input }, }) @@ -207,6 +220,10 @@ const fetchTestStateSubmissionById = async ( throw new Error('fetchTestStateSubmissionById query failed with errors') } + if (!result.data) { + throw new Error('fetchTestStateSubmissionById returned nothing') + } + return result.data.fetchStateSubmission.submission } diff --git a/services/app-api/yarn.lock b/services/app-api/yarn.lock index d5ccab9e60..76bcd72f7b 100644 --- a/services/app-api/yarn.lock +++ b/services/app-api/yarn.lock @@ -29,18 +29,11 @@ "@types/node" "^10.1.0" long "^4.0.0" -"@apollographql/apollo-tools@^0.5.0", "@apollographql/apollo-tools@^0.5.1": +"@apollographql/apollo-tools@^0.5.1": version "0.5.1" resolved "https://registry.yarnpkg.com/@apollographql/apollo-tools/-/apollo-tools-0.5.1.tgz#f0baef739ff7e2fafcb8b98ad29f6ac817e53e32" integrity sha512-ZII+/xUFfb9ezDU2gad114+zScxVFMVlZ91f8fGApMzlS1kkqoyLnC4AJaQ1Ya/X+b63I20B4Gd+eCL8QuB4sA== -"@apollographql/graphql-playground-html@1.6.27": - version "1.6.27" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.27.tgz#bc9ab60e9445aa2a8813b4e94f152fa72b756335" - integrity sha512-tea2LweZvn6y6xFV11K0KC8ETjmm52mQrW+ezgB2O/aTQf8JGyFmMcRPFgUaQZeHbWdm8iisDC6EjOKsXu0nfw== - dependencies: - xss "^1.0.8" - "@apollographql/graphql-playground-html@1.6.29": version "1.6.29" resolved "https://registry.yarnpkg.com/@apollographql/graphql-playground-html/-/graphql-playground-html-1.6.29.tgz#a7a646614a255f62e10dcf64a7f68ead41dec453" @@ -48,19 +41,6 @@ dependencies: xss "^1.0.8" -"@apollographql/graphql-upload-8-fork@^8.1.3": - version "8.1.3" - resolved "https://registry.yarnpkg.com/@apollographql/graphql-upload-8-fork/-/graphql-upload-8-fork-8.1.3.tgz#a0d4e0d5cec8e126d78bd915c264d6b90f5784bc" - integrity sha512-ssOPUT7euLqDXcdVv3Qs4LoL4BPtfermW1IOouaqEmj36TpHYDmYDIbKoSQxikd9vtMumFnP87OybH7sC9fJ6g== - dependencies: - "@types/express" "*" - "@types/fs-capacitor" "*" - "@types/koa" "*" - busboy "^0.3.1" - fs-capacitor "^2.0.4" - http-errors "^1.7.3" - object-path "^0.11.4" - "@aws/dynamodb-auto-marshaller@^0.7.1": version "0.7.1" resolved "https://registry.yarnpkg.com/@aws/dynamodb-auto-marshaller/-/dynamodb-auto-marshaller-0.7.1.tgz#70676c056e4ecb798c08ec2e398a3d93e703858d" @@ -1998,7 +1978,7 @@ resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276" integrity sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A== -"@types/accepts@*", "@types/accepts@^1.3.5": +"@types/accepts@^1.3.5": version "1.3.5" resolved "https://registry.yarnpkg.com/@types/accepts/-/accepts-1.3.5.tgz#c34bec115cfc746e04fe5a059df4ce7e7b391575" integrity sha512-jOdnI/3qTpHABjM5cx1Hc0sKsPoYCp+DP/GJRGtDlPd7fiV9oXGGIcjW/ZOxLIvjGz8MA+uMZI9metHlgqbgwQ== @@ -2081,21 +2061,6 @@ dependencies: "@types/node" "*" -"@types/content-disposition@*": - version "0.5.3" - resolved "https://registry.yarnpkg.com/@types/content-disposition/-/content-disposition-0.5.3.tgz#0aa116701955c2faa0717fc69cd1596095e49d96" - integrity sha512-P1bffQfhD3O4LW0ioENXUhZ9OIa0Zn+P7M+pWgkCKaT53wVLSq0mrKksCID/FGHpFhRSxRGhgrQmfhRuzwtKdg== - -"@types/cookies@*": - version "0.7.6" - resolved "https://registry.yarnpkg.com/@types/cookies/-/cookies-0.7.6.tgz#71212c5391a976d3bae57d4b09fac20fc6bda504" - integrity sha512-FK4U5Qyn7/Sc5ih233OuHO0qAkOpEcD/eG6584yEiLKizTFRny86qHLe/rej3HFQrkBuUjF4whFliAdODbVN/w== - dependencies: - "@types/connect" "*" - "@types/express" "*" - "@types/keygrip" "*" - "@types/node" "*" - "@types/cors@2.8.12": version "2.8.12" resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080" @@ -2119,16 +2084,6 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@*": - version "4.17.11" - resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545" - integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg== - dependencies: - "@types/body-parser" "*" - "@types/express-serve-static-core" "^4.17.18" - "@types/qs" "*" - "@types/serve-static" "*" - "@types/express@4.17.13": version "4.17.13" resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034" @@ -2139,13 +2094,6 @@ "@types/qs" "*" "@types/serve-static" "*" -"@types/fs-capacitor@*": - version "2.0.0" - resolved "https://registry.yarnpkg.com/@types/fs-capacitor/-/fs-capacitor-2.0.0.tgz#17113e25817f584f58100fb7a08eed288b81956e" - integrity sha512-FKVPOCFbhCvZxpVAMhdBdTfVfXUpsh15wFHgqOKxh9N9vzWZVuWCSijZ5T4U34XYNnuj2oduh6xcs1i+LPI+BQ== - dependencies: - "@types/node" "*" - "@types/graceful-fs@^4.1.2": version "4.1.5" resolved "https://registry.yarnpkg.com/@types/graceful-fs/-/graceful-fs-4.1.5.tgz#21ffba0d98da4350db64891f92a9e5db3cdb4e15" @@ -2153,21 +2101,11 @@ dependencies: "@types/node" "*" -"@types/http-assert@*": - version "1.5.1" - resolved "https://registry.yarnpkg.com/@types/http-assert/-/http-assert-1.5.1.tgz#d775e93630c2469c2f980fc27e3143240335db3b" - integrity sha512-PGAK759pxyfXE78NbKxyfRcWYA/KwW17X290cNev/qAsn9eQIxkH4shoNBafH37wewhDG/0p1cHPbK6+SzZjWQ== - "@types/http-cache-semantics@*": version "4.0.1" resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== -"@types/http-errors@*": - version "1.8.0" - resolved "https://registry.yarnpkg.com/@types/http-errors/-/http-errors-1.8.0.tgz#682477dbbbd07cd032731cb3b0e7eaee3d026b69" - integrity sha512-2aoSC4UUbHDj2uCsCxcG/vRMXey/m17bC7UwitVm5hn22nI8O8Y9iDpA76Orc+DWkQ4zZrOKEshCqR/jSuXAHA== - "@types/istanbul-lib-coverage@*", "@types/istanbul-lib-coverage@^2.0.0", "@types/istanbul-lib-coverage@^2.0.1": version "2.0.3" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762" @@ -2210,11 +2148,6 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= -"@types/keygrip@*": - version "1.0.2" - resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.2.tgz#513abfd256d7ad0bf1ee1873606317b33b1b2a72" - integrity sha512-GJhpTepz2udxGexqos8wgaBx4I/zWIDPh/KOGEwAqtuGDkOUJu5eFvwmdBX4AmB8Odsr+9pHCQqiAqDL/yKMKw== - "@types/keyv@*": version "3.1.2" resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.2.tgz#5d97bb65526c20b6e0845f6b0d2ade4f28604ee5" @@ -2222,27 +2155,6 @@ dependencies: "@types/node" "*" -"@types/koa-compose@*": - version "3.2.5" - resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.5.tgz#85eb2e80ac50be95f37ccf8c407c09bbe3468e9d" - integrity sha512-B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ== - dependencies: - "@types/koa" "*" - -"@types/koa@*": - version "2.11.8" - resolved "https://registry.yarnpkg.com/@types/koa/-/koa-2.11.8.tgz#b3fa4bf0baa518b71cb0c14b8a354b6292bea883" - integrity sha512-8LJHhlEjxvEb9MR06zencOxZyxpTHG2u6pcvJbSBN9DRBc+GYQ9hFI8sSH7dvYoITKeAGWo2eVPKx1Z/zX/yKw== - dependencies: - "@types/accepts" "*" - "@types/content-disposition" "*" - "@types/cookies" "*" - "@types/http-assert" "*" - "@types/http-errors" "*" - "@types/keygrip" "*" - "@types/koa-compose" "*" - "@types/node" "*" - "@types/lodash@^4.14.123": version "4.14.172" resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.172.tgz#aad774c28e7bfd7a67de25408e03ee5a8c3d028a" @@ -2345,13 +2257,6 @@ resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f" integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg== -"@types/ws@^7.0.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@types/ws/-/ws-7.4.0.tgz#499690ea08736e05a8186113dac37769ab251a0e" - integrity sha512-Y29uQ3Uy+58bZrFLhX36hcI3Np37nqWE7ky5tjiDoy1GDZnIwVxS0CgF+s+1bXMzjKBFy+fqaRfb708iNzdinw== - dependencies: - "@types/node" "*" - "@types/yargs-parser@*": version "20.2.0" resolved "https://registry.yarnpkg.com/@types/yargs-parser/-/yargs-parser-20.2.0.tgz#dd3e6699ba3237f0348cd085e4698780204842f9" @@ -2629,13 +2534,6 @@ "@webassemblyjs/wast-parser" "1.9.0" "@xtuc/long" "4.2.2" -"@wry/equality@^0.1.2": - version "0.1.11" - resolved "https://registry.yarnpkg.com/@wry/equality/-/equality-0.1.11.tgz#35cb156e4a96695aa81a9ecc4d03787bc17f1790" - integrity sha512-mwEVBDUVODlsQQ5dfuLUS5/Tf7jqUKyhKYHmVi4fPB6bDMOfWvUPJmKgS1Z7Za/sOI3vzWt4+O7yCiL/70MogA== - dependencies: - tslib "^1.9.3" - "@xtuc/ieee754@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" @@ -2821,22 +2719,6 @@ anymatch@^3.0.3, anymatch@~3.1.1, anymatch@~3.1.2: normalize-path "^3.0.0" picomatch "^2.0.4" -apollo-cache-control@^0.14.0: - version "0.14.0" - resolved "https://registry.yarnpkg.com/apollo-cache-control/-/apollo-cache-control-0.14.0.tgz#95f20c3e03e7994e0d1bd48c59aeaeb575ed0ce7" - integrity sha512-qN4BCq90egQrgNnTRMUHikLZZAprf3gbm8rC5Vwmc6ZdLolQ7bFsa769Hqi6Tq/lS31KLsXBLTOsRbfPHph12w== - dependencies: - apollo-server-env "^3.1.0" - apollo-server-plugin-base "^0.13.0" - -apollo-datasource@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-0.9.0.tgz#b0b2913257a6103a5f4c03cb56d78a30e9d850db" - integrity sha512-y8H99NExU1Sk4TvcaUxTdzfq2SZo6uSj5dyh75XSQvbpH6gdAXIW9MaBcvlNC7n0cVPsidHmOcHOWxJ/pTXGjA== - dependencies: - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - apollo-datasource@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/apollo-datasource/-/apollo-datasource-3.0.3.tgz#616ccf2cbfaa6d9bf04520bf7d80da0e372eee5c" @@ -2854,23 +2736,6 @@ apollo-graphql@^0.9.0: lodash.sortby "^4.7.0" sha.js "^2.4.11" -apollo-link@^1.2.14: - version "1.2.14" - resolved "https://registry.yarnpkg.com/apollo-link/-/apollo-link-1.2.14.tgz#3feda4b47f9ebba7f4160bef8b977ba725b684d9" - integrity sha512-p67CMEFP7kOG1JZ0ZkYZwRDa369w5PIjtMjvrQd/HnIV8FRsHRqLqK+oAZQnFa1DDdZtOtHTi+aMIW6EatC2jg== - dependencies: - apollo-utilities "^1.3.0" - ts-invariant "^0.4.0" - tslib "^1.9.3" - zen-observable-ts "^0.8.21" - -apollo-reporting-protobuf@^0.8.0: - version "0.8.0" - resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.8.0.tgz#ae9d967934d3d8ed816fc85a0d8068ef45c371b9" - integrity sha512-B3XmnkH6Y458iV6OsA7AhfwvTgeZnFq9nPVjbxmLKnvfkEl8hYADtz724uPa0WeBiD7DSFcnLtqg9yGmCkBohg== - dependencies: - "@apollo/protobufjs" "1.2.2" - apollo-reporting-protobuf@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/apollo-reporting-protobuf/-/apollo-reporting-protobuf-3.0.0.tgz#a53966b76a3f373d9336bc953f0bc6dede487270" @@ -2878,13 +2743,6 @@ apollo-reporting-protobuf@^3.0.0: dependencies: "@apollo/protobufjs" "1.2.2" -apollo-server-caching@^0.7.0: - version "0.7.0" - resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-0.7.0.tgz#e6d1e68e3bb571cba63a61f60b434fb771c6ff39" - integrity sha512-MsVCuf/2FxuTFVhGLK13B+TZH9tBd2qkyoXKKILIiGcZ5CDUEBO14vIV63aNkMkS1xxvK2U4wBcuuNj/VH2Mkw== - dependencies: - lru-cache "^6.0.0" - apollo-server-caching@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/apollo-server-caching/-/apollo-server-caching-3.0.1.tgz#bb6e51442266cb3ff05611c24c4e2f2fe8d6949e" @@ -2892,37 +2750,6 @@ apollo-server-caching@^3.0.1: dependencies: lru-cache "^6.0.0" -apollo-server-core@^2.25.2: - version "2.25.2" - resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-2.25.2.tgz#ff65da5e512d9b5ca54c8e5e8c78ee28b5987247" - integrity sha512-lrohEjde2TmmDTO7FlOs8x5QQbAS0Sd3/t0TaK2TWaodfzi92QAvIsq321Mol6p6oEqmjm8POIDHW1EuJd7XMA== - dependencies: - "@apollographql/apollo-tools" "^0.5.0" - "@apollographql/graphql-playground-html" "1.6.27" - "@apollographql/graphql-upload-8-fork" "^8.1.3" - "@josephg/resolvable" "^1.0.0" - "@types/ws" "^7.0.0" - apollo-cache-control "^0.14.0" - apollo-datasource "^0.9.0" - apollo-graphql "^0.9.0" - apollo-reporting-protobuf "^0.8.0" - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - apollo-server-errors "^2.5.0" - apollo-server-plugin-base "^0.13.0" - apollo-server-types "^0.9.0" - apollo-tracing "^0.15.0" - async-retry "^1.2.1" - fast-json-stable-stringify "^2.0.0" - graphql-extensions "^0.15.0" - graphql-tag "^2.11.0" - graphql-tools "^4.0.8" - loglevel "^1.6.7" - lru-cache "^6.0.0" - sha.js "^2.4.11" - subscriptions-transport-ws "^0.9.19" - uuid "^8.0.0" - apollo-server-core@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/apollo-server-core/-/apollo-server-core-3.1.2.tgz#a9d24b9453b7aad89df464f6527d80e2f46b0a6f" @@ -2950,14 +2777,6 @@ apollo-server-core@^3.1.2: sha.js "^2.4.11" uuid "^8.0.0" -apollo-server-env@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-3.1.0.tgz#0733c2ef50aea596cc90cf40a53f6ea2ad402cd0" - integrity sha512-iGdZgEOAuVop3vb0F2J3+kaBVi4caMoxefHosxmgzAbbSpvWehB8Y1QiSyyMeouYC38XNVk5wnZl+jdGSsWsIQ== - dependencies: - node-fetch "^2.6.1" - util.promisify "^1.0.0" - apollo-server-env@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/apollo-server-env/-/apollo-server-env-4.0.3.tgz#082a5c1dd4dfb3b34de5e1fa7dc170dd15a5062f" @@ -2965,11 +2784,6 @@ apollo-server-env@^4.0.3: dependencies: node-fetch "^2.6.1" -apollo-server-errors@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-2.5.0.tgz#5d1024117c7496a2979e3e34908b5685fe112b68" - integrity sha512-lO5oTjgiC3vlVg2RKr3RiXIIQ5pGXBFxYGGUkKDhTud3jMIhs+gel8L8zsEjKaKxkjHhCQAA/bcEfYiKkGQIvA== - apollo-server-errors@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/apollo-server-errors/-/apollo-server-errors-3.0.1.tgz#0dfcc1fe8b10eab311fc7e4f6da93189ea6bcdae" @@ -3003,13 +2817,6 @@ apollo-server-lambda@^3.1.2: apollo-server-express "^3.1.2" express "^4.17.1" -apollo-server-plugin-base@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-0.13.0.tgz#3f85751a420d3c4625355b6cb3fbdd2acbe71f13" - integrity sha512-L3TMmq2YE6BU6I4Tmgygmd0W55L+6XfD9137k+cWEBFu50vRY4Re+d+fL5WuPkk5xSPKd/PIaqzidu5V/zz8Kg== - dependencies: - apollo-server-types "^0.9.0" - apollo-server-plugin-base@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/apollo-server-plugin-base/-/apollo-server-plugin-base-3.1.1.tgz#b2d8d50c52af7c004fd63e04c53f2d2bf800c4df" @@ -3017,22 +2824,6 @@ apollo-server-plugin-base@^3.1.1: dependencies: apollo-server-types "^3.1.1" -apollo-server-testing@^2.25.2: - version "2.25.2" - resolved "https://registry.yarnpkg.com/apollo-server-testing/-/apollo-server-testing-2.25.2.tgz#0043e98b1a03720352e94b409215fb4782ae2e50" - integrity sha512-HjQV9wPbi/ZqpRbyyhNwCbaDnfjDM0hTRec5TOoOjurEZ/vh4hTPHwGkDZx3kbcWowhGxe2qoHM6KANSB/SxuA== - dependencies: - apollo-server-core "^2.25.2" - -apollo-server-types@^0.9.0: - version "0.9.0" - resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-0.9.0.tgz#ccf550b33b07c48c72f104fbe2876232b404848b" - integrity sha512-qk9tg4Imwpk732JJHBkhW0jzfG0nFsLqK2DY6UhvJf7jLnRePYsPxWfPiNkxni27pLE2tiNlCwoDFSeWqpZyBg== - dependencies: - apollo-reporting-protobuf "^0.8.0" - apollo-server-caching "^0.7.0" - apollo-server-env "^3.1.0" - apollo-server-types@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/apollo-server-types/-/apollo-server-types-3.1.1.tgz#a45bf4d7c978340dc7c7dff317628629bdc53443" @@ -3042,24 +2833,6 @@ apollo-server-types@^3.1.1: apollo-server-caching "^3.0.1" apollo-server-env "^4.0.3" -apollo-tracing@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/apollo-tracing/-/apollo-tracing-0.15.0.tgz#237fbbbf669aee4370b7e9081b685eabaa8ce84a" - integrity sha512-UP0fztFvaZPHDhIB/J+qGuy6hWO4If069MGC98qVs0I8FICIGu4/8ykpX3X3K6RtaQ56EDAWKykCxFv4ScxMeA== - dependencies: - apollo-server-env "^3.1.0" - apollo-server-plugin-base "^0.13.0" - -apollo-utilities@^1.0.1, apollo-utilities@^1.3.0: - version "1.3.4" - resolved "https://registry.yarnpkg.com/apollo-utilities/-/apollo-utilities-1.3.4.tgz#6129e438e8be201b6c55b0f13ce49d2c7175c9cf" - integrity sha512-pk2hiWrCXMAy2fRPwEyhvka+mqwzeP60Jr1tRYi5xru+3ko94HI9o6lK0CT33/w4RDlxWchmdhDCrvdr+pHCig== - dependencies: - "@wry/equality" "^0.1.2" - fast-json-stable-stringify "^2.0.0" - ts-invariant "^0.4.0" - tslib "^1.10.0" - aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -3393,7 +3166,7 @@ babel-preset-jest@^26.6.2: babel-plugin-jest-hoist "^26.6.2" babel-preset-current-node-syntax "^1.0.0" -backo2@1.0.2, backo2@^1.0.2: +backo2@1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947" integrity sha1-MasayLEpNjRj41s+u2n038+6eUc= @@ -3767,13 +3540,6 @@ builtin-status-codes@^3.0.0: resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" integrity sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug= -busboy@^0.3.1: - version "0.3.1" - resolved "https://registry.yarnpkg.com/busboy/-/busboy-0.3.1.tgz#170899274c5bf38aae27d5c62b71268cd585fd1b" - integrity sha512-y7tTxhGKXcyBxRKAni+awqx8uqaJKrSFSNFSeRG5CsWNdmy2BIK+6VGWEW7TZnIO/533mtMEA4rOevQV815YJw== - dependencies: - dicer "0.3.0" - bytes@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6" @@ -4858,11 +4624,6 @@ depd@~1.1.2: resolved "https://registry.yarnpkg.com/depd/-/depd-1.1.2.tgz#9bcd52e14c097763e749b274c4346ed2e560b5a9" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= -deprecated-decorator@^0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37" - integrity sha1-AJZjF7ehL+kvPMgx91g68ym4bDc= - des.js@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843" @@ -4900,13 +4661,6 @@ diagnostics@^1.1.1: enabled "1.0.x" kuler "1.0.x" -dicer@0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/dicer/-/dicer-0.3.0.tgz#eacd98b3bfbf92e8ab5c2fdb71aaac44bb06b872" - integrity sha512-MdceRRWqltEG2dZqO769g27N/3PXfcKl04VhYnBlo2YhH7zPi88VebsjTKclaOyiuMaGU72hTfw3VkUitGcVCA== - dependencies: - streamsearch "0.1.2" - diff-sequences@^26.6.2: version "26.6.2" resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" @@ -5491,11 +5245,6 @@ event-emitter@^0.3.5, event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -eventemitter3@^3.1.0: - version "3.1.2" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.2.tgz#2d3d48f9c346698fce83a85d7d664e98535df6e7" - integrity sha512-tvtQIeLVHjDkJYnzf2dgVMxfuSGJeM/7UCG17TT4EumTfNtF+0nebF/4zWOIkCreAbtNqhGEboB6BWrwqNaw4Q== - eventemitter3@^4.0.4: version "4.0.7" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" @@ -5972,13 +5721,6 @@ follow-redirects@^1.10.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43" integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg== -for-each@^0.3.3: - version "0.3.3" - resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" - integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw== - dependencies: - is-callable "^1.1.3" - for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -6056,11 +5798,6 @@ from2@^2.1.0: inherits "^2.0.1" readable-stream "^2.0.0" -fs-capacitor@^2.0.4: - version "2.0.4" - resolved "https://registry.yarnpkg.com/fs-capacitor/-/fs-capacitor-2.0.4.tgz#5a22e72d40ae5078b4fe64fe4d08c0d3fc88ad3c" - integrity sha512-8S4f4WsCryNw2mJJchi46YgB6CR5Ze+4L1h8ewl9tEpL4SJ3ZO+c/bS4BWhB8bK+O3TMqhuZarTitd0S0eh2pA== - fs-constants@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad" @@ -6360,15 +6097,6 @@ graphlib@^2.1.8: dependencies: lodash "^4.17.15" -graphql-extensions@^0.15.0: - version "0.15.0" - resolved "https://registry.yarnpkg.com/graphql-extensions/-/graphql-extensions-0.15.0.tgz#3f291f9274876b0c289fa4061909a12678bd9817" - integrity sha512-bVddVO8YFJPwuACn+3pgmrEg6I8iBuYLuwvxiE+lcQQ7POotVZxm2rgGw0PvVYmWWf3DT7nTVDZ5ROh/ALp8mA== - dependencies: - "@apollographql/apollo-tools" "^0.5.0" - apollo-server-env "^3.1.0" - apollo-server-types "^0.9.0" - graphql-scalars@^1.10.0: version "1.10.0" resolved "https://registry.yarnpkg.com/graphql-scalars/-/graphql-scalars-1.10.0.tgz#9daf9252b16e6fae553a06976163a23f41b65dfd" @@ -6383,17 +6111,6 @@ graphql-tag@^2.10.3, graphql-tag@^2.11.0: dependencies: tslib "^2.1.0" -graphql-tools@^4.0.8: - version "4.0.8" - resolved "https://registry.yarnpkg.com/graphql-tools/-/graphql-tools-4.0.8.tgz#e7fb9f0d43408fb0878ba66b522ce871bafe9d30" - integrity sha512-MW+ioleBrwhRjalKjYaLQbr+920pHBgy9vM/n47sswtns8+96sRn5M/G+J1eu7IMeKWiN/9p6tmwCHU7552VJg== - dependencies: - apollo-link "^1.2.14" - apollo-utilities "^1.0.1" - deprecated-decorator "^0.1.6" - iterall "^1.1.3" - uuid "^3.1.0" - graphql@^14.6.0: version "14.7.0" resolved "https://registry.yarnpkg.com/graphql/-/graphql-14.7.0.tgz#7fa79a80a69be4a31c27dda824dc04dac2035a72" @@ -6584,17 +6301,6 @@ http-errors@1.7.2: statuses ">= 1.5.0 < 2" toidentifier "1.0.0" -http-errors@^1.7.3: - version "1.8.0" - resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.8.0.tgz#75d1bbe497e1044f51e4ee9e704a62f28d336507" - integrity sha512-4I8r0C5JDhT5VkvI47QktDW75rNlGVsUf/8hzjCC/wkWI/jdTRmBb9aI7erSG82r1bjKY3F6k28WnsVxB1C73A== - dependencies: - depd "~1.1.2" - inherits "2.0.4" - setprototypeof "1.2.0" - statuses ">= 1.5.0 < 2" - toidentifier "1.0.0" - http-errors@~1.7.2: version "1.7.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06" @@ -6868,11 +6574,6 @@ is-builtin-module@^3.1.0: dependencies: builtin-modules "^3.0.0" -is-callable@^1.1.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.3.tgz#8b1e0500b73a1d76c70487636f368e519de8db8e" - integrity sha512-J1DcMe8UYTBSrKezuIUTUwjXsho29693unXM2YhJUTR2txK/eG47bvNa/wipPFmZFgr/N6f1GA66dv0mEyTIyQ== - is-callable@^1.1.4, is-callable@^1.2.2: version "1.2.2" resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz#c7c6715cd22d4ddb48d3e19970223aceabb080d9" @@ -7200,7 +6901,7 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -iterall@^1.1.3, iterall@^1.2.1, iterall@^1.2.2: +iterall@^1.2.2: version "1.3.0" resolved "https://registry.yarnpkg.com/iterall/-/iterall-1.3.0.tgz#afcb08492e2915cbd8a0884eb93a8c94d0d72fea" integrity sha512-QZ9qOMdF+QLHxy1QIpUHUU1D5pS2CG2P69LF6L6CPjPYA/XMOmKV3PZpawHoAjHNyB0swdVTRxdYT4tbBbxqwg== @@ -8111,7 +7812,7 @@ logform@^2.1.1: ms "^2.1.1" triple-beam "^1.3.0" -loglevel@^1.6.7, loglevel@^1.6.8: +loglevel@^1.6.8: version "1.7.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.1.tgz#005fde2f5e6e47068f935ff28573e125ef72f197" integrity sha512-Hesni4s5UkWkwCGJMQGAh71PaLUmKFM60dHvq0zi/vDhhrzuk+4GgNbTXJ12YYQJn6ZKBDNIjYcuQGKudvqrIw== @@ -8837,11 +8538,6 @@ object-keys@^1.0.12, object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.1.1.tgz#1c47f272df277f3b1daf061677d9c82e2322c60e" integrity sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA== -object-path@^0.11.4: - version "0.11.5" - resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.11.5.tgz#d4e3cf19601a5140a55a16ad712019a9c50b577a" - integrity sha512-jgSbThcoR/s+XumvGMTMf81QVBmah+/Q7K7YduKeKVWL7N111unR2d6pZZarSk6kY/caeNxUDyxOvMWyzoU2eg== - object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -8869,15 +8565,6 @@ object.fromentries@^2.0.2: es-abstract "^1.18.0-next.1" has "^1.0.3" -object.getownpropertydescriptors@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.1.tgz#0dfda8d108074d9c563e80490c883b6661091544" - integrity sha512-6DtXgZ/lIZ9hqx4GtZETobXLR/ZLaa0aqV0kzbn80Rf8Z2e/XFnhA0I7p07N2wH8bBBltr2xQPi6sbKWAY2Eng== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - es-abstract "^1.18.0-next.1" - object.pick@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747" @@ -10540,11 +10227,6 @@ setprototypeof@1.1.1: resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683" integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw== -setprototypeof@1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424" - integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw== - sha.js@^2.4.0, sha.js@^2.4.11, sha.js@^2.4.8: version "2.4.11" resolved "https://registry.yarnpkg.com/sha.js/-/sha.js-2.4.11.tgz#37a5cf0b81ecbc6943de109ba2960d1b26584ae7" @@ -10946,11 +10628,6 @@ stream-shift@^1.0.0: resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.1.tgz#d7088281559ab2778424279b0877da3c392d5a3d" integrity sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ== -streamsearch@0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/streamsearch/-/streamsearch-0.1.2.tgz#808b9d0e56fc273d809ba57338e929919a1a9f1a" - integrity sha1-gIudDlb8Jz2Am6VzOOkpkZoanxo= - string-length@^4.0.1: version "4.0.2" resolved "https://registry.yarnpkg.com/string-length/-/string-length-4.0.2.tgz#a8a8dc7bd5c1a82b9b3c8b87e125f66871b6e57a" @@ -11113,17 +10790,6 @@ strtok3@^6.2.4: "@tokenizer/token" "^0.3.0" peek-readable "^4.0.1" -subscriptions-transport-ws@^0.9.19: - version "0.9.19" - resolved "https://registry.yarnpkg.com/subscriptions-transport-ws/-/subscriptions-transport-ws-0.9.19.tgz#10ca32f7e291d5ee8eb728b9c02e43c52606cdcf" - integrity sha512-dxdemxFFB0ppCLg10FTtRqH/31FNRL1y1BQv8209MK5I4CwALb7iihQg+7p65lFcIl8MHatINWBLOqpgU4Kyyw== - dependencies: - backo2 "^1.0.2" - eventemitter3 "^3.1.0" - iterall "^1.2.1" - symbol-observable "^1.0.4" - ws "^5.2.0 || ^6.0.0 || ^7.0.0" - superagent@^3.8.3: version "3.8.3" resolved "https://registry.yarnpkg.com/superagent/-/superagent-3.8.3.tgz#460ea0dbdb7d5b11bc4f78deba565f86a178e128" @@ -11169,11 +10835,6 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -symbol-observable@^1.0.4: - version "1.2.0" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" - integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== - symbol-tree@^3.2.4: version "3.2.4" resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" @@ -11495,13 +11156,6 @@ triple-beam@^1.2.0, triple-beam@^1.3.0: resolved "https://registry.yarnpkg.com/triple-beam/-/triple-beam-1.3.0.tgz#a595214c7298db8339eeeee083e4d10bd8cb8dd9" integrity sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw== -ts-invariant@^0.4.0: - version "0.4.4" - resolved "https://registry.yarnpkg.com/ts-invariant/-/ts-invariant-0.4.4.tgz#97a523518688f93aafad01b0e80eb803eb2abd86" - integrity sha512-uEtWkFM/sdZvRNNDL3Ehu4WVpwaulhwQszV8mrtcdeE8nN00BV9mAmQ88RkrBhFgl9gMgvjJLAQcZbnPXI9mlA== - dependencies: - tslib "^1.9.3" - ts-jest@^26.4.1, ts-jest@^26.4.4: version "26.5.5" resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.5.5.tgz#e40481b6ee4dd162626ba481a2be05fa57160ea5" @@ -11560,7 +11214,7 @@ tsconfig-paths@^3.9.0: minimist "^1.2.0" strip-bom "^3.0.0" -tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -11856,17 +11510,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= -util.promisify@^1.0.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.1.1.tgz#77832f57ced2c9478174149cae9b96e9918cd54b" - integrity sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw== - dependencies: - call-bind "^1.0.0" - define-properties "^1.1.3" - for-each "^0.3.3" - has-symbols "^1.0.1" - object.getownpropertydescriptors "^2.1.1" - util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" @@ -11891,7 +11534,7 @@ uuid@3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -uuid@^3.0.0, uuid@^3.1.0, uuid@^3.3.2, uuid@^3.4.0: +uuid@^3.0.0, uuid@^3.3.2, uuid@^3.4.0: version "3.4.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== @@ -12198,16 +11841,16 @@ write-json-file@^2.3.0: sort-keys "^2.0.0" write-file-atomic "^2.0.0" -"ws@^5.2.0 || ^6.0.0 || ^7.0.0", ws@^7.3.1, ws@^7.5.3: - version "7.5.3" - resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" - integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== - ws@^7.2.1: version "7.4.2" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd" integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA== +ws@^7.3.1, ws@^7.5.3: + version "7.5.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74" + integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg== + ws@^7.4.4: version "7.4.5" resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1" @@ -12368,19 +12011,6 @@ yocto-queue@^0.1.0: resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b" integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q== -zen-observable-ts@^0.8.21: - version "0.8.21" - resolved "https://registry.yarnpkg.com/zen-observable-ts/-/zen-observable-ts-0.8.21.tgz#85d0031fbbde1eba3cd07d3ba90da241215f421d" - integrity sha512-Yj3yXweRc8LdRMrCC8nIc4kkjWecPAUVh0TI0OUrWXx6aX790vLcDlWca6I4vsyCGH3LpWxq0dJRcMOFoVqmeg== - dependencies: - tslib "^1.9.3" - zen-observable "^0.8.0" - -zen-observable@^0.8.0: - version "0.8.15" - resolved "https://registry.yarnpkg.com/zen-observable/-/zen-observable-0.8.15.tgz#96415c512d8e3ffd920afd3889604e30b9eaac15" - integrity sha512-PQ2PC7R9rslx84ndNBZB/Dkv8V8fZEpk83RLgXtYd0fwUgEjseMn1Dgajh2x6S8QbZAFa9p2qVCEuYZNgve0dQ== - zip-stream@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/zip-stream/-/zip-stream-4.1.0.tgz#51dd326571544e36aa3f756430b313576dc8fc79" From 0eb61ed656cbba0eed4108cafb855af19a295b26 Mon Sep 17 00:00:00 2001 From: MacRae Linton Date: Fri, 20 Aug 2021 16:49:13 -0700 Subject: [PATCH 3/3] Fixup breaking changes for apollo-server --- services/app-api/handlers/apollo_gql.ts | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/services/app-api/handlers/apollo_gql.ts b/services/app-api/handlers/apollo_gql.ts index 5621b227e2..72808b4125 100644 --- a/services/app-api/handlers/apollo_gql.ts +++ b/services/app-api/handlers/apollo_gql.ts @@ -84,9 +84,6 @@ const context = async ({ const server = new ApolloServer({ typeDefs, resolvers, - playground: { - endpoint: '/local/graphql', - }, context, }) @@ -101,7 +98,8 @@ function localAuthMiddleware( console.log('NO_USER info set, returning 403') return Promise.resolve({ statusCode: 403, - body: '{ "error": "No User Sent in cognitoAuthenticationProvider header"}\n', + body: + '{ "error": "No User Sent in cognitoAuthenticationProvider header"}\n', headers: { 'Access-Control-Allow-Origin': '*', 'Access-Control-Allow-Credentials': true, @@ -114,9 +112,11 @@ function localAuthMiddleware( } const gqlHandler = server.createHandler({ - cors: { - origin: true, - credentials: true, + expressGetMiddlewareOptions: { + cors: { + origin: true, + credentials: true, + }, }, })