diff --git a/package.json b/package.json index 5e3a534..31ee5b6 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ ] }, "dependencies": { - "@onaio/gatekeeper": "^0.0.18", + "@onaio/gatekeeper": "^0.0.21", "compression": "^1.7.4", "cookie-parser": "^1.4.4", "dotenv": "^8.2.0", @@ -34,7 +34,7 @@ "helmet": "^3.21.2", "react": "^16.13.1", "react-dom": "^16.13.1", - "react-redux": "6.0.1", + "react-redux": "^7.2.0", "react-router": "^5.1.2", "react-router-dom": "^5.1.2", "redux": "^4.0.5", @@ -53,7 +53,7 @@ "@types/lodash": "^4.14.149", "@types/node": "^13.5.0", "@types/react": "^16.9.32", - "@types/react-redux": "7.0.6", + "@types/react-redux": "7.1.7", "@types/react-router": "^5.1.5", "@types/request": "^2.48.4", "@types/seamless-immutable": "^7.1.11", diff --git a/src/app/tests/fixtures.ts b/src/app/tests/fixtures.ts index 062014a..cc4968a 100644 --- a/src/app/tests/fixtures.ts +++ b/src/app/tests/fixtures.ts @@ -2,7 +2,7 @@ export const parsedApiResponse = { preferredName: 'Superset User', roles: ['Provider'], - userName: 'superset-user', + username: 'superset-user', }; export const oauthState = { @@ -17,7 +17,7 @@ export const oauthState = { }, preferredName: 'Superset User', roles: ['Provider'], - userName: 'superset-user', + username: 'superset-user', }, success: true, }, @@ -33,7 +33,7 @@ export const oauthState = { }, preferredName: 'Superset User', roles: ['Provider'], - userName: 'superset-user', + username: 'superset-user', }, user: { email: '', diff --git a/yarn.lock b/yarn.lock index 52c82c6..76809a8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -163,13 +163,20 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" -"@babel/runtime@^7.1.2", "@babel/runtime@^7.3.1", "@babel/runtime@^7.4.0": +"@babel/runtime@^7.1.2", "@babel/runtime@^7.4.0": version "7.9.2" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz#d90df0583a3a252f09aaa619665367bae518db06" integrity sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q== dependencies: regenerator-runtime "^0.13.4" +"@babel/runtime@^7.5.5": + version "7.10.2" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.10.2.tgz#d103f21f2602497d38348a32e008637d506db839" + integrity sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6": version "7.8.6" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz#86b22af15f828dfb086474f964dcc3e39c43ce2b" @@ -387,10 +394,10 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@onaio/gatekeeper@^0.0.18": - version "0.0.18" - resolved "https://registry.yarnpkg.com/@onaio/gatekeeper/-/gatekeeper-0.0.18.tgz#684ab8c10c0058063bbe6d36230bde0a1d80f08b" - integrity sha512-FZ74RgibzLcXqrtH8SqOcb/she+9pbDOotZmfGaoX+/hzbOCCAnof1NrLcYs8xtOLkwzAYdRzDWOy4HB1ndzoQ== +"@onaio/gatekeeper@^0.0.21": + version "0.0.21" + resolved "https://registry.yarnpkg.com/@onaio/gatekeeper/-/gatekeeper-0.0.21.tgz#ebf445833330ebc09548999b85a9da253b7ebd1a" + integrity sha512-0kN42NehnehGnPn8rMQnUvQOGstU8xkR6GEpeTPHqt0G/8pcWULUSzDZOZyADO1oZOpyz+dzC70NuvTw8jHt1w== dependencies: "@onaio/session-reducer" "^0.0.11" client-oauth2 "^4.2.3" @@ -609,13 +616,14 @@ resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c" integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA== -"@types/react-redux@7.0.6": - version "7.0.6" - resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.0.6.tgz#992271450e0d3bf61130ad9e356ad018841c7f78" - integrity sha512-Nlofk/xq8oVWpylvrFayezNb/HONsYJfjlSmTmZ7xoMDe+Muf6c1qHMVRZ7C5S2W1+iVcY21ggZwlUgLv+66hQ== +"@types/react-redux@7.1.7": + version "7.1.7" + resolved "https://registry.yarnpkg.com/@types/react-redux/-/react-redux-7.1.7.tgz#12a0c529aba660696947384a059c5c6e08185c7a" + integrity sha512-U+WrzeFfI83+evZE2dkZ/oF/1vjIYgqrb5dGgedkqVV8HEfDFujNgWCwHL89TDuWKb47U0nTBT6PLGq4IIogWg== dependencies: "@types/hoist-non-react-statics" "^3.3.0" "@types/react" "*" + hoist-non-react-statics "^3.3.0" redux "^4.0.0" "@types/react-router@^5.1.5": @@ -2649,13 +2657,6 @@ inquirer@^7.0.0: strip-ansi "^6.0.0" through "^2.3.6" -invariant@^2.2.4: - version "2.2.4" - resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6" - integrity sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA== - dependencies: - loose-envify "^1.0.0" - ip-regex@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9" @@ -3525,7 +3526,7 @@ lolex@^5.0.0: dependencies: "@sinonjs/commons" "^1.7.0" -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: +loose-envify@^1.1.0, loose-envify@^1.2.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" integrity sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q== @@ -4350,22 +4351,21 @@ react-dom@^16.13.1: prop-types "^15.6.2" scheduler "^0.19.1" -react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.8.2: +react-is@^16.12.0, react-is@^16.6.0, react-is@^16.7.0, react-is@^16.8.1, react-is@^16.9.0: version "16.13.1" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-redux@6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-6.0.1.tgz#0d423e2c1cb10ada87293d47e7de7c329623ba4d" - integrity sha512-T52I52Kxhbqy/6TEfBv85rQSDz6+Y28V/pf52vDWs1YRXG19mcFOGfHnY2HsNFHyhP+ST34Aih98fvt6tqwVcQ== +react-redux@^7.2.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-7.2.0.tgz#f970f62192b3981642fec46fd0db18a074fe879d" + integrity sha512-EvCAZYGfOLqwV7gh849xy9/pt55rJXPwmYvI4lilPM5rUT/1NxuuN59ipdBksRVSvz0KInbPnp4IfoXJXCqiDA== dependencies: - "@babel/runtime" "^7.3.1" + "@babel/runtime" "^7.5.5" hoist-non-react-statics "^3.3.0" - invariant "^2.2.4" loose-envify "^1.4.0" prop-types "^15.7.2" - react-is "^16.8.2" + react-is "^16.9.0" react-router-dom@^5.1.2: version "5.1.2"