garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

use forbidden instead of unauthorized

Browse Source
This commit is contained in:
Athou
2013-06-24 16:37:11 +02:00
parent 268fb26220
commit 863ea406dc
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/commafeed/frontend/rest/resources/FeedREST.java
View File

@@ -450,7 +450,7 @@ public class FeedREST extends AbstractResourceREST {
} }
if (StartupBean.USERNAME_DEMO.equals(getUser().getName())) { if (StartupBean.USERNAME_DEMO.equals(getUser().getName())) {
return Response.status(Status.UNAUTHORIZED) return Response.status(Status.FORBIDDEN)
.entity("Import is disabled for the demo account").build(); .entity("Import is disabled for the demo account").build();
} }
try { try {

2
src/main/java/com/commafeed/frontend/rest/resources/ServerREST.java
View File

@@ -35,7 +35,7 @@ public class ServerREST extends AbstractResourceREST {
@Produces("image/png") @Produces("image/png")
public Response get(@QueryParam("u") String url) { public Response get(@QueryParam("u") String url) {
if (!applicationSettingsService.get().isImageProxyEnabled()) { if (!applicationSettingsService.get().isImageProxyEnabled()) {
return Response.status(Status.UNAUTHORIZED).build(); return Response.status(Status.FORBIDDEN).build();
} }
url = FeedUtils.imageProxyDecoder(url); url = FeedUtils.imageProxyDecoder(url);

4
src/main/java/com/commafeed/frontend/rest/resources/UserREST.java
View File

@@ -128,7 +128,7 @@ public class UserREST extends AbstractResourceREST {
} }
if (StartupBean.USERNAME_DEMO.equals(user.getName())) { if (StartupBean.USERNAME_DEMO.equals(user.getName())) {
return Response.status(Status.UNAUTHORIZED).build(); return Response.status(Status.FORBIDDEN).build();
} }
user.setEmail(StringUtils.trimToNull(request.getEmail())); user.setEmail(StringUtils.trimToNull(request.getEmail()));
@@ -167,7 +167,7 @@ public class UserREST extends AbstractResourceREST {
public Response delete() { public Response delete() {
if (StartupBean.USERNAME_ADMIN.equals(getUser().getName()) if (StartupBean.USERNAME_ADMIN.equals(getUser().getName())
|| StartupBean.USERNAME_DEMO.equals(getUser().getName())) { || StartupBean.USERNAME_DEMO.equals(getUser().getName())) {
return Response.status(Status.UNAUTHORIZED).build(); return Response.status(Status.FORBIDDEN).build();
} }
userService.unregister(getUser()); userService.unregister(getUser());
return Response.ok().build(); return Response.ok().build();