|
@@ -108,7 +108,12 @@ public class DefaultUserTokenManager implements UserTokenManager {
|
|
|
if (userId == null) {
|
|
|
return Collections.emptyList();
|
|
|
}
|
|
|
- return getUserToken(userId)
|
|
|
+ Set<String> tokens = getUserToken(userId);
|
|
|
+ if (tokens.isEmpty()) {
|
|
|
+ userStorage.remove(userId);
|
|
|
+ return Collections.emptyList();
|
|
|
+ }
|
|
|
+ return tokens
|
|
|
.stream()
|
|
|
.map(tokenStorage::get)
|
|
|
.filter(Objects::nonNull)
|
|
@@ -164,9 +169,6 @@ public class DefaultUserTokenManager implements UserTokenManager {
|
|
|
return;
|
|
|
}
|
|
|
Set<String> tokens = getUserToken(userId);
|
|
|
- if (tokens.isEmpty()) {
|
|
|
- userStorage.remove(userId);
|
|
|
- }
|
|
|
tokens.forEach(token -> signOutByToken(token, false));
|
|
|
tokens.clear();
|
|
|
userStorage.remove(userId);
|