Fixed replication of default creation tenants

This commit is contained in:
Steffen Schaefer committed 2019-02-11 16:10:11 +01:00
1 parent 8e0effbd78
commit 97104c37f5
3 files changed
+13 -4

No files matched your search

+1 -1
View File
@@ -451,7 +451,7 @@ public interface SecurityService extends ReplicableWithObjectInputStream<Replica
boolean hasUserAllWildcardPermissionsForAlreadyRealizedQualifications(RoleDefinition role,
Iterable<WildcardPermission> permissionsToCheck);
void setDefaultTenantForCurrentServerForUser(String username, String defaultTenant);
void setDefaultTenantForCurrentServerForUser(String username, UUID defaultTenantId);
void copyUsersAndRoleAssociations(UserGroup source, UserGroup destination, RoleCopyListener callback);
@@ -92,4 +92,6 @@ public interface ReplicableSecurityService extends SecurityService {
void removeAllSessions(String cacheName);
Void internalSetDefaultTenantForServerForUser(String username, UUID defaultTenantId, String serverName);
}
@@ -2092,11 +2092,18 @@ public class SecurityServiceImpl implements ReplicableSecurityService, ClearStat
}
@Override
public void setDefaultTenantForCurrentServerForUser(String username, String defaultTenant) {
public void setDefaultTenantForCurrentServerForUser(String username, UUID defaultTenantId) {
final String serverName = ServerInfo.getName();
apply(s->s.internalSetDefaultTenantForServerForUser(username, defaultTenantId, serverName));
}
@Override
public Void internalSetDefaultTenantForServerForUser(String username, UUID defaultTenantId, String serverName) {
User user = getUserByName(username);
UserGroup newDefaultTenant = getUserGroup(UUID.fromString(defaultTenant));
user.setDefaultTenant(newDefaultTenant, ServerInfo.getName());
UserGroup newDefaultTenant = getUserGroup(defaultTenantId);
user.setDefaultTenant(newDefaultTenant, serverName);
store.updateUser(user);
return null;
}
@Override