Skip to content

Commit f0050e7

Browse files
TayGovTayGov
authored
Merge pull request #2882 from bcgov/feature/keycloak2-js-update
Update keycloak-js to 26
2 parents 73ef70e + 51d52f3 commit f0050e7

File tree

6 files changed

+43
-40
lines changed

6 files changed

+43
-40
lines changed

‎src/frontend/efiling-demo/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"install-peerdeps": "^3.0.3",
1717
"jest-canvas-mock": "^2.5.0",
1818
"jsonwebtoken": "^9.0.0",
19-
"keycloak-js": "^15.1.0",
19+
"keycloak-js": "^25.0.6",
2020
"node": "^17.3.0",
2121
"object-path": "^0.11.8",
2222
"postcss-normalize": "^10.0.1",

‎src/frontend/efiling-demo/src/components/hoc/AuthenticationGuard.js‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,21 +29,23 @@ export default function AuthenticationGuard({ page: { header } }) {
2929

3030
async function keycloakInit() {
3131
// Initialize client
32-
const keycloak = Keycloak(KEYCLOAK);
32+
const keycloak = new Keycloak(KEYCLOAK);
3333

3434
await keycloak
3535
.init({
3636
checkLoginIframe: false,
3737
})
38-
.success((authenticated) => {
38+
.then((authenticated) => {
3939
if (authenticated) {
40-
keycloak.loadUserInfo().success();
41-
40+
keycloak.loadUserInfo().then();
4241
localStorage.setItem("jwt", keycloak.token);
4342
setAuthedKeycloak(keycloak);
4443
} else {
4544
keycloak.login();
4645
}
46+
})
47+
.catch((exception) => {
48+
console.log(exception);
4749
});
4850
}
4951

‎src/frontend/efiling-demo/yarn.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4565,11 +4565,6 @@ balanced-match@^1.0.0:
45654565
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
45664566
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
45674567

4568-
base64-js@1.3.1:
4569-
version "1.3.1"
4570-
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
4571-
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
4572-
45734568
base64-js@^1.3.1:
45744569
version "1.5.1"
45754570
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -9465,10 +9460,10 @@ jquery@^3.6.0:
94659460
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
94669461
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
94679462

9468-
js-sha256@0.9.0:
9469-
version "0.9.0"
9470-
resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
9471-
integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
9463+
js-sha256@^0.11.0:
9464+
version "0.11.0"
9465+
resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576"
9466+
integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q==
94729467

94739468
js-string-escape@^1.0.1:
94749469
version "1.0.1"
@@ -9629,13 +9624,18 @@ jws@^3.2.2:
96299624
jwa "^1.4.1"
96309625
safe-buffer "^5.0.1"
96319626

9632-
keycloak-js@^15.1.0:
9633-
version "15.1.1"
9634-
resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-15.1.1.tgz#4f3ef77fde377a506ec21e5e4790c0ba96ec97f6"
9635-
integrity sha512-PPu70WfSI2CWX7GoF5AQ4HkqYJLTAOV/25wDG//9S5SUOhqIDxKjAv6P54hy8nKt2+rIZF2kqpv7FNEmBN2W4g==
9627+
jwt-decode@^4.0.0:
9628+
version "4.0.0"
9629+
resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
9630+
integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
9631+
9632+
keycloak-js@^25.0.6:
9633+
version "25.0.6"
9634+
resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-25.0.6.tgz#ea2e74d907f251c93080c6e2245d9d858bd4b329"
9635+
integrity sha512-Km+dc+XfNvY6a4az5jcxTK0zPk52ns9mAxLrHj7lF3V+riVYvQujfHmhayltJDjEpSOJ4C8a57LFNNKnNnRP2g==
96369636
dependencies:
9637-
base64-js "1.3.1"
9638-
js-sha256 "0.9.0"
9637+
js-sha256 "^0.11.0"
9638+
jwt-decode "^4.0.0"
96399639

96409640
kind-of@^3.0.2, kind-of@^3.0.3:
96419641
version "3.2.2"

‎src/frontend/efiling-frontend/package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
"jsonwebtoken": "^9.0.0",
2525
"jwa": "^2.0.0",
2626
"jws": "^4.0.0",
27-
"keycloak-js": "^15.1.0",
27+
"keycloak-js": "^25.0.6",
2828
"moment": "^2.29.4",
2929
"object-hash": "^3.0.0",
3030
"object-path": "0.11.8",
@@ -172,7 +172,8 @@
172172
"text",
173173
"lcov"
174174
],
175-
"coverageDirectory": "coverage"
175+
"coverageDirectory": "coverage",
176+
"transformIgnorePatterns": ["node_modules/(?!(.*.mjs$|keycloak.js))"]
176177
},
177178
"jestSonar": {
178179
"reportPath": "coverage",

‎src/frontend/efiling-frontend/src/domain/authentication/AuthenticationGuard.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const KEYCLOAK = {
2929
};
3030

3131
// Initialize client
32-
const keycloak = Keycloak(KEYCLOAK);
32+
const keycloak = new Keycloak(KEYCLOAK);
3333

3434
keycloak.onAuthSuccess = () => localStorage.setItem("jwt", keycloak.token);
3535
keycloak.onAuthRefreshSuccess = () =>
@@ -47,9 +47,9 @@ export default function AuthenticationGuard(props) {
4747
.init({
4848
checkLoginIframe: false,
4949
})
50-
.success((authenticated) => {
50+
.then((authenticated) => {
5151
if (authenticated) {
52-
keycloak.loadUserInfo().success();
52+
keycloak.loadUserInfo().then();
5353

5454
localStorage.setItem("jwt", keycloak.token);
5555
setAuthedKeycloak(keycloak);

‎src/frontend/efiling-frontend/yarn.lock‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4530,11 +4530,6 @@ balanced-match@^1.0.0:
45304530
resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
45314531
integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
45324532

4533-
base64-js@1.3.1:
4534-
version "1.3.1"
4535-
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.1.tgz#58ece8cb75dd07e71ed08c736abc5fac4dbf8df1"
4536-
integrity sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==
4537-
45384533
base64-js@^1.3.1:
45394534
version "1.5.1"
45404535
resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -9552,10 +9547,10 @@ jquery@^3.6.0:
95529547
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
95539548
integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
95549549

9555-
js-sha256@0.9.0:
9556-
version "0.9.0"
9557-
resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.9.0.tgz#0b89ac166583e91ef9123644bd3c5334ce9d0966"
9558-
integrity sha512-sga3MHh9sgQN2+pJ9VYZ+1LPwXOxuBJBA5nrR5/ofPfuiJBE2hnjsaN8se8JznOmGLN2p49Pe5U/ttafcs/apA==
9550+
js-sha256@^0.11.0:
9551+
version "0.11.0"
9552+
resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576"
9553+
integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q==
95599554

95609555
js-string-escape@^1.0.1:
95619556
version "1.0.1"
@@ -9733,13 +9728,18 @@ jws@^4.0.0:
97339728
jwa "^2.0.0"
97349729
safe-buffer "^5.0.1"
97359730

9736-
keycloak-js@^15.1.0:
9737-
version "15.1.1"
9738-
resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-15.1.1.tgz#4f3ef77fde377a506ec21e5e4790c0ba96ec97f6"
9739-
integrity sha512-PPu70WfSI2CWX7GoF5AQ4HkqYJLTAOV/25wDG//9S5SUOhqIDxKjAv6P54hy8nKt2+rIZF2kqpv7FNEmBN2W4g==
9731+
jwt-decode@^4.0.0:
9732+
version "4.0.0"
9733+
resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b"
9734+
integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==
9735+
9736+
keycloak-js@^25.0.6:
9737+
version "25.0.6"
9738+
resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-25.0.6.tgz#ea2e74d907f251c93080c6e2245d9d858bd4b329"
9739+
integrity sha512-Km+dc+XfNvY6a4az5jcxTK0zPk52ns9mAxLrHj7lF3V+riVYvQujfHmhayltJDjEpSOJ4C8a57LFNNKnNnRP2g==
97409740
dependencies:
9741-
base64-js "1.3.1"
9742-
js-sha256 "0.9.0"
9741+
js-sha256 "^0.11.0"
9742+
jwt-decode "^4.0.0"
97439743

97449744
kind-of@^3.0.2, kind-of@^3.0.3:
97459745
version "3.2.2"

0 commit comments

Comments
 (0)