diff --git a/Server/SchoolBusAPI/SchoolBusAPI.csproj b/Server/SchoolBusAPI/SchoolBusAPI.csproj index 18d2d12bf..fa85b901c 100644 --- a/Server/SchoolBusAPI/SchoolBusAPI.csproj +++ b/Server/SchoolBusAPI/SchoolBusAPI.csproj @@ -9,7 +9,7 @@ Ministry of Transportation and Infrastructure The API server for the schoolbus inspection application. Copyright© 2017, Province of British Columbia. - 2.0.8 + 2.0.9 diff --git a/client/package-lock.json b/client/package-lock.json index 7fc68bd4c..1ec0af483 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -22,7 +22,7 @@ "draftjs-conductor": "^1.0.1", "file-saver": "^2.0.2", "http-proxy-middleware": "^1.0.5", - "keycloak-js": "^19.0.2", + "keycloak-js": "^26.1.3", "lodash": "^4.17.21", "moment": "^2.27.0", "preval.macro": "^5.0.0", @@ -5137,25 +5137,6 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, - "node_modules/base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -11116,11 +11097,6 @@ "optional": true, "peer": true }, - "node_modules/js-sha256": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz", - "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==" - }, "node_modules/js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -11310,13 +11286,10 @@ } }, "node_modules/keycloak-js": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-19.0.2.tgz", - "integrity": "sha512-tQjkLVVIwaV1xf4Fri5u+d+Ttddrh0S5cv3ltG+uTUd7WNwt5LkOXsPnqWQjj9stpoBTFgTuzIqJ2C6vk0CcEQ==", - "dependencies": { - "base64-js": "^1.5.1", - "js-sha256": "^0.9.0" - } + "version": "26.1.3", + "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-26.1.3.tgz", + "integrity": "sha512-H2NUTg4snjThwB1ZTjNXivOqriJcC5PqZw1nKjJmglw6rYNjV5A6rgQaNAuVPyLqs2582WTawsRHGJn/cDhWjQ==", + "license": "Apache-2.0" }, "node_modules/keycode": { "version": "2.2.1", @@ -21972,11 +21945,6 @@ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, - "base64-js": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" - }, "batch": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", @@ -26400,11 +26368,6 @@ "optional": true, "peer": true }, - "js-sha256": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.9.0.tgz", - "integrity": "sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==" - }, "js-tokens": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", @@ -26553,13 +26516,9 @@ } }, "keycloak-js": { - "version": "19.0.2", - "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-19.0.2.tgz", - "integrity": "sha512-tQjkLVVIwaV1xf4Fri5u+d+Ttddrh0S5cv3ltG+uTUd7WNwt5LkOXsPnqWQjj9stpoBTFgTuzIqJ2C6vk0CcEQ==", - "requires": { - "base64-js": "^1.5.1", - "js-sha256": "^0.9.0" - } + "version": "26.1.3", + "resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-26.1.3.tgz", + "integrity": "sha512-H2NUTg4snjThwB1ZTjNXivOqriJcC5PqZw1nKjJmglw6rYNjV5A6rgQaNAuVPyLqs2582WTawsRHGJn/cDhWjQ==" }, "keycode": { "version": "2.2.1", diff --git a/client/package.json b/client/package.json index 5ae526a4e..c80600a39 100644 --- a/client/package.json +++ b/client/package.json @@ -31,7 +31,7 @@ "draftjs-conductor": "^1.0.1", "file-saver": "^2.0.2", "http-proxy-middleware": "^1.0.5", - "keycloak-js": "^19.0.2", + "keycloak-js": "^26.1.3", "lodash": "^4.17.21", "moment": "^2.27.0", "preval.macro": "^5.0.0", diff --git a/client/src/js/Keycloak.js b/client/src/js/Keycloak.js index d218043f4..8908449ea 100644 --- a/client/src/js/Keycloak.js +++ b/client/src/js/Keycloak.js @@ -8,7 +8,7 @@ const keycloakConfig = { : process.env.REACT_APP_SSO_CLIENT, }; -export const keycloak = Keycloak(keycloakConfig); +export const keycloak = new Keycloak(keycloakConfig); export const init = (onSuccess) => { keycloak.init({