Merge branch 'dev-1.2' into development

# Conflicts:
#	src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/UserServiceImpl.java

Author: anhefti

src/main/java/ch/ethz/seb/sps/server/servicelayer/impl/UserServiceImpl.java

@@ -60,18 +60,21 @@ public class UserServiceImpl implements UserService {
     private final UserDAO userDAO;
     private final EntityPrivilegeDAO entityPrivilegeDAO;
     private final EntityService entityService;
+    private final ProctoringCacheService proctoringCacheService;
 
     public UserServiceImpl(
             final UserDAO userDAO,
             final EntityPrivilegeDAO entityPrivilegeDAO,
             final EntityService entityService,
             final AdditionalAttributesDAO additionalAttributesDAO,
-            final Collection<ExtractUserFromAuthenticationStrategy> extractStrategies) {
+            final Collection<ExtractUserFromAuthenticationStrategy> extractStrategies,
+            final ProctoringCacheService proctoringCacheService) {
 
         this.userDAO = userDAO;
         this.extractStrategies = extractStrategies;
         this.entityPrivilegeDAO = entityPrivilegeDAO;
         this.entityService = entityService;
+        this.proctoringCacheService = proctoringCacheService;
 
         // admin privileges
         this.rolePrivileges.put(
@@ -236,9 +239,12 @@ public void applyWriteEntityPrivilegeGrant(
 
     @Override
     public Result<UserInfo> synchronizeUserAccount(final UserMod userMod) {
-        return this.userDAO
-                .synchronizeUserAccount(userMod)
-                .map(this::synchronizeUserPrivileges);
+        return this.userDAO.synchronizeUserAccount(userMod)
+                .map(this::synchronizeUserPrivileges)
+                .map(user -> {
+                    proctoringCacheService.evictServerUserByName(userMod.username);
+                    return user;
+                });
     }
 
     @Override

src/main/resources/config/ehcache.xml

@@ -64,7 +64,7 @@
         <key-type>java.lang.String</key-type>
         <value-type>ch.ethz.seb.sps.domain.model.user.ServerUser</value-type>
         <expiry>
-            <ttl unit="minutes">10</ttl>
+            <ttl unit="minutes">1</ttl>
         </expiry>
         <resources>
             <heap unit="entries">100</heap>