diff options
author | Matthew Harmsen <mharmsen@redhat.com> | 2016-11-03 16:10:55 -0600 |
---|---|---|
committer | Matthew Harmsen <mharmsen@redhat.com> | 2016-11-03 16:10:55 -0600 |
commit | 54496a801f235cd1eafd6d600387046aaa1bffcd (patch) | |
tree | 4e3e02bfd4ca324e6803437b40ecc137266c2a1e /base/server/cms/src/org | |
parent | 3231f58709116a3d2f8725aa519c36bd9a0bf898 (diff) | |
download | pki-54496a801f235cd1eafd6d600387046aaa1bffcd.tar.gz pki-54496a801f235cd1eafd6d600387046aaa1bffcd.tar.xz pki-54496a801f235cd1eafd6d600387046aaa1bffcd.zip |
Revert "Fixed TPS UI system menu."
This reverts commit f979c3b436e9a12e8c71ba0abab5c892d375f945.
Diffstat (limited to 'base/server/cms/src/org')
-rw-r--r-- | base/server/cms/src/org/dogtagpki/server/rest/AccountService.java | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java b/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java index 673db45b6..827e99e07 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java @@ -21,8 +21,13 @@ package org.dogtagpki.server.rest; import java.security.Principal; import java.util.Arrays; +import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.HttpHeaders; +import javax.ws.rs.core.Request; import javax.ws.rs.core.Response; +import javax.ws.rs.core.UriInfo; import org.apache.catalina.realm.GenericPrincipal; import org.apache.commons.lang.StringUtils; @@ -38,40 +43,47 @@ import com.netscape.cms.servlet.base.PKIService; */ public class AccountService extends PKIService implements AccountResource { - protected AccountInfo createAccountInfo() { + @Context + private UriInfo uriInfo; + + @Context + private HttpHeaders headers; + + @Context + private Request request; + + @Context + private HttpServletRequest servletRequest; + + @Override + public Response login() { + HttpSession session = servletRequest.getSession(); + System.out.println("Creating session "+session.getId()); + Principal principal = servletRequest.getUserPrincipal(); - System.out.println("Principal: " + principal); + System.out.println("Principal: "+principal); - AccountInfo accountInfo = new AccountInfo(); + AccountInfo response = new AccountInfo(); String name = principal.getName(); - accountInfo.setID(name); + response.setID(name); if (principal instanceof PKIPrincipal) { PKIPrincipal pkiPrincipal = (PKIPrincipal)principal; IUser user = pkiPrincipal.getUser(); String fullName = user.getFullName(); - if (!StringUtils.isEmpty(fullName)) accountInfo.setFullName(fullName); + if (!StringUtils.isEmpty(fullName)) response.setFullName(fullName); String email = user.getEmail(); - if (!StringUtils.isEmpty(email)) accountInfo.setEmail(email); + if (!StringUtils.isEmpty(email)) response.setEmail(email); } if (principal instanceof GenericPrincipal) { String[] roles = ((GenericPrincipal) principal).getRoles(); - accountInfo.setRoles(Arrays.asList(roles)); + response.setRoles(Arrays.asList(roles)); } - return accountInfo; - } - - @Override - public Response login() { - HttpSession session = servletRequest.getSession(); - System.out.println("Creating session " + session.getId()); - - AccountInfo accountInfo = createAccountInfo(); - return createOKResponse(accountInfo); + return createOKResponse(response); } @Override |