From 6c444343d14bd3158bb27285efbcb17141166bff Mon Sep 17 00:00:00 2001
From: Anton Tananaev <anton.tananaev@gmail.com>
Date: Tue, 1 Dec 2015 11:30:03 +1300
Subject: Remove response builder utility class

---
 src/org/traccar/api/SecurityRequestFilter.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/org/traccar/api/SecurityRequestFilter.java')

diff --git a/src/org/traccar/api/SecurityRequestFilter.java b/src/org/traccar/api/SecurityRequestFilter.java
index 8dbd2bbb0..e9d285f9b 100644
--- a/src/org/traccar/api/SecurityRequestFilter.java
+++ b/src/org/traccar/api/SecurityRequestFilter.java
@@ -25,9 +25,13 @@ import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.container.ContainerRequestContext;
 import javax.ws.rs.container.ContainerRequestFilter;
 import javax.ws.rs.container.ResourceInfo;
+import javax.ws.rs.core.Response;
 
 public class SecurityRequestFilter implements ContainerRequestFilter {
 
+    private static final String WWW_AUTHENTICATE = "WWW-Authenticate";
+    private static final String BASIC_REALM = "Basic realm=\"api\"";
+
     @javax.ws.rs.core.Context
     private ResourceInfo resourceInfo;
 
@@ -40,7 +44,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
         }
 
         if (method.isAnnotationPresent(DenyAll.class)) {
-            requestContext.abortWith(ResponseBuilder.forbidden());
+            requestContext.abortWith(Response.status(Response.Status.FORBIDDEN).build());
             return;
         }
 
@@ -49,7 +53,8 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
             || userPrincipal.getName() == null
             || userPrincipal.getPassword() == null
             || !isAuthenticatedUser(userPrincipal)) {
-            requestContext.abortWith(ResponseBuilder.unauthorized());
+            requestContext.abortWith(
+                    Response.status(Response.Status.UNAUTHORIZED).header(WWW_AUTHENTICATE, BASIC_REALM).build());
             return;
         }
 
@@ -57,7 +62,7 @@ public class SecurityRequestFilter implements ContainerRequestFilter {
             RolesAllowed rolesAnnotation = method.getAnnotation(RolesAllowed.class);
             Set<String> roles = new HashSet<>(Arrays.asList(rolesAnnotation.value()));
             if (!isAuthorizedUser(userPrincipal, roles)) {
-                requestContext.abortWith(ResponseBuilder.forbidden());
+                requestContext.abortWith(Response.status(Response.Status.FORBIDDEN).build());
                 return;
             }
         }
-- 
cgit v1.2.3