From 97104c37f56f8180349d59d3cfdcf908ba16dfc4 Mon Sep 17 00:00:00 2001
From: Steffen Schaefer <steffen.schaefer@oio.de>
Date: Mon, 11 Feb 2019 15:54:07 +0100
Subject: [PATCH] Fixed replication of default creation tenants

---
 .../src/com/sap/sse/security/SecurityService.java   |  2 +-
 .../security/impl/ReplicableSecurityService.java    |  2 ++
 .../sap/sse/security/impl/SecurityServiceImpl.java  | 13 ++++++++++---
 3 files changed, 13 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java
 mode change 100755 => 100644 java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java

diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java
old mode 100755
new mode 100644
index 3bde1aeafb1..8947f262fb5
--- a/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/SecurityService.java
@@ -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);
 
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java b/java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java
old mode 100755
new mode 100644
index 8c1c3ce24d1..b60a52a17bf
--- a/java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/impl/ReplicableSecurityService.java
@@ -92,4 +92,6 @@ public interface ReplicableSecurityService extends SecurityService {
 
     void removeAllSessions(String cacheName);
 
+    Void internalSetDefaultTenantForServerForUser(String username, UUID defaultTenantId, String serverName);
+
 }
diff --git a/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java b/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
index 1fc44f75a82..13edd9c8ad9 100644
--- a/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
+++ b/java/com.sap.sse.security/src/com/sap/sse/security/impl/SecurityServiceImpl.java
@@ -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