Add authentication service

p-kimberley · Mar 3, 2020 · d40e1c9 · d40e1c9
1 parent 0b42f81
commit d40e1c9
Show file tree

Hide file tree

Showing 5 changed files with 543 additions and 446 deletions.
diff --git a/...ication/stroom-authentication-impl/src/main/java/stroom/authentication/TokenVerifier.java b/...ication/stroom-authentication-impl/src/main/java/stroom/authentication/TokenVerifier.java
@@ -45,16 +45,14 @@ public class TokenVerifier {
     private static final Logger LOGGER = LoggerFactory.getLogger(TokenDao.class);
 
     private AuthenticationConfig config;
-    private TokenDao tokenDao;
     private JwkDao jwkDao;
 
     private JwtConsumer consumer;
     private PublicJsonWebKey jwk;
 
     @Inject
-    public TokenVerifier(AuthenticationConfig config, TokenDao tokenDao, JwkDao jwkDao) {
+    public TokenVerifier(AuthenticationConfig config, JwkDao jwkDao) {
         this.config = config;
-        this.tokenDao = tokenDao;
         this.jwkDao = jwkDao;
     }
 
@@ -83,7 +81,7 @@ public void init() throws NoSuchAlgorithmException, JoseException {
         consumer = builder.build();
     }
 
-    public Optional<String> verifyToken(String token) {
+    public Optional<String> verifyToken(String token, Optional<Token> tokenRecord) {
         try {
             final JwtClaims claims = consumer.processToClaims(token);
             claims.getSubject();
@@ -92,12 +90,6 @@ public Optional<String> verifyToken(String token) {
             return Optional.empty();
         }
 
-        Optional<Token> tokenRecord = tokenDao.readByToken(token);
-        if (!tokenRecord.isPresent()) {
-            LOGGER.warn("I tried to verify a token but that token doesn't exist.");
-            return Optional.empty();
-        }
-
         if (!tokenRecord.get().isEnabled()) {
             LOGGER.warn("Someone tried to verify a token that is not enabled.");
             return Optional.empty();