Merge pull request wso2-extensions#121 from sadilchamishka/org-mgt-pa…

…cth-1 Fix for displaying tenant created user as null when organization creation
vinumaddumage · Aug 7, 2022 · 9ec73b1 · 9ec73b1
2 parents a9ba151 + 2cb3337
commit 9ec73b1
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...ava/org/wso2/carbon/identity/organization/management/service/OrganizationManagerImpl.java b/...ava/org/wso2/carbon/identity/organization/management/service/OrganizationManagerImpl.java
@@ -153,8 +153,9 @@ public Organization addOrganization(Organization organization) throws Organizati
         setCreatedAndLastModifiedTime(organization);
         organizationManagementDAO.addOrganization(organization);
         String orgCreatorID = getUserId();
+        String orgCreatorName = getAuthenticatedUsername();
         if (StringUtils.equals(TENANT.toString(), organization.getType())) {
-            createTenant(organization.getId(), orgCreatorID);
+            createTenant(organization.getId(), orgCreatorID, orgCreatorName);
         }
         return organization;
     }
@@ -797,13 +798,15 @@ private boolean isFilteringAttributeNotSupported(String attributeValue) {
                 !attributeValue.equalsIgnoreCase(PAGINATION_BEFORE);
     }
 
-    private void createTenant(String domain, String orgCreatorID) throws OrganizationManagementException {
+    private void createTenant(String domain, String orgCreatorID, String orgCreatorName)
+            throws OrganizationManagementException {
 
         try {
             PrivilegedCarbonContext.startTenantFlow();
             PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(MultitenantConstants
                     .SUPER_TENANT_DOMAIN_NAME);
             PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(MultitenantConstants.SUPER_TENANT_ID);
+            PrivilegedCarbonContext.getThreadLocalCarbonContext().setUsername(orgCreatorName);
             getTenantMgtService().addTenant(createTenantInfoBean(domain, orgCreatorID));
         } catch (TenantMgtException e) {
             // Rollback created organization.