Change public website token finder return type from optional to list

Author: calvinlu3

src/main/java/org/mskcc/cbio/oncokb/repository/TokenRepository.java

@@ -30,7 +30,7 @@ public interface TokenRepository extends JpaRepository<Token, Long> {
     List<Token> findAllExpiresBeforeDate(Instant date);
 
     @Query("select token from Token token where token.user.login = org.mskcc.cbio.oncokb.config.Constants.PUBLIC_WEBSITE_LOGIN")
-    Optional<Token> findPublicWebsiteToken();
+    List<Token> findPublicWebsiteToken();
 
     @Cacheable(cacheResolver = "tokenCacheResolver")
     Optional<Token> findByToken(UUID token);

src/main/java/org/mskcc/cbio/oncokb/security/uuid/TokenProvider.java

@@ -108,13 +108,15 @@ public UUID getPubWebToken() {
         Optional<User> user = userRepository.findOneWithAuthoritiesByLogin(PUBLIC_WEBSITE_LOGIN);
         if (user.isPresent()) {
             Token userToken = new Token();
-            Optional<Token> tokenOptional  = tokenService.findPublicWebsiteToken();
-            if (!tokenOptional.isPresent()) {
+            List<Token> pubWebTokens  = tokenService.findPublicWebsiteToken();
+            if (pubWebTokens.isEmpty()) {
                 Token newToken = getNewToken(user.get().getAuthorities(), Optional.empty());
                 newToken.setUser(user.get());
                 userToken = tokenService.save(newToken);
             } else {
-                userToken = tokenOptional.get();
+                // We may have multiple public website tokens if the daily cronjob generates a new token
+                // before the expired token cronjob deletes the old token. We will use the token with the later expiration date.
+                userToken = pubWebTokens.stream().max((token1, token2) -> token1.getExpiration().compareTo(token2.getExpiration())).get();
                 if (userToken.getExpiration().isBefore(Instant.now())) {
                     // I want to update the token associated with public website once it's expired
                     Token newToken = getNewToken(user.get().getAuthorities(), Optional.empty(), Optional.empty());

src/main/java/org/mskcc/cbio/oncokb/service/TokenService.java

@@ -37,7 +37,7 @@ public interface TokenService {
      */
     Optional<Token> findOne(Long id);
 
-    Optional<Token> findPublicWebsiteToken();
+    List<Token> findPublicWebsiteToken();
 
     Optional<Token> findByToken(UUID token);
 

src/main/java/org/mskcc/cbio/oncokb/service/impl/TokenServiceImpl.java

@@ -80,7 +80,7 @@ public Optional<Token> findOne(Long id) {
     }
 
     @Override
-    public Optional<Token> findPublicWebsiteToken() {
+    public List<Token> findPublicWebsiteToken() {
         return tokenRepository.findPublicWebsiteToken();
     }