feat(jans-auth-server): use new index update method in existing revok…

…e code

#8562
Signed-off-by: YuriyZ <yzabrovarniy@gmail.com>

jans-auth-server/server/src/main/java/io/jans/as/server/revoke/RevokeRestWebServiceImpl.java

@@ -40,6 +40,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -190,15 +191,21 @@ public void validateSameClient(AuthorizationGrant grant, Client client) {
     }
 
     private void removeAllTokens(TokenTypeHint tth, ExecutionContext executionContext) {
-        final List<TokenEntity> tokens = grantService.getGrantsOfClient(executionContext.getClient().getClientId());
+        final String clientId = executionContext.getClient().getClientId();
+        final List<TokenEntity> tokens = grantService.getGrantsOfClient(clientId);
+        log.debug("Revoking all tokens of client {}...", clientId);
+
+        List<TokenEntity> tokensToRemove = new ArrayList<>();
         for (TokenEntity token : tokens) {
             if (tth == null ||
                     (tth == TokenTypeHint.ACCESS_TOKEN && token.getTokenTypeEnum() == TokenType.ACCESS_TOKEN) ||
                     (tth == TokenTypeHint.TX_TOKEN && token.getTokenTypeEnum() == TokenType.TX_TOKEN) ||
                     (tth == TokenTypeHint.REFRESH_TOKEN && token.getTokenTypeEnum() == TokenType.REFRESH_TOKEN)) {
-                grantService.removeSilently(token);
+               tokensToRemove.add(token);
             }
         }
+        grantService.removeSilently(tokensToRemove);
+        log.debug("Revoked all tokens of client {}.", clientId);
     }
 
     private AuthorizationGrant findAuthorizationGrant(String token, TokenTypeHint tth) {

jans-auth-server/server/src/main/java/io/jans/as/server/service/GrantService.java

@@ -163,7 +163,10 @@ public void removeSilently(TokenEntity token) {
             }
 
             statusListPool.execute(() -> {
-                statusListIndexService.updateStatusAtIndex(token.getAttributes().getStatusListIndex(), TokenStatus.INVALID);
+                final Integer index = token.getAttributes().getStatusListIndex();
+                if (index != null && index > 0) {
+                    statusListIndexService.updateStatusAtIndexes(Lists.newArrayList(index), TokenStatus.INVALID);
+                }
             });
         } catch (Exception e) {
             log.error(e.getMessage(), e);
@@ -184,9 +187,30 @@ public void remove(List<TokenEntity> entries) {
 
     public void removeSilently(List<TokenEntity> entries) {
         if (entries != null && !entries.isEmpty()) {
+            List<Integer> indexes = new ArrayList<>();
             for (TokenEntity t : entries) {
-                removeSilently(t);
+                try {
+                    remove(t);
+
+                    if (StringUtils.isNotBlank(t.getAuthorizationCode())) {
+                        cacheService.remove(CacheGrant.cacheKey(t.getAuthorizationCode(), t.getGrantId()));
+                    }
+                    if (shouldSaveInCache()) {
+                        cacheService.remove(t.getTokenCode());
+                    }
+
+                    final Integer index = t.getAttributes().getStatusListIndex();
+                    if (index != null && index >= 0) {
+                        indexes.add(index);
+                    }
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
             }
+
+            statusListPool.execute(() -> {
+                statusListIndexService.updateStatusAtIndexes(indexes, TokenStatus.INVALID);
+            });
         }
     }