From b47929adfcdd6e6fbfd62733a23004afa5f8aa2a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sun, 30 Sep 2012 17:53:05 +0200 Subject: [PATCH] fix logout with enabled anonymous access --- .../resources/AuthenticationResource.java | 28 +++++++++++-------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java index 1ddb9f3f0a..75b8a562fa 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/rest/resources/AuthenticationResource.java @@ -195,15 +195,10 @@ public class AuthenticationResource Response resp = null; - // TODO handle anonymous access - - User user = null; - - if (user != null) + if (configuration.isAnonymousAccessEnabled()) { - ScmState state = createState(subject); - resp = Response.ok(state).build(); + resp = Response.ok(createAnonymousState()).build(); } else { @@ -272,11 +267,8 @@ public class AuthenticationResource } else if (configuration.isAnonymousAccessEnabled()) { - User user = new User(SCMContext.USER_ANONYMOUS, "SCM Anonymous", - "scm-anonymous@scm-manager.com"); - ScmState state = createState(user, Collections.EMPTY_LIST); - response = Response.ok(state).build(); + response = Response.ok(createAnonymousState()).build(); } else { @@ -288,6 +280,20 @@ public class AuthenticationResource //~--- methods -------------------------------------------------------------- + /** + * Method description + * + * + * @return + */ + private ScmState createAnonymousState() + { + User user = new User(SCMContext.USER_ANONYMOUS, "SCM Anonymous", + "scm-anonymous@scm-manager.com"); + + return createState(user, Collections.EMPTY_LIST); + } + /** * Method description *