refactored logic in unblockAccount method and generating token

core/src/main/resources/messages_en.properties

@@ -42,7 +42,7 @@ sincerely.yours.greenCity=Sincerely yours, Green City team.
 sincerely.yours.Ubs=Sincerely yours, Pick Up City team.
 unsubscribe.text=If you no longer wish to receive these emails, you can
 unsubscribe=unsubscribe
-unlock=Unlock account
+unlock=Unblock account
 block.account=Account blocked
 text.account.ban=Your account has been locked for security reasons due to a possible hacking attempt. For your safety, we recommend changing your password after restoring your account.
 warning=Warning!

service-api/src/main/java/greencity/security/jwt/JwtTool.java

@@ -195,11 +195,17 @@ public String generateTokenKeyWithCodedDate() {
      */
     public String generateUnblockToken(String email) {
         ClaimsBuilder claims = Jwts.claims().subject(email);
+        Date now = new Date();
+        Calendar calendar = Calendar.getInstance();
+        calendar.setTime(now);
+        calendar.add(Calendar.MONTH, 1);
         return Jwts.builder()
             .claims(claims.build())
             .signWith(Keys.hmacShaKeyFor(
                 accessTokenKey.getBytes(StandardCharsets.UTF_8)),
                 Jwts.SIG.HS256)
+            .issuedAt(now)
+            .expiration(calendar.getTime())
             .compact();
     }
 }

service-api/src/main/java/greencity/security/service/LoginAttemptService.java

@@ -39,4 +39,11 @@ public interface LoginAttemptService {
      * @return true if user is blocked, false otherwise.
      */
     boolean isBlockedByWrongPassword(String email);
+
+    /**
+     * Deletes the given {@code email} from cache.
+     *
+     * @param email identifies the user.
+     */
+    void deleteEmailFromCache(String email);
 }

service/src/main/java/greencity/security/service/LoginAttemptServiceImpl.java

@@ -74,4 +74,13 @@ public boolean isBlockedByWrongPassword(String email) {
             return false;
         }
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void deleteEmailFromCache(String email) {
+        attemptsByCaptchaCache.invalidate(email);
+        attemptsByWrongPasswordCache.invalidate(email);
+    }
 }

service/src/main/java/greencity/security/service/OwnSecurityServiceImpl.java

@@ -447,6 +447,8 @@ public void unblockAccount(String token) {
         } catch (IllegalArgumentException e) {
             throw new BadRequestException(ErrorMessage.TOKEN_FOR_RESTORE_IS_INVALID);
         }
+        loginAttemptService.deleteEmailFromCache(email);
+
         User user = userRepo.findByEmail(email)
             .orElseThrow(() -> new NotFoundException(ErrorMessage.USER_NOT_FOUND_BY_EMAIL));
         user.setUserStatus(UserStatus.ACTIVATED);

service/src/test/java/greencity/security/service/LoginAttemptServiceImplTest.java

@@ -131,4 +131,14 @@ void testIsBlockedByPasswordExecutionException() throws ExecutionException {
 
         verify(attemptsByWrongPasswordCache).get("test@test.com");
     }
+
+    @Test
+    void deleteEmailFromCaches() {
+        String email = "test@mail.com";
+
+        loginAttemptService.deleteEmailFromCache(email);
+
+        verify(attemptsByCaptchaCache).invalidate(email);
+        verify(attemptsByWrongPasswordCache).invalidate(email);
+    }
 }