Skip to content

Commit ee92502

Browse files
committed
SEBSP-222 set cache expire to 1 min just to be safe for patch
1 parent 2be2170 commit ee92502

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,21 @@ public class UserServiceImpl implements UserService {
6060
private final UserDAO userDAO;
6161
private final EntityPrivilegeDAO entityPrivilegeDAO;
6262
private final EntityService entityService;
63+
private final ProctoringCacheService proctoringCacheService;
6364

6465
public UserServiceImpl(
6566
final UserDAO userDAO,
6667
final EntityPrivilegeDAO entityPrivilegeDAO,
6768
final EntityService entityService,
6869
final AdditionalAttributesDAO additionalAttributesDAO,
69-
final Collection<ExtractUserFromAuthenticationStrategy> extractStrategies) {
70+
final Collection<ExtractUserFromAuthenticationStrategy> extractStrategies,
71+
final ProctoringCacheService proctoringCacheService) {
7072

7173
this.userDAO = userDAO;
7274
this.extractStrategies = extractStrategies;
7375
this.entityPrivilegeDAO = entityPrivilegeDAO;
7476
this.entityService = entityService;
77+
this.proctoringCacheService = proctoringCacheService;
7578

7679
// admin privileges
7780
this.rolePrivileges.put(
@@ -237,7 +240,11 @@ public void applyWriteEntityPrivilegeGrant(
237240
@Override
238241
public Result<UserInfo> synchronizeUserAccount(final UserMod userMod) {
239242
return this.userDAO.synchronizeUserAccount(userMod)
240-
.map(this::synchronizeUserPrivileges);
243+
.map(this::synchronizeUserPrivileges)
244+
.map(user -> {
245+
proctoringCacheService.evictServerUserByName(userMod.username);
246+
return user;
247+
});
241248
}
242249

243250
private UserInfo synchronizeUserPrivileges(final UserInfo userInfo) {

src/main/resources/config/ehcache.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<key-type>java.lang.String</key-type>
6565
<value-type>ch.ethz.seb.sps.domain.model.user.ServerUser</value-type>
6666
<expiry>
67-
<ttl unit="minutes">10</ttl>
67+
<ttl unit="minutes">1</ttl>
6868
</expiry>
6969
<resources>
7070
<heap unit="entries">100</heap>

0 commit comments

Comments
 (0)