Update to Keycloak 26 and split Terraform modules

README.md

@@ -59,7 +59,7 @@ To make a release provide a commit that:
 - removes the next parts from `version` fields across the repo.
 - updates the package-lock files.
 - updates the `node/monitor` .vsix file in `demo/dockerfiles/demo-theia-monitor-vscode`.
-- updates the helm chart versions in `terraform/modules/helm` to the new version.
+- updates the helm chart version in `terraform/modules/theia-cloud/variables.tf` to the new version.
 
 When this commit is merged it should not result in pushed artifacts.
 Create a `releases/<currentVersion>` branch. This will be used in the future if any backports are necessary. Also it makes versions easier to find.

node/landing-page/package.json

@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@eclipse-theiacloud/common": "1.3.0-next",
-    "keycloak-js": "20.0.5",
+    "keycloak-js": "26.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },

node/landing-page/src/App.tsx

@@ -1,6 +1,13 @@
 import './App.css';
 
-import { AppDefinition, getTheiaCloudConfig, LaunchRequest, PingRequest, TheiaCloud, TheiaCloudConfig } from '@eclipse-theiacloud/common';
+import {
+  AppDefinition,
+  getTheiaCloudConfig,
+  LaunchRequest,
+  PingRequest,
+  TheiaCloud,
+  TheiaCloudConfig
+} from '@eclipse-theiacloud/common';
 import Keycloak, { KeycloakConfig } from 'keycloak-js';
 import { useEffect, useState } from 'react';
 
@@ -78,11 +85,11 @@ function App(): JSX.Element {
       }
       if (config.useKeycloak) {
         keycloakConfig = {
-          url: config.keycloakAuthUrl,
+          url: config.keycloakAuthUrl!,
           realm: config.keycloakRealm!,
           clientId: config.keycloakClientId!
         };
-        const keycloak = Keycloak(keycloakConfig);
+        const keycloak = new Keycloak(keycloakConfig!);
         keycloak
           .init({
             onLoad: 'check-sso',
@@ -100,8 +107,8 @@ function App(): JSX.Element {
               }
             }
           })
-          .catch(() => {
-            console.error('Authentication Failed');
+          .catch((err: any) => {
+            console.error('Authentication Failed', err);
           });
       }
     }
@@ -112,7 +119,7 @@ function App(): JSX.Element {
   document.title = `${selectedAppName} - Try Now`;
 
   const authenticate = (): void => {
-    const keycloak = Keycloak(keycloakConfig);
+    const keycloak = new Keycloak(keycloakConfig!);
     keycloak
       .init({
         onLoad: 'login-required',
@@ -132,8 +139,8 @@ function App(): JSX.Element {
           }
         }
       })
-      .catch(() => {
-        console.error('Authentication Failed');
+      .catch((err: any) => {
+        console.error('Authentication Failed', err);
         setError('Authentication failed');
       });
   };
@@ -152,8 +159,21 @@ function App(): JSX.Element {
           : 'ws-' + TheiaCloudConfig.getServiceAuthToken(config) + '-' + selectedAppDefinition + '-' + email;
         TheiaCloud.launchAndRedirect(
           config.useEphemeralStorage
-            ? LaunchRequest.ephemeral(config.serviceUrl, TheiaCloudConfig.getServiceAuthToken(config), appDefinition, 5, email)
-            : LaunchRequest.createWorkspace(config.serviceUrl, TheiaCloudConfig.getServiceAuthToken(config), appDefinition, 5, email, workspace),
+            ? LaunchRequest.ephemeral(
+                config.serviceUrl,
+                TheiaCloudConfig.getServiceAuthToken(config),
+                appDefinition,
+                5,
+                email
+              )
+            : LaunchRequest.createWorkspace(
+                config.serviceUrl,
+                TheiaCloudConfig.getServiceAuthToken(config),
+                appDefinition,
+                5,
+                email,
+                workspace
+              ),
           { timeout: 60000, retries: 5, accessToken: token }
         )
           .catch((err: Error) => {

node/testing-page/package.json

@@ -5,7 +5,7 @@
   "private": true,
   "dependencies": {
     "@eclipse-theiacloud/common": "1.3.0-next",
-    "keycloak-js": "^17.0.1",
+    "keycloak-js": "26.2.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-scripts": "5.0.1",