diff options
author | Endi S. Dewata <edewata@redhat.com> | 2016-10-20 00:54:47 +0200 |
---|---|---|
committer | Endi S. Dewata <edewata@redhat.com> | 2016-11-22 18:33:09 +0100 |
commit | 6d5d15edebeb1ba113e4f3d5b2bb1ba93a92ce1d (patch) | |
tree | 1ac8b0fb19e3db44ce87be19148a6819227541fa /base/server/cms/src/org | |
parent | 0a6289f5d94ec238e66d05782b9fdd2207ac7e9a (diff) | |
download | pki-6d5d15edebeb1ba113e4f3d5b2bb1ba93a92ce1d.tar.gz pki-6d5d15edebeb1ba113e4f3d5b2bb1ba93a92ce1d.tar.xz pki-6d5d15edebeb1ba113e4f3d5b2bb1ba93a92ce1d.zip |
Updated AccountInfo.
The AccountInfo has been changed to extend the ResourceMessage
such that it can be used to pass the list of accessible
components as an attribute.
https://fedorahosted.org/pki/ticket/2523
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, 17 insertions, 29 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 827e99e07..673db45b6 100644 --- a/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java +++ b/base/server/cms/src/org/dogtagpki/server/rest/AccountService.java @@ -21,13 +21,8 @@ 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; @@ -43,47 +38,40 @@ import com.netscape.cms.servlet.base.PKIService; */ public class AccountService extends PKIService implements AccountResource { - @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()); - + protected AccountInfo createAccountInfo() { Principal principal = servletRequest.getUserPrincipal(); - System.out.println("Principal: "+principal); + System.out.println("Principal: " + principal); - AccountInfo response = new AccountInfo(); + AccountInfo accountInfo = new AccountInfo(); String name = principal.getName(); - response.setID(name); + accountInfo.setID(name); if (principal instanceof PKIPrincipal) { PKIPrincipal pkiPrincipal = (PKIPrincipal)principal; IUser user = pkiPrincipal.getUser(); String fullName = user.getFullName(); - if (!StringUtils.isEmpty(fullName)) response.setFullName(fullName); + if (!StringUtils.isEmpty(fullName)) accountInfo.setFullName(fullName); String email = user.getEmail(); - if (!StringUtils.isEmpty(email)) response.setEmail(email); + if (!StringUtils.isEmpty(email)) accountInfo.setEmail(email); } if (principal instanceof GenericPrincipal) { String[] roles = ((GenericPrincipal) principal).getRoles(); - response.setRoles(Arrays.asList(roles)); + accountInfo.setRoles(Arrays.asList(roles)); } - return createOKResponse(response); + return accountInfo; + } + + @Override + public Response login() { + HttpSession session = servletRequest.getSession(); + System.out.println("Creating session " + session.getId()); + + AccountInfo accountInfo = createAccountInfo(); + return createOKResponse(accountInfo); } @Override |