diff --git a/aas-web-ui/package.json b/aas-web-ui/package.json index 9b4ed7a0..9a3e34f2 100644 --- a/aas-web-ui/package.json +++ b/aas-web-ui/package.json @@ -21,7 +21,7 @@ "@mdi/font": "^7.4.47", "@vue-leaflet/vue-leaflet": "^0.10.1", "apexcharts": "^4.1.0", - "keycloak-js": "^25.0.4", + "keycloak-js": "^26.0.7", "leaflet": "^1.9.4", "lodash": "^4.17.21", "md5": "^2.3.0", diff --git a/aas-web-ui/src/main.ts b/aas-web-ui/src/main.ts index 9bc2d9af..de0d18e1 100644 --- a/aas-web-ui/src/main.ts +++ b/aas-web-ui/src/main.ts @@ -102,7 +102,7 @@ async function initKeycloak(keycloakUrl: string, keycloakRealm: string, keycloak keycloak ?.init({ onLoad: initOptions.onLoad }) - .then(async (auth) => { + .then(async (auth: boolean) => { if (!auth) { window.location.reload(); } else { @@ -115,7 +115,7 @@ async function initKeycloak(keycloakUrl: string, keycloakRealm: string, keycloak setInterval(() => { keycloak .updateToken(70) - .then((refreshed) => { + .then((refreshed: boolean) => { if (refreshed) { // console.log('Token refreshed'); authStore.setToken(keycloak.token); @@ -130,7 +130,7 @@ async function initKeycloak(keycloakUrl: string, keycloakRealm: string, keycloak }, 60000); } }) - .catch((error) => { + .catch((error: any) => { console.error('Failed to authenticate with Keycloak', error); const authStore = useAuthStore(); authStore.setAuthStatus(false); diff --git a/aas-web-ui/tsconfig.json b/aas-web-ui/tsconfig.json index d52c1290..1af79684 100644 --- a/aas-web-ui/tsconfig.json +++ b/aas-web-ui/tsconfig.json @@ -5,8 +5,8 @@ "useDefineForClassFields": true, "allowSyntheticDefaultImports": true, "composite": true, - "module": "esnext", - "moduleResolution": "node", + "module": "ESNext", + "moduleResolution": "Bundler", "strict": true, "jsx": "preserve", "sourceMap": false, diff --git a/aas-web-ui/yarn.lock b/aas-web-ui/yarn.lock index 25030b70..b6620457 100644 --- a/aas-web-ui/yarn.lock +++ b/aas-web-ui/yarn.lock @@ -3132,11 +3132,6 @@ js-cookie@^3.0.5: resolved "https://registry.yarnpkg.com/js-cookie/-/js-cookie-3.0.5.tgz#0b7e2fd0c01552c58ba86e0841f94dc2557dcdbc" integrity sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw== -js-sha256@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/js-sha256/-/js-sha256-0.11.0.tgz#256a921d9292f7fe98905face82e367abaca9576" - integrity sha512-6xNlKayMZvds9h1Y1VWc0fQHQ82BxTXizWPEtEeGvmOUYpBRy4gbWroHLpzowe6xiQhHpelCQiE7HEdznyBL9Q== - js-tokens@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" @@ -3201,11 +3196,6 @@ json5@^2.2.3: resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== -jwt-decode@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-4.0.0.tgz#2270352425fd413785b2faf11f6e755c5151bd4b" - integrity sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA== - katex@^0.16.9: version "0.16.15" resolved "https://registry.yarnpkg.com/katex/-/katex-0.16.15.tgz#16b0d235aae8dfa3b2d5d63fd9874bfa394abfab" @@ -3213,13 +3203,10 @@ katex@^0.16.9: dependencies: commander "^8.3.0" -keycloak-js@^25.0.4: - version "25.0.6" - resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-25.0.6.tgz#ea2e74d907f251c93080c6e2245d9d858bd4b329" - integrity sha512-Km+dc+XfNvY6a4az5jcxTK0zPk52ns9mAxLrHj7lF3V+riVYvQujfHmhayltJDjEpSOJ4C8a57LFNNKnNnRP2g== - dependencies: - js-sha256 "^0.11.0" - jwt-decode "^4.0.0" +keycloak-js@^26.0.7: + version "26.0.7" + resolved "https://registry.yarnpkg.com/keycloak-js/-/keycloak-js-26.0.7.tgz#2025256f7c519df654240648052ea06344e2377e" + integrity sha512-vKCk1ISMiouYRLjMzi5fKp58RnYxKEBS29BoDgVfYwVW94IXchj9jLqBvIet31VD1v79l3WaWT+WMX7fH8O4wA== keyv@^4.5.4: version "4.5.4"