Merge pull request #23 from JavaCoDED78/#22

Author: JavaCoDED78

src/main/java/io/github/javacoded78/jwthumble/service/PersistentTokenService.java

@@ -0,0 +1,27 @@
+package io.github.javacoded78.jwthumble.service;
+
+import io.github.javacoded78.jwthumble.config.TokenParameters;
+
+/**
+ * Interface if PersistentTokenService.
+ */
+public interface PersistentTokenService extends TokenService {
+
+    /**
+     * Removes JWT token from storage. Method removes all entries
+     * of the same token.
+     *
+     * @param token JWT token to be removed
+     * @return true - if JWT token was removed, false - otherwise
+     */
+    boolean invalidate(String token);
+
+    /**
+     * Removes JWT token from storage.
+     *
+     * @param params params of JWT token
+     * @return true - if JWT token was removed, false - otherwise
+     */
+    boolean invalidate(TokenParameters params);
+
+}

src/main/java/io/github/javacoded78/jwthumble/service/PersistentTokenServiceImpl.java

@@ -17,7 +17,7 @@
 /**
  * Implementation of TokenService with JWT token storage.
  */
-public class PersistentTokenServiceImpl implements TokenService {
+public class PersistentTokenServiceImpl implements PersistentTokenService {
 
     /**
      * Secret key for verifying JWT token.
@@ -148,4 +148,14 @@ public Map<String, Object> claims(final String token) {
         return new HashMap<>(claims.getPayload());
     }
 
+    @Override
+    public boolean invalidate(final String token) {
+        return tokenStorage.remove(token);
+    }
+
+    @Override
+    public boolean invalidate(final TokenParameters params) {
+        return tokenStorage.remove(params);
+    }
+
 }

src/main/java/io/github/javacoded78/jwthumble/storage/RedisTokenStorageImpl.java

@@ -122,4 +122,35 @@ public String get(final TokenParameters params) {
         }
     }
 
+    @Override
+    public boolean remove(final String token) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            String script = """
+                    local keys = redis.call('keys', ARGV[1])
+                    for _, key in ipairs(keys) do
+                      redis.call('del', key)
+                    end
+                    return #keys > 0
+                    """;
+            Long result = (Long) jedis.eval(
+                    script,
+                    0,
+                    "*",
+                    token
+            );
+            return result != null && result > 0;
+        }
+    }
+
+    @Override
+    public boolean remove(final TokenParameters params) {
+        try (Jedis jedis = jedisPool.getResource()) {
+            String tokenKey = redisSchema.subjectTokenKey(
+                    params.getSubject(),
+                    params.getType()
+            );
+            return jedis.del(tokenKey) > 0;
+        }
+    }
+
 }

src/main/java/io/github/javacoded78/jwthumble/storage/TokenStorage.java

@@ -34,4 +34,20 @@ boolean exists(String token,
      */
     String get(TokenParameters params);
 
+    /**
+     * Removes JWT token from storage.
+     *
+     * @param token JWT token to be removed
+     * @return true - if JWT token was removed, false - otherwise
+     */
+    boolean remove(String token);
+
+    /**
+     * Removes JWT token from storage.
+     *
+     * @param params params of JWT token
+     * @return true - if JWT token was removed, false - otherwise
+     */
+    boolean remove(TokenParameters params);
+
 }

src/main/java/io/github/javacoded78/jwthumble/storage/TokenStorageImpl.java

@@ -4,6 +4,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
  * Basic implementation of TokenStorage. Not thread-safe.
@@ -56,4 +57,26 @@ public String get(final TokenParameters params) {
         return tokens.get(tokenKey);
     }
 
+    @Override
+    public boolean remove(final String token) {
+        AtomicBoolean deleted = new AtomicBoolean(false);
+        for (Map.Entry<String, String> entry : tokens.entrySet()) {
+            if (entry.getValue().equals(token)) {
+                tokens.remove(entry.getKey());
+                deleted.set(true);
+                return true;
+            }
+        }
+        return deleted.get();
+    }
+
+    @Override
+    public boolean remove(final TokenParameters params) {
+        String tokenKey = subjectTokenKey(
+                params.getSubject(),
+                params.getType()
+        );
+        return tokens.remove(tokenKey) != null;
+    }
+
 }

src/test/java/io/github/javacoded78/jwthumble/fake/FakeTokenStorageImpl.java

@@ -4,6 +4,7 @@
 import io.github.javacoded78.jwthumble.storage.TokenStorage;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 public class FakeTokenStorageImpl implements TokenStorage {
 
@@ -43,4 +44,26 @@ public boolean exists(final String token,
         return token.equals(tokens.get(tokenKey));
     }
 
+    @Override
+    public boolean remove(final String token) {
+        AtomicBoolean deleted = new AtomicBoolean(false);
+        for (Map.Entry<String, String> entry : tokens.entrySet()) {
+            if (entry.getValue().equals(token)) {
+                tokens.remove(entry.getKey());
+                deleted.set(true);
+                return true;
+            }
+        }
+        return deleted.get();
+    }
+
+    @Override
+    public boolean remove(final TokenParameters params) {
+        String tokenKey = subjectTokenKey(
+                params.getSubject(),
+                params.getType()
+        );
+        return tokens.remove(tokenKey) != null;
+    }
+
 }

src/test/java/io/github/javacoded78/jwthumble/service/PersistentTokenServiceImplTests.java

@@ -14,6 +14,7 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -167,4 +168,58 @@ void claims_ReturnsCorrectClaims() {
         assertEquals(123, claims.get("key2"));
     }
 
+    @Test
+    void invalidate_Token() {
+        TokenParameters params = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String token = tokenService.create(params);
+
+        tokenService.invalidate(token);
+
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException ignored) {
+        }
+
+        TokenParameters newParams = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String newToken = tokenService.create(newParams);
+        assertNotEquals(token, newToken);
+    }
+
+    @Test
+    void invalidate_SubjectAndType() {
+        TokenParameters params = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String token = tokenService.create(params);
+
+        tokenService.invalidate(params);
+
+        try {
+            Thread.sleep(2000);
+        } catch (InterruptedException ignored) {
+        }
+
+        TokenParameters newParams = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String newToken = tokenService.create(newParams);
+        assertNotEquals(token, newToken);
+    }
+
 }

src/test/java/io/github/javacoded78/jwthumble/storage/RedisTokenStorageImplTests.java

@@ -127,4 +127,44 @@ void get_NonExistingToken_ReturnsNull() {
         assertNull(tokenStorage.get(params));
     }
 
+    @Test
+    void invalidate_Token() {
+        TokenParameters params = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String token = "testToken";
+        tokenStorage.save(
+                token,
+                params
+        );
+
+        tokenStorage.remove(token);
+
+        String existingToken = tokenStorage.get(params);
+        assertNull(existingToken);
+    }
+
+    @Test
+    void invalidate_SubjectAndType() {
+        TokenParameters params = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String token = "testToken";
+        tokenStorage.save(
+                token,
+                params
+        );
+
+        tokenStorage.remove(params);
+
+        String existingToken = tokenStorage.get(params);
+        assertNull(existingToken);
+    }
+
 }

src/test/java/io/github/javacoded78/jwthumble/storage/TokenStorageImplTests.java

@@ -101,5 +101,45 @@ void get_NonExistingToken_ReturnsNull() {
 
         assertNull(tokenStorage.get(params));
     }
+
+    @Test
+    void invalidate_Token() {
+        TokenParameters params = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String token = "testToken";
+        tokenStorage.save(
+                token,
+                params
+        );
+
+        tokenStorage.remove(token);
+
+        String existingToken = tokenStorage.get(params);
+        assertNull(existingToken);
+    }
+
+    @Test
+    void invalidate_SubjectAndType() {
+        TokenParameters params = TokenParameters.builder(
+                        subject,
+                        type,
+                        duration
+                )
+                .build();
+        String token = "testToken";
+        tokenStorage.save(
+                token,
+                params
+        );
+
+        tokenStorage.remove(params);
+
+        String existingToken = tokenStorage.get(params);
+        assertNull(existingToken);
+    }
 }