do not use security context in core plugins and samples

This commit is contained in:
Sebastian Sdorra
2012-08-30 12:08:16 +02:00
parent c40cbeb4d6
commit 7d0980605e
5 changed files with 44 additions and 49 deletions

View File

@@ -35,10 +35,10 @@ package sample.hello;
//~--- non-JDK imports --------------------------------------------------------
import com.google.inject.Inject;
import com.google.inject.Provider;
import org.apache.shiro.SecurityUtils;
import org.apache.shiro.subject.Subject;
import sonia.scm.security.SecurityContext;
import sonia.scm.user.User;
//~--- JDK imports ------------------------------------------------------------
@@ -61,11 +61,18 @@ public class HelloResource
*
* @param securityContextProvider
*/
@Inject
public HelloResource(Provider<SecurityContext> securityContextProvider)
public HelloResource()
{
message = "Hello "
+ securityContextProvider.get().getUser().getDisplayName();
Subject subject = SecurityUtils.getSubject();
String displayName = "Unknown";
if (subject.isAuthenticated())
{
displayName =
subject.getPrincipals().oneByType(User.class).getDisplayName();
}
message = "Hello " + displayName;
}
//~--- get methods ----------------------------------------------------------