@@ -40,11 +40,11 @@ private JWTAuthFilter(JsonWebTokenParser tokenParser, JsonWebTokenVerifier token
4040
4141 @ Override
4242 public void filter (final ContainerRequestContext requestContext ) throws IOException {
43- Optional <String > optionalToken = getTokenFromCookieOrHeader (requestContext );
43+ final Optional <String > optionalToken = getTokenFromCookieOrHeader (requestContext );
4444
4545 if (optionalToken .isPresent ()) {
4646 try {
47- final JsonWebToken token = verifiedToken (optionalToken );
47+ final JsonWebToken token = verifyToken (optionalToken . get () );
4848 final Optional <P > principal = authenticator .authenticate (token );
4949
5050 if (principal .isPresent ()) {
@@ -86,39 +86,31 @@ public String getAuthenticationScheme() {
8686 throw new WebApplicationException (unauthorizedHandler .buildResponse (prefix , realm ));
8787 }
8888
89- private JsonWebToken verifiedToken (Optional <String > optionalToken ) {
90- final String rawToken = optionalToken .get ();
89+ private JsonWebToken verifyToken (String rawToken ) {
9190 final JsonWebToken token = tokenParser .parse (rawToken );
9291 tokenVerifier .verifySignature (token );
9392 return token ;
9493 }
9594
9695 public Optional <String > getTokenFromCookieOrHeader (ContainerRequestContext requestContext ) {
97- Optional <String > headerToken = getTokenFromHeader (requestContext .getHeaders ());
96+ final Optional <String > headerToken = getTokenFromHeader (requestContext .getHeaders ());
9897
9998 if (headerToken .isPresent ()) {
10099 return headerToken ;
101100 }
102- else {
103- Optional <String > cookieToken = getTokenFromCookie (requestContext );
104101
105- if (cookieToken .isPresent ()) {
106- return cookieToken ;
107- }
108- else {
109- return Optional .absent ();
110- }
111- }
102+ final Optional <String > cookieToken = getTokenFromCookie (requestContext );
103+ return cookieToken .isPresent () ? cookieToken : Optional .<String >absent ();
112104 }
113105
114106 private Optional <String > getTokenFromHeader (MultivaluedMap <String , String > headers ) {
115- String header = headers .getFirst (HttpHeaders .AUTHORIZATION );
107+ final String header = headers .getFirst (HttpHeaders .AUTHORIZATION );
116108 if (header != null ) {
117109 int space = header .indexOf (' ' );
118110 if (space > 0 ) {
119- String method = header .substring (0 , space );
111+ final String method = header .substring (0 , space );
120112 if (prefix .equalsIgnoreCase (method )) {
121- String rawToken = header .substring (space + 1 );
113+ final String rawToken = header .substring (space + 1 );
122114 return Optional .of (rawToken );
123115 }
124116 }
@@ -128,12 +120,11 @@ private Optional<String> getTokenFromHeader(MultivaluedMap<String, String> heade
128120 }
129121
130122 public Optional <String > getTokenFromCookie (ContainerRequestContext requestContext ) {
131- Map <String , Cookie > cookies = requestContext .getCookies ();
123+ final Map <String , Cookie > cookies = requestContext .getCookies ();
132124
133125 if (cookieName != null && cookies .containsKey (cookieName )) {
134- Cookie tokenCookie = cookies .get (cookieName );
135- String rawToken = tokenCookie .getValue ();
136-
126+ final Cookie tokenCookie = cookies .get (cookieName );
127+ final String rawToken = tokenCookie .getValue ();
137128 return Optional .of (rawToken );
138129 }
139130
@@ -174,5 +165,4 @@ protected JWTAuthFilter<P> newInstance() {
174165 return new JWTAuthFilter <>(parser , verifier , cookieName );
175166 }
176167 }
177-
178168}
0 commit comments