From 54eb45fc793ef1b2526e8dd23bf8af970af60633 Mon Sep 17 00:00:00 2001
From: Cleverson Sacramento <cleverson.sacramento@gmail.com>
Date: Wed, 9 Sep 2015 11:38:03 -0300
Subject: [PATCH] FWK-235: HTTP 401 retorna conteúdo incompatível com o cabeçalho

---
 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java |  4 +---
 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java  |  4 +---
 impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java              | 16 ++++++----------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java
index a9ec22e..95d0603 100644
--- a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java
+++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthenticationExceptionMapper.java
@@ -41,7 +41,6 @@ import static javax.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;
 
 import java.util.logging.Logger;
 
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -59,14 +58,13 @@ public class AuthenticationExceptionMapper implements ExceptionMapper<Authentica
 	private transient Logger logger;
 
 	@Override
-	@Produces("text/plain")
 	public Response toResponse(AuthenticationException exception) {
 		int status = SC_UNAUTHORIZED;
 
 		String message = getBundle().getString("mapping-violations", status);
 		getLogger().log(FINE, message, exception);
 
-		return Response.status(status).entity(exception.getMessage()).build();
+		return Response.status(status).entity(exception.getMessage()).type("text/plain").build();
 	}
 
 	private ResourceBundle getBundle() {
diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java
index adeb559..c07dca1 100644
--- a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java
+++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/internal/implementation/AuthorizationExceptionMapper.java
@@ -41,7 +41,6 @@ import static javax.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 
 import java.util.logging.Logger;
 
-import javax.ws.rs.Produces;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.ext.ExceptionMapper;
 import javax.ws.rs.ext.Provider;
@@ -59,14 +58,13 @@ public class AuthorizationExceptionMapper implements ExceptionMapper<Authorizati
 	private transient Logger logger;
 
 	@Override
-	@Produces("text/plain")
 	public Response toResponse(AuthorizationException exception) {
 		int status = SC_FORBIDDEN;
 
 		String message = getBundle().getString("mapping-violations", status);
 		getLogger().log(FINE, message, exception);
 
-		return Response.status(status).entity(exception.getMessage()).build();
+		return Response.status(status).entity(exception.getMessage()).type("text/plain").build();
 	}
 
 	private ResourceBundle getBundle() {
diff --git a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java
index 81d2609..2733f4b 100644
--- a/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java
+++ b/impl/extension/rest/src/main/java/br/gov/frameworkdemoiselle/security/AbstractHTTPAuthorizationFilter.java
@@ -157,17 +157,13 @@ public abstract class AbstractHTTPAuthorizationFilter implements Filter {
 
 	private void setUnauthorizedStatus(HttpServletResponse response, AuthenticationException cause) throws IOException {
 		response.setStatus(SC_UNAUTHORIZED);
-		response.setContentType("text/plain; charset=UTF-8");
-		response.getWriter().write(cause.getMessage());
-	}
 
-	// private ResourceBundle getBundle() {
-	// if (bundle == null) {
-	// bundle = Beans.getReference(ResourceBundle.class, new NameQualifier("demoiselle-rest-bundle"));
-	// }
-	//
-	// return bundle;
-	// }
+		String message = cause.getMessage();
+		if (!Strings.isEmpty(message)) {
+			response.setContentType("text/plain; charset=UTF-8");
+			response.getWriter().write(message);
+		}
+	}
 
 	private Logger getLogger() {
 		if (logger == null) {
--
libgit2 0.21.2