From a5d7cd3d51f4700888fa30f7a3c6583775ea63fc Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Tue, 20 Mar 2012 15:59:21 -0700
Subject: [PATCH] Bug 14336 - Login API does not return UUID's

Changes:
- login API now returns back UUID for user and domain
---
 server/src/com/cloud/api/ApiServer.java | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java
index 82327f78ab4..45918967a4e 100755
--- a/server/src/com/cloud/api/ApiServer.java
+++ b/server/src/com/cloud/api/ApiServer.java
@@ -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
-            session.setAttribute("userid", userAcct.getId());
+            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());
-            session.setAttribute("domainid", account.getDomainId());
+            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());