From a81474b40aa9436b10fb33e4d358de9acbb813cc Mon Sep 17 00:00:00 2001 From: jendib Date: Sun, 20 Mar 2016 19:39:52 +0100 Subject: [PATCH] Fix authentication cookie extraction --- .../java/com/sismics/docs/rest/resource/UserResource.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java b/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java index c32a15f6..3d4beaed 100644 --- a/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java +++ b/docs-web/src/main/java/com/sismics/docs/rest/resource/UserResource.java @@ -323,7 +323,7 @@ public class UserResource extends BaseResource { // Deletes the client token in the HTTP response JsonObjectBuilder response = Json.createObjectBuilder(); - NewCookie cookie = new NewCookie(TokenBasedSecurityFilter.COOKIE_NAME, null); + NewCookie cookie = new NewCookie(TokenBasedSecurityFilter.COOKIE_NAME, null, "/", null, 1, null, -1, new Date(1), false, false); return Response.ok().entity(response.build()).cookie(cookie).build(); } @@ -646,7 +646,8 @@ public class UserResource extends BaseResource { private String getAuthToken() { if (request.getCookies() != null) { for (Cookie cookie : request.getCookies()) { - if (TokenBasedSecurityFilter.COOKIE_NAME.equals(cookie.getName())) { + if (TokenBasedSecurityFilter.COOKIE_NAME.equals(cookie.getName()) + && !Strings.isNullOrEmpty(cookie.getValue())) { return cookie.getValue(); } }