Merge branch 'application-mgt-new' into 'application-mgt-new'

Fix image loading issue in tenants

See merge request entgra/carbon-device-mgt!255

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/ArtifactDownloadAPI.java

@@ -57,7 +57,7 @@ import javax.ws.rs.core.Response;
 public interface ArtifactDownloadAPI {
 
     @GET
-    @Path("/{uuid}/{folderName}/{fileName}")
+    @Path("/{tenantId}/{uuid}/{folderName}/{fileName}")
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
     @ApiOperation(
             produces = MediaType.APPLICATION_OCTET_STREAM,
@@ -81,6 +81,11 @@ public interface ArtifactDownloadAPI {
                             response = ErrorResponse.class)
             })
     Response getArtifact(
+            @ApiParam(
+                    name = "tenantId",
+                    value = "Tenant Id of the application artifact belongs.",
+                    required = true)
+            @PathParam("tenantId") int tenantId,
             @ApiParam(
             name = "uuid",
             value = "UUID of the application release.",

components/application-mgt/org.wso2.carbon.device.application.mgt.api/src/main/java/org/wso2/carbon/device/application/mgt/api/services/impl/ArtifactDownloadAPIImpl.java

@@ -47,14 +47,15 @@ public class ArtifactDownloadAPIImpl implements ArtifactDownloadAPI {
     @GET
     @Override
     @Produces(MediaType.APPLICATION_OCTET_STREAM)
-    @Path("/{uuid}/{folderName}/{fileName}")
+    @Path("/{tenantId}/{uuid}/{folderName}/{fileName}")
     public Response getArtifact(
+            @PathParam("tenantId") int tenantId,
             @PathParam("uuid") String uuid,
             @PathParam("folderName") String folderName,
             @PathParam("fileName") String fileName) {
         AppmDataHandler dataHandler = APIUtil.getDataHandler();
         try {
-            InputStream fileInputStream = dataHandler.getArtifactStream(uuid, folderName, fileName);
+            InputStream fileInputStream = dataHandler.getArtifactStream(tenantId, uuid, folderName, fileName);
             Response.ResponseBuilder response = Response
                     .ok(fileInputStream, MediaType.APPLICATION_OCTET_STREAM);
             response.status(Response.Status.OK);

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/services/AppmDataHandler.java

@@ -35,6 +35,6 @@ public interface AppmDataHandler {
 
     Map<String, LifecycleState> getLifecycleConfiguration() throws LifecycleManagementException;
 
-    InputStream getArtifactStream(String uuid, String folderName, String artifactName)
+    InputStream getArtifactStream(int tenantId, String uuid, String folderName, String artifactName)
             throws ApplicationManagementException;
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java

@@ -60,9 +60,8 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
         return lifecycleStateManager.getLifecycleConfig();
     }
 
-    @Override public InputStream getArtifactStream(String uuid, String folderName, String artifactName)
+    @Override public InputStream getArtifactStream(int tenantId, String uuid, String folderName, String artifactName)
             throws ApplicationManagementException {
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         ApplicationStorageManager applicationStorageManager = DAOUtil.getApplicationStorageManager();
         ApplicationReleaseDAO applicationReleaseDAO = ApplicationManagementDAOFactory.getApplicationReleaseDAO();
         String appReleaseHashValue;
@@ -83,9 +82,8 @@ public class AppmDataHandlerImpl implements AppmDataHandler {
             }
             return inputStream;
         } catch (ApplicationManagementDAOException e) {
-            String msg =
+            String msg = "Error occurred when retrieving application release hash value for given application release "
-                    "Error occurred when retrieving application release hash value for given application release UUID: "
+                    + "UUID: " + uuid;
-                            + uuid;
             log.error(msg, e);
             throw new ApplicationManagementException(msg, e);
         } catch (ApplicationStorageManagementException e) {

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/util/APIUtil.java

@@ -353,8 +353,7 @@ public class APIUtil {
         application.setRating(applicationDTO.getAppRating());
         List<ApplicationRelease> applicationReleases = new ArrayList<>();
         for (ApplicationReleaseDTO applicationReleaseDTO : applicationDTO.getApplicationReleaseDTOs()) {
-            ApplicationRelease applicationRelease = releaseDtoToRelease(applicationReleaseDTO);
+            applicationReleases.add(releaseDtoToRelease(applicationReleaseDTO));
-            applicationReleases.add(applicationRelease);
         }
         application.setApplicationReleases(applicationReleases);
         return application;
@@ -362,8 +361,10 @@ public class APIUtil {
 
     public static ApplicationRelease releaseDtoToRelease(ApplicationReleaseDTO applicationReleaseDTO)
             throws ApplicationManagementException {
-        String basePath = getArtifactDownloadBaseURL() + applicationReleaseDTO.getUuid()
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-                + Constants.FORWARD_SLASH;
+        String basePath =
+                getArtifactDownloadBaseURL() + tenantId + Constants.FORWARD_SLASH + applicationReleaseDTO.getUuid()
+                        + Constants.FORWARD_SLASH;
 
         List<String> screenshotPaths = new ArrayList<>();
         ApplicationRelease applicationRelease = new ApplicationRelease();

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/AppDetailsDrawer/AppDetailsDrawer.js

@@ -92,7 +92,6 @@ class AppDetailsDrawer extends React.Component {
 
     componentDidMount() {
         this.getCategories();
-        this.getTags();
     }
 
     componentDidUpdate(prevProps, prevState, snapshot) {
@@ -117,7 +116,7 @@ class AppDetailsDrawer extends React.Component {
         ).then(res => {
             if (res.status === 200) {
                 const categories = JSON.parse(res.data.data);
-
+                this.getTags();
                 const globalCategories = categories.map(category => {
                     return (
                         <Option

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/src/components/apps/list-apps/Filters.js

@@ -75,8 +75,6 @@ class FiltersForm extends React.Component {
 
     componentDidMount() {
         this.getCategories();
-        this.getTags();
-        this.getDeviceTypes();
     }
 
     getCategories = () => {
@@ -86,6 +84,7 @@ class FiltersForm extends React.Component {
         ).then(res => {
             if (res.status === 200) {
                 let categories = JSON.parse(res.data.data);
+                this.getTags();
                 this.setState({
                     categories: categories,
                     loading: false
@@ -116,6 +115,7 @@ class FiltersForm extends React.Component {
         ).then(res => {
             if (res.status === 200) {
                 let tags = JSON.parse(res.data.data);
+                this.getDeviceTypes();
                 this.setState({
                     tags: tags,
                     loading: false,

components/ui-request-interceptor/io.entgra.ui.request.interceptor/src/main/java/io/entgra/ui/request/interceptor/LoginHandler.java

@@ -38,8 +38,6 @@ import org.apache.http.entity.ContentType;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.protocol.HTTP;
 import org.wso2.carbon.device.application.mgt.common.ProxyResponse;
-import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
-import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
 
 import javax.servlet.annotation.MultipartConfig;
 import javax.servlet.annotation.WebServlet;
@@ -66,11 +64,6 @@ public class LoginHandler extends HttpServlet {
     protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
         try {
             validateLoginRequest(req, resp);
-            DeviceManagementConfig deviceManagementConfig = DeviceConfigurationManager.getInstance()
-                    .getDeviceManagementConfig();
-            String adminUsername = deviceManagementConfig.getIdentityConfigurations().getAdminUsername();
-            String adminPwd = deviceManagementConfig.getIdentityConfigurations().getAdminPassword();
-
             HttpSession httpSession = req.getSession(false);
             if (httpSession != null) {
                 httpSession.invalidate();
@@ -120,7 +113,7 @@ public class LoginHandler extends HttpServlet {
                 // default login
                 HttpPost apiRegEndpoint = new HttpPost(serverUrl + HandlerConstants.APP_REG_ENDPOINT);
                 apiRegEndpoint.setHeader(HttpHeaders.AUTHORIZATION, HandlerConstants.BASIC + Base64.getEncoder()
-                        .encodeToString((adminUsername + HandlerConstants.COLON + adminPwd).getBytes()));
+                        .encodeToString((username + HandlerConstants.COLON + password).getBytes()));
                 apiRegEndpoint.setHeader(HTTP.CONTENT_TYPE, ContentType.APPLICATION_JSON.toString());
                 apiRegEndpoint.setEntity(constructAppRegPayload(tags));