refactor(): simplified returning token from cookie

ToastShaman · Apr 15, 2017 · ef83c5a · ef83c5a
1 parent 1da681c
commit ef83c5a
Showing 1 changed file with 1 addition and 7 deletions.
diff --git a/src/main/java/com/github/toastshaman/dropwizard/auth/jwt/JwtAuthFilter.java b/src/main/java/com/github/toastshaman/dropwizard/auth/jwt/JwtAuthFilter.java
@@ -90,13 +90,7 @@ private JwtContext verifyToken(String rawToken) throws InvalidJwtException {
 
     private Optional<String> getTokenFromCookieOrHeader(ContainerRequestContext requestContext) {
         final Optional<String> headerToken = getTokenFromHeader(requestContext.getHeaders());
-
-        if (headerToken.isPresent()) {
-            return headerToken;
-        }
-
-        final Optional<String> cookieToken = getTokenFromCookie(requestContext);
-        return cookieToken.isPresent() ? cookieToken : Optional.empty();
+        return headerToken.isPresent() ? headerToken : getTokenFromCookie(requestContext);
     }
 
     private Optional<String> getTokenFromHeader(MultivaluedMap<String, String> headers) {