Improved AuthenticationException.
Change-Id: I5c621a1da2df73b3dfb864771d2e9c03bf64942f
diff --git a/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java b/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
index 95cb077..e5fa7f1 100644
--- a/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
+++ b/full/src/main/java/de/ids_mannheim/korap/web/filter/NonDemoBlockingFilter.java
@@ -4,6 +4,9 @@
import com.sun.jersey.spi.container.ContainerRequestFilter;
import com.sun.jersey.spi.container.ContainerResponseFilter;
import com.sun.jersey.spi.container.ResourceFilter;
+
+import de.ids_mannheim.korap.exceptions.KustvaktException;
+import de.ids_mannheim.korap.exceptions.StatusCodes;
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.web.utils.KustvaktResponseHandler;
@@ -34,13 +37,14 @@
context = (TokenContext) request.getUserPrincipal();
}
catch (UnsupportedOperationException e) {
- throw kustvaktResponseHandler.throwAuthenticationException("");
+ throw kustvaktResponseHandler.throwit(new KustvaktException(
+ StatusCodes.UNAUTHORIZED_OPERATION, e.getMessage(), e));
}
- if (context == null || context.isDemo())
- throw kustvaktResponseHandler
- .throwAuthenticationException("Service not available for non-authenticated "
- + "or demo account users!");
+ if (context == null || context.isDemo()){
+ new KustvaktException(StatusCodes.UNAUTHORIZED_OPERATION,
+ "Operation is not permitted for guest users");
+ }
return request;
}