gCubeSystem
/
keycloak-d4science-spi-parent
15
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated to version effectively deployed in the ENVs (`19.0.2`) and prepared code for the deprecation and next code removal and added version to the artifacts' jar

This commit is contained in:
Mauro Mugnaini 2022-09-26 16:45:30 +02:00
parent 65f242e240
commit 6ba362ea8d
5 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
avatar-importer/pom.xml
View File

@ -27,12 +27,23 @@
<dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>3.2.2</version>
<version>${dns-java.version}</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.simple.version}</version>
<version>${json-simple.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

2
delete-account/pom.xml
View File

@ -40,7 +40,7 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.simple.version}</version>
<version>${json-simple.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

2
event-listener-provider/pom.xml
View File

@ -29,7 +29,7 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.simple.version}</version>
<version>${json-simple.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>

18
keycloak-d4science-bundle/pom.xml
View File

@ -70,7 +70,7 @@
<dependency>
<groupId>com.googlecode.json-simple</groupId>
<artifactId>json-simple</artifactId>
<version>${json.simple.version}</version>
<version>${json-simple.version}</version>
<scope>runtime</scope>
</dependency>
</dependencies>
@ -88,56 +88,56 @@
<groupId>org.gcube.iam</groupId>
<artifactId>avatar-importer</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>avatar-importer.jar</bundleFileName>
<bundleFileName>avatar-importer-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>avatar-realm-resource</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>avatar-realm-resource.jar</bundleFileName>
<bundleFileName>avatar-realm-resource-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>delete-account</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>delete-account.jar</bundleFileName>
<bundleFileName>delete-account-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>event-listener-provider</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>event-listener-provider.jar</bundleFileName>
<bundleFileName>event-listener-provider-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>identity-provider-mapper</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>identity-provider-mapper.jar</bundleFileName>
<bundleFileName>identity-provider-mapper-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>keycloak-d4science-script</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>keycloak-d4science-script.jar</bundleFileName>
<bundleFileName>keycloak-d4science-script-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>keycloak-d4science-theme</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>keycloak-d4science-theme.jar</bundleFileName>
<bundleFileName>keycloak-d4science-theme-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
<jarModule>
<groupId>org.gcube.iam</groupId>
<artifactId>ldap-storage-mapper</artifactId>
<includeInApplicationXml>true</includeInApplicationXml>
<bundleFileName>ldap-storage-mapper.jar</bundleFileName>
<bundleFileName>ldap-storage-mapper-${project.version}.jar</bundleFileName>
<bundleDir>/</bundleDir>
</jarModule>
</modules>

2
ldap-storage-mapper/src/main/java/org/gcube/keycloak/storage/ldap/mappers/UserAttributeTemplatedLDAPStorageMapper.java
View File

@ -171,7 +171,7 @@ public class UserAttributeTemplatedLDAPStorageMapper extends AbstractLDAPStorage
// lowercase before search
email = KeycloakModelUtils.toLowerCaseSafe(email);
UserModel that = session.userLocalStorage().getUserByEmail(realm, email);
UserModel that = session.users().getUserByEmail(realm, email);
if (that != null && !that.getId().equals(user.getId())) {
session.getTransactionManager().setRollbackOnly();
String exceptionMessage = String.format(