Merge pull request #2195 from sumesh-aot/FWF-3599-camunda-kc-update

Updating camunda and camundaKeycloak version
AOT-Technologies · Aug 21, 2024 · 3bd30c5 · 3bd30c5
2 parents e30b466 + ee5808f
commit 3bd30c5
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 18 deletions.
diff --git a/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml b/forms-flow-bpm/forms-flow-bpm-camunda/pom.xml
@@ -27,8 +27,8 @@
         <failOnMissingWebXml>false</failOnMissingWebXml>
 
         <!-- versions -->
-        <version.camundaKeycloak>7.20.0</version.camundaKeycloak>
-        <version.camunda>7.20.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
+        <version.camundaKeycloak>7.21.5</version.camundaKeycloak>
+        <version.camunda>7.21.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
         <version.camundaConnect>1.5.4</version.camundaConnect><!-- 1.5.4 -->
         <version.camundaMail>1.5.0</version.camundaMail><!-- 1.5.0 -->
         <version.springBoot>3.1.10</version.springBoot><!-- 3.1.5 - 3.1.10 -->
@@ -183,7 +183,7 @@
         <dependency>
             <groupId>org.camunda.bpm</groupId>
             <artifactId>camunda-engine-rest-core</artifactId>
-            <version>7.20.0</version>
+            <version>${version.camunda}</version>
         </dependency>
 
         <dependency>
@@ -370,7 +370,7 @@
         <dependency>
             <groupId>org.camunda.bpm.extension</groupId>
             <artifactId>camunda-platform-7-keycloak-jwt</artifactId>
-            <version>7.20.0</version>
+            <version>${version.camunda}</version>
         </dependency>
 
         <!-- Vault Starter -->

diff --git a/.../src/main/java/org/camunda/bpm/extension/keycloak/sso/KeycloakAuthenticationProvider.java b/.../src/main/java/org/camunda/bpm/extension/keycloak/sso/KeycloakAuthenticationProvider.java
@@ -83,7 +83,7 @@ private List<String> getKeys(OidcIdToken token, String nodeName) {
 		List<String> keys = new ArrayList<>();
 		if (token.getClaims().containsKey(nodeName)) {
 			Object claimValue = token.getClaim(nodeName);
-			if (claimValue instanceof JSONArray jsonArray) {
+			if (claimValue instanceof ArrayList jsonArray) {
 				for (Object array : jsonArray) {
 					String keyString = array.toString();
 					keys.add(StringUtils.contains(keyString, "/") ? StringUtils.substringAfter(keyString, "/") : keyString);

diff --git a/...munda/src/main/java/org/camunda/bpm/extension/keycloak/sso/OAuth2LoginSecurityConfig.java b/...munda/src/main/java/org/camunda/bpm/extension/keycloak/sso/OAuth2LoginSecurityConfig.java
@@ -197,11 +197,11 @@ public RequestContextListener requestContextListener() {
 		return new RequestContextListener();
 	}
 
-	@Bean
-	public FilterRegistrationBean cockpitConfigurationFilter() {
-		return new KeycloakConfigurationFilterRegistrationBean(
-				keycloakCockpitConfiguration,
-				camundaBpmProperties.getWebapp().getApplicationPath()
-		);
-	}
+//	@Bean //UNCOMMENT FOR JWT AUTH
+//	public FilterRegistrationBean cockpitConfigurationFilter() {
+//		return new KeycloakConfigurationFilterRegistrationBean(
+//				keycloakCockpitConfiguration,
+//				camundaBpmProperties.getWebapp().getApplicationPath()
+//		);
+//	}
 }
diff --git a/...camunda/src/main/resources/META-INF/resources/webjars/camunda/app/admin/scripts/config.js b/...camunda/src/main/resources/META-INF/resources/webjars/camunda/app/admin/scripts/config.js
@@ -27,6 +27,6 @@ window.camAdminConf = {
 export default {
     customScripts: [
         'custom/logout',
-		'../identity-keycloak/scripts/identity-keycloak-auth.js'
+		//UNCOMMENT FOR JWT AUTH '../identity-keycloak/scripts/identity-keycloak-auth.js'
     ]
 };
diff --git a/...munda/src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/scripts/config.js b/...munda/src/main/resources/META-INF/resources/webjars/camunda/app/cockpit/scripts/config.js
@@ -38,7 +38,7 @@ export default {
         'scripts/definition-historic-activities.js',
         'scripts/instance-historic-activities.js',
         'scripts/instance-route-history.js',
-		'../identity-keycloak/scripts/identity-keycloak-auth.js'
+		//UNCOMMENT FOR JWT AUTH '../identity-keycloak/scripts/identity-keycloak-auth.js'
     ],
     disableWelcomeMessage: true,
     // userOperationLogAnnotationLength: 5000,

diff --git a/...unda/src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/scripts/config.js b/...unda/src/main/resources/META-INF/resources/webjars/camunda/app/tasklist/scripts/config.js
@@ -27,7 +27,7 @@ window.camTasklistConf = {
 export default {
     customScripts: [
         'custom/logout',
-		'../identity-keycloak/scripts/identity-keycloak-auth.js'
+		//UNCOMMENT FOR JWT AUTH '../identity-keycloak/scripts/identity-keycloak-auth.js'
     ]
 };
 
diff --git a/forms-flow-bpm/pom.xml b/forms-flow-bpm/pom.xml
@@ -22,8 +22,8 @@
 		<failOnMissingWebXml>false</failOnMissingWebXml>
 
 		<!-- versions -->
-		<version.camundaKeycloak>7.20.0</version.camundaKeycloak>
-		<version.camunda>7.20.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
+		<version.camundaKeycloak>7.21.5</version.camundaKeycloak>
+		<version.camunda>7.21.0</version.camunda><!-- 7.18.0 - 7.20.0 -->
 		<version.camundaConnect>1.5.4</version.camundaConnect><!-- 1.5.4 -->
 		<version.camundaMail>1.5.0</version.camundaMail><!-- 1.5.0 -->
 		<version.springBoot>3.1.10</version.springBoot><!-- 3.1.5 - 3.1.10 -->
@@ -334,7 +334,7 @@
 				<dependency>
 					<groupId>org.camunda.bpm</groupId>
 					<artifactId>camunda-engine-rest-core</artifactId>
-					<version>7.20.0</version>
+					<version>${version.camunda}</version>
 				</dependency>
 
 				<!-- Adding common file upload -->