apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 11:52:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 14336 - Login API does not return UUID's

Browse Source 
Changes:
- login API now returns back UUID for user and domain
This commit is contained in:
prachi 2012-03-20 15:59:21 -07:00
parent 280d533a6f
commit a5d7cd3d51
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/com/cloud/api/ApiServer.java
View File

@ -106,6 +106,7 @@ import com.cloud.user.DomainManager;
import com.cloud.user.User;
import com.cloud.user.UserAccount;
import com.cloud.user.UserContext;
import com.cloud.user.UserVO;
import com.cloud.utils.IdentityProxy;
import com.cloud.utils.Pair;
import com.cloud.utils.PropertiesUtil;
@ -813,13 +814,24 @@ public class ApiServer implements HttpRequestHandler {
Account account = _accountMgr.getAccount(userAcct.getAccountId());
// set the userId and account object for everyone
UserVO user = (UserVO) _accountMgr.getActiveUser(userAcct.getId());
if(user.getUuid() != null){
session.setAttribute("userid", user.getUuid());
}
else{
session.setAttribute("userid", userAcct.getId());
}
session.setAttribute("username", userAcct.getUsername());
session.setAttribute("firstname", userAcct.getFirstname());
session.setAttribute("lastname", userAcct.getLastname());
session.setAttribute("accountobj", account);
session.setAttribute("account", account.getAccountName());
DomainVO domain = (DomainVO) _domainMgr.getDomain(account.getDomainId());
if(domain.getUuid() != null){
session.setAttribute("domainid", domain.getUuid());
}else{
session.setAttribute("domainid", account.getDomainId());
}
session.setAttribute("type", Short.valueOf(account.getType()).toString());
session.setAttribute("registrationtoken", userAcct.getRegistrationToken());
session.setAttribute("registered", new Boolean(userAcct.isRegistered()).toString());