Add org id to application property bag

Author: Chamila

components/apimgt/org.wso2.carbon.apimgt.api/src/main/java/org/wso2/carbon/apimgt/api/APIManager.java

@@ -277,6 +277,15 @@ void addOrUpdateComplexityDetails(String uuid, GraphqlComplexityInfo graphqlComp
      * @throws org.wso2.carbon.apimgt.api.APIManagementException if failed add subscriber
      */
     void addSubscriber(String username, String groupingId) throws APIManagementException;
+    
+    /**
+     * Creates a new subscriber given the username, the grouping Id and organization
+     *
+     * @param username   Username of the subscriber to be added
+     * @param groupingId - the groupId to which the subscriber belongs to
+     * @throws org.wso2.carbon.apimgt.api.APIManagementException if failed add subscriber
+     */
+    void addSubscriber(String username, String groupingId, String organization) throws APIManagementException;
 
     /**
      * Updates the details of the given subscriber.

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/AbstractAPIManager.java

@@ -607,6 +607,11 @@ public boolean isApiNameWithDifferentCaseExist(String apiName, String organizati
 
     public void addSubscriber(String username, String groupingId)
             throws APIManagementException {
+    	addSubscriber(username, groupingId, null);
+    }
+    	
+    public void addSubscriber(String username, String groupingId, String organization)
+            throws APIManagementException {
 
         Subscriber subscriber = new Subscriber(username);
         subscriber.setSubscribedDate(new Date());
@@ -619,7 +624,7 @@ public void addSubscriber(String username, String groupingId)
             if (APIUtil.isDefaultApplicationCreationEnabled() &&
                     !APIUtil.isDefaultApplicationCreationDisabledForTenant(getTenantDomain(username))) {
                 // Add a default application once subscriber is added
-                addDefaultApplicationForSubscriber(subscriber);
+                addDefaultApplicationForSubscriber(subscriber, organization);
             }
         } catch (APIManagementException e) {
             String msg = "Error while adding the subscriber " + subscriber.getName();
@@ -641,7 +646,7 @@ protected String getTenantDomain(String username) {
      * @param subscriber Subscriber
      * @throws APIManagementException if an error occurs while adding default application
      */
-    private void addDefaultApplicationForSubscriber(Subscriber subscriber) throws APIManagementException {
+    private void addDefaultApplicationForSubscriber(Subscriber subscriber, String organization) throws APIManagementException {
 
         Application defaultApp = new Application(APIConstants.DEFAULT_APPLICATION_NAME, subscriber);
         defaultApp.setTier(APIUtil.getDefaultApplicationLevelPolicy(subscriber.getTenantId()));
@@ -650,6 +655,9 @@ private void addDefaultApplicationForSubscriber(Subscriber subscriber) throws AP
         defaultApp.setTokenType(APIConstants.TOKEN_TYPE_JWT);
         defaultApp.setUUID(UUID.randomUUID().toString());
         defaultApp.setDescription(APIConstants.DEFAULT_APPLICATION_DESCRIPTION);
+	 if (organization != null) {
+	     defaultApp.setSubOrganization(organization);
+	 }
         int applicationId = apiMgtDAO.addApplication(defaultApp, subscriber.getName(), tenantDomain);
 
         ApplicationEvent applicationEvent = new ApplicationEvent(UUID.randomUUID().toString(),

components/apimgt/org.wso2.carbon.apimgt.rest.api.util/src/main/java/org/wso2/carbon/apimgt/rest/api/util/interceptors/SubscriberRegistrationInterceptor.java

@@ -16,22 +16,27 @@
 
 package org.wso2.carbon.apimgt.rest.api.util.interceptors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.cxf.message.Message;
 import org.apache.cxf.phase.AbstractPhaseInterceptor;
 import org.apache.cxf.phase.Phase;
 import org.wso2.carbon.apimgt.api.APIConsumer;
 import org.wso2.carbon.apimgt.api.APIManagementException;
+import org.wso2.carbon.apimgt.api.model.Application;
+import org.wso2.carbon.apimgt.api.model.OrganizationInfo;
 import org.wso2.carbon.apimgt.api.model.Subscriber;
 import org.wso2.carbon.apimgt.impl.APIConstants;
 import org.wso2.carbon.apimgt.impl.utils.APIUtil;
+import org.wso2.carbon.apimgt.impl.utils.ApplicationUtils;
 import org.wso2.carbon.apimgt.rest.api.common.RestApiCommonUtil;
 import org.wso2.carbon.apimgt.rest.api.common.RestApiConstants;
 import org.wso2.carbon.apimgt.rest.api.util.MethodStats;
 import org.wso2.carbon.apimgt.rest.api.util.utils.RestApiUtil;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import org.wso2.carbon.utils.multitenancy.MultitenantUtils;
 
 import java.util.Arrays;
 import javax.cache.Cache;
@@ -76,6 +81,11 @@ public void handleMessage(Message message) {
         // check the existence in the database
         String groupId = RestApiUtil.getLoggedInUserGroupId();
         String tenantDomain = RestApiCommonUtil.getLoggedInUserTenantDomain();
+        OrganizationInfo orgInfo = (OrganizationInfo) message.get(RestApiConstants.ORGANIZATION_INFO);
+	 String organizationId = null;
+	 if (orgInfo != null && !StringUtils.isEmpty(orgInfo.getOrganizationId())) {
+	     organizationId = orgInfo.getOrganizationId();
+	 }
         try {
             //takes a consumer object using the user set in thread local carbon context
             APIConsumer apiConsumer = RestApiCommonUtil.getLoggedInUserConsumer();
@@ -98,7 +108,7 @@ public void handleMessage(Message message) {
                         if (!APIConstants.SUPER_TENANT_DOMAIN.equalsIgnoreCase(tenantDomain)) {
                             loadTenantRegistry();
                         }
-                        apiConsumer.addSubscriber(username, groupId);
+                        apiConsumer.addSubscriber(username, groupId, organizationId);
 
                         // The subscriber object added here is not a complete subscriber object. It will only contain
                         //  username
@@ -108,9 +118,24 @@ public void handleMessage(Message message) {
                         }
                     }
                 }
-            } else {
-                subscriberCache.put(username, subscriber);
-            }
+	     } else {
+		 if (organizationId != null && APIUtil.isDefaultApplicationCreationEnabled() && !APIUtil
+			 .isDefaultApplicationCreationDisabledForTenant(MultitenantUtils.getTenantDomain(username))) {
+		     Application defaultAPP = ApplicationUtils.retrieveApplication(APIConstants.DEFAULT_APPLICATION_NAME,
+			     username, groupId);
+		     if (defaultAPP.getSubOrganization() == null) {
+			 synchronized ((username + LOCK_POSTFIX).intern()) {
+			     defaultAPP = ApplicationUtils.retrieveApplication(APIConstants.DEFAULT_APPLICATION_NAME,
+				     username, groupId);
+			     if (defaultAPP.getSubOrganization() == null) {
+				 defaultAPP.setSubOrganization(organizationId);
+				 apiConsumer.updateApplication(defaultAPP);
+			     }
+			 }
+		     }
+		 }
+		 subscriberCache.put(username, subscriber);
+	     }
         } catch (APIManagementException e) {
             RestApiUtil.handleInternalServerError("Unable to add the subscriber " + username, e, logger);
         }