Merge branch 'hotfix/1.4.2'

Author: SailReal

CHANGELOG.md

@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.4.2](https://github.com/cryptomator/hub/compare/1.4.1...1.4.2)
+
+### Fixed
+
+- Fixed an issue where syncing of Keycloak users/groups would fail in very rare circumstances (#343)
+
 ## [1.4.1](https://github.com/cryptomator/hub/compare/1.4.0...1.4.1)
 
 ### Fixed

backend/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.cryptomator</groupId>
   <artifactId>hub-backend</artifactId>
-  <version>1.4.1</version>
+  <version>1.4.2</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

backend/src/main/java/org/cryptomator/hub/RemoteUserProvider.java

@@ -19,7 +19,7 @@
 @DiscriminatorValue("GROUP")
 public class Group extends Authority {
 
-	@ManyToMany(cascade = {CascadeType.REMOVE})
+	@ManyToMany(cascade = {CascadeType.MERGE, CascadeType.PERSIST})
 	@JoinTable(name = "group_membership",
 			joinColumns = @JoinColumn(name = "group_id", referencedColumnName = "id"),
 			inverseJoinColumns = @JoinColumn(name = "member_id", referencedColumnName = "id")

backend/src/main/java/org/cryptomator/hub/RemoteUserPuller.java

@@ -1,10 +1,7 @@
-package org.cryptomator.hub;
+package org.cryptomator.hub.keycloak;
 
 import jakarta.enterprise.context.ApplicationScoped;
 import jakarta.inject.Inject;
-import org.cryptomator.hub.entities.Authority;
-import org.cryptomator.hub.entities.Group;
-import org.cryptomator.hub.entities.User;
 import org.eclipse.microprofile.config.inject.ConfigProperty;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.resource.RealmResource;
@@ -19,7 +16,7 @@
 import java.util.stream.Collectors;
 
 @ApplicationScoped
-public class KeycloakRemoteUserProvider implements RemoteUserProvider {
+public class KeycloakAuthorityProvider {
 
 	//visible for testing
 	static final int MAX_COUNT_PER_REQUEST = 5_000;
@@ -30,15 +27,14 @@ public class KeycloakRemoteUserProvider implements RemoteUserProvider {
 	@ConfigProperty(name = "hub.keycloak.realm")
 	String keycloakRealm;
 
-	@Override
-	public List<User> users() {
+	public List<KeycloakUserDto> users() {
 		return users(keycloak.realm(keycloakRealm));
 	}
 
 	//visible for testing
-	List<User> users(RealmResource realm) {
-		List<User> users = new ArrayList<>();
-		List<User> currentRequestedUsers;
+	List<KeycloakUserDto> users(RealmResource realm) {
+		List<KeycloakUserDto> users = new ArrayList<>();
+		List<KeycloakUserDto> currentRequestedUsers;
 
 		do {
 			currentRequestedUsers = realm.users().list(users.size(), MAX_COUNT_PER_REQUEST).stream().map(this::mapToUser).toList();
@@ -52,7 +48,7 @@ List<User> users(RealmResource realm) {
 	}
 
 	//visible for testing
-	Optional<User> cryptomatorCliUser(RealmResource realm) {
+	Optional<KeycloakUserDto> cryptomatorCliUser(RealmResource realm) {
 		var clients = realm.clients().findByClientId("cryptomatorhub-cli");
 		if (clients.isEmpty()) {
 			return Optional.empty();
@@ -63,38 +59,29 @@ Optional<User> cryptomatorCliUser(RealmResource realm) {
 		return Optional.of(mapToUser(clientUser));
 	}
 
-	private User mapToUser(UserRepresentation userRepresentation) {
-		var userEntity = new User();
-		userEntity.setId(userRepresentation.getId());
-		userEntity.setName(userRepresentation.getUsername());
-		userEntity.setEmail(userRepresentation.getEmail());
-		parsePictureUrl(userRepresentation.getAttributes()).ifPresent(userEntity::setPictureUrl);
-		return userEntity;
+	private KeycloakUserDto mapToUser(UserRepresentation userRepresentation) {
+		var pictureUrl = parsePictureUrl(userRepresentation.getAttributes());
+		return new KeycloakUserDto(userRepresentation.getId(), userRepresentation.getUsername(), userRepresentation.getEmail(), pictureUrl);
 	}
 
-	private Optional<String> parsePictureUrl(Map<String, List<String>> attributes) {
+	private String parsePictureUrl(Map<String, List<String>> attributes) {
 		try {
-			return Optional.ofNullable(attributes.get("picture").get(0));
+			return attributes.get("picture").get(0);
 		} catch (NullPointerException e) {
-			return Optional.empty();
+			return null;
 		}
 	}
 
-	@Override
-	public List<Group> groups() {
+	public List<KeycloakGroupDto> groups() {
 		return groups(keycloak.realm(keycloakRealm));
 	}
 
 	//visible for testing
-	List<Group> groups(RealmResource realm) {
+	List<KeycloakGroupDto> groups(RealmResource realm) {
 		return deepCollectGroups(realm).stream().map(group -> {
 			// TODO add sub groups and the members of the sub group to it too using `group.getSubGroups()` recursively
 			var members = deepCollectMembers(realm, group.getId());
-			var groupEntity = new Group();
-			groupEntity.setId(group.getId());
-			groupEntity.setName(group.getName());
-			groupEntity.setMembers(members);
-			return groupEntity;
+			return new KeycloakGroupDto(group.getId(), group.getName(), members);
 		}).toList();
 	}
 
@@ -112,7 +99,7 @@ private List<GroupRepresentation> deepCollectGroups(RealmResource realm) {
 		return groups;
 	}
 
-	private Set<Authority> deepCollectMembers(RealmResource realm, String groupId) {
+	private Set<KeycloakUserDto> deepCollectMembers(RealmResource realm, String groupId) {
 		var group = realm.groups().group(groupId);
 
 		List<UserRepresentation> members = new ArrayList<>();