Merge branch 'release-2.0.x' of https://github.com/wso2/carbon-device-mgt into release-2.0.x

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/filter/ApiPermissionFilter.java

@@ -119,7 +119,7 @@ public class ApiPermissionFilter implements Filter {
                                 .getThreadLocalCarbonContext().getTenantId());
             return userRealm.getAuthorizationManager().isUserAuthorized(username, permission, action);
         } catch (UserStoreException e) {
-            String errorMsg = String.format("Unable to authorize the user : %s", username, e);
+            String errorMsg = String.format("Unable to authorize the user : %s", username);
             log.error(errorMsg, e);
             return false;
         }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/src/main/java/org/wso2/carbon/certificate/mgt/jaxrs/api/common/GsonMessageBodyHandler.java

@@ -83,11 +83,7 @@ public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, Messag
 
         OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
         try {
-            Type jsonType = null;
+            getGson().toJson(object, type, writer);
-            if (type.equals(type)) {
-                jsonType = type;
-            }
-            getGson().toJson(object, jsonType, writer);
         } finally {
             writer.close();
         }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/src/main/java/org/wso2/carbon/certificate/mgt/cert/jaxrs/api/common/GsonMessageBodyHandler.java

@@ -83,11 +83,7 @@ public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, Messag
 
         OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
         try {
-            Type jsonType = null;
+            getGson().toJson(object, type, writer);
-            if (type.equals(type)) {
-                jsonType = type;
-            }
-            getGson().toJson(object, jsonType, writer);
         } finally {
             writer.close();
         }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml

@@ -91,6 +91,7 @@
                         <Import-Package>
                             javax.naming,
                             javax.sql,
+                            javax.xml,
                             javax.xml.bind,
                             javax.xml.bind.annotation,
                             javax.xml.parsers; version="${javax.xml.parsers.import.pkg.version}",

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/util/DeviceTypeConfigUtil.java

@@ -21,8 +21,10 @@ package org.wso2.carbon.device.mgt.extensions.device.type.deployer.util;
 import org.w3c.dom.Document;
 import org.wso2.carbon.device.mgt.extensions.device.type.deployer.config.exception.DeviceTypeConfigurationException;
 
+import javax.xml.XMLConstants;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
 import java.io.File;
 
 /**
@@ -34,8 +36,12 @@ public class DeviceTypeConfigUtil {
         DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
         factory.setNamespaceAware(true);
         try {
+            factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
             DocumentBuilder docBuilder = factory.newDocumentBuilder();
             return docBuilder.parse(file);
+        } catch (ParserConfigurationException e) {
+            e.printStackTrace();
+            return null;
         } catch (Exception e) {
             throw new DeviceTypeConfigurationException("Error occurred while parsing file, while converting " +
                     "to a org.w3c.dom.Document", e);

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/common/GsonMessageBodyHandler.java

@@ -83,11 +83,7 @@ public class GsonMessageBodyHandler implements MessageBodyWriter<Object>, Messag
 
         OutputStreamWriter writer = new OutputStreamWriter(entityStream, UTF_8);
         try {
-            Type jsonType = null;
+            getGson().toJson(object, type, writer);
-            if (type.equals(type)) {
-                jsonType = type;
-            }
-            getGson().toJson(object, jsonType, writer);
         } finally {
             writer.close();
         }

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/device/details/DeviceInfo.java

@@ -370,7 +370,7 @@ public class DeviceInfo implements Serializable {
     }
 
     public Date getUpdatedTime() {
-        if(updatedTime.equals(null)){
+        if(updatedTime == null){
             updatedTime = new Date();
         }
         return updatedTime;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/device/details/DeviceLocation.java

@@ -137,7 +137,7 @@ public class DeviceLocation implements Serializable {
     }
 
     public Date getUpdatedTime() {
-        if(updatedTime.equals(null)){
+        if(updatedTime == null ){
             updatedTime = new Date();
         }
         return updatedTime;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/push/notification/NotificationContext.java

@@ -48,6 +48,10 @@ public class NotificationContext {
         return properties;
     }
 
+    public void setProperties(Map<String, String> propertiesMap) {
+        properties = propertiesMap;
+    }
+
     public Operation getOperation() {
         return operation;
     }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag

@@ -121,9 +121,9 @@ if (uriMatcher.match("/{context}/api/user/authenticate")) {
         } else {
             userRoles = String(addUserFormData.userRoles).split(",");
         }
-        if (username.length < devicemgtProps.usernameLength) {
+        if (username.length < devicemgtProps.userValidationConfig.usernameLength) {
-            log.error("Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long");
+            log.error("Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long");
-            result = "Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long";
+            result = "Username Must be between 1 and " + devicemgtProps.userValidationConfig.usernameLength + " characters long";
         } else {
             try {
                 result = userModule.addUser(username, firstname, lastname, emailAddress, userRoles);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -1,7 +1,5 @@
 {
     "appContext": "/devicemgt/",
-    "webAgentContext" : "/emm-web-agent/",
-    "apiContext": "api",
     "httpsURL" : "%https.ip%",
     "httpURL" : "%http.ip%",
     "httpsWebURL" : "%https.ip%",
@@ -15,7 +13,7 @@
     "iOSConfigRoot" : "%https.ip%/ios-enrollment/",
     "iOSAPIRoot" : "%https.ip%/ios/",
     "adminService": "%https.ip%",
-    "apimgt-gateway": false,
+    "gatewayEnabled": false,
     "oauthProvider": {
         "appRegistration": {
             "appType": "webapp",
@@ -32,19 +30,8 @@
     "adminUser":"admin@carbon.super",
     "adminUserTenantId":"-1234",
     "adminRole":"admin",
-    "usernameLength":30,
-    "pageSize":10,
-    "ssoConfiguration" : {
-        "enabled" : false,
-        "issuer" : "devicemgt",
-        "appName" : "devicemgt",
-        "identityProviderURL" : "%https.ip%/sso/samlsso.jag",
-        "responseSigningEnabled" : "true",
-        "keyStorePassword" : "wso2carbon",
-        "identityAlias" : "wso2carbon",
-        "keyStoreName" : "/repository/resources/security/wso2carbon.jks"
-    },
     "userValidationConfig" : {
+        "usernameLength":30,
         "usernameJSRegEx" : "^[\\S]{3,30}$",
         "usernameRegExViolationErrorMsg" : "Provided username is invalid.",
         "usernameHelpMsg" : "Should be in minimum 3 characters long and do not include any whitespaces.",

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/oauth/token-handlers.js

@@ -138,7 +138,7 @@ var handlers = function () {
                 "client credentials to session context. No username of logged in user is found as " +
                     "input - setUpEncodedTenantBasedClientAppCredentials(x)");
         } else {
-            if (devicemgtProps["apimgt-gateway"]) {
+            if (devicemgtProps["gatewayEnabled"]) {
 				var tenantBasedClientAppCredentials = tokenUtil.getTenantBasedClientAppCredentials(username);
 				if (!tenantBasedClientAppCredentials) {
 					throw new Error("{/app/modules/oauth/token-handlers.js} Could not set up encoded tenant " +
@@ -176,7 +176,7 @@ var handlers = function () {
                 "client credentials to session context. No username of logged in user is found as " +
                 "input - setUpEncodedTenantBasedWebSocketClientAppCredentials(x)");
         } else {
-            if (devicemgtProps["apimgt-gateway"]) {
+            if (devicemgtProps["gatewayEnabled"]) {
                 var tenantBasedWebSocketClientAppCredentials
                     = tokenUtil.getTenantBasedWebSocketClientAppCredentials(username);
                 if (!tenantBasedWebSocketClientAppCredentials) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.js

@@ -33,7 +33,7 @@ function onRequest(context) {
         viewModel["roles"] = response["content"];
     }
 
-    viewModel["charLimit"] = mdmProps["usernameLength"];
+    viewModel["charLimit"] = mdmProps["userValidationConfig"]["usernameLength"];
     viewModel["usernameJSRegEx"] = mdmProps["userValidationConfig"]["usernameJSRegEx"];
     viewModel["usernameHelpText"] = mdmProps["userValidationConfig"]["usernameHelpMsg"];
     viewModel["usernameRegExViolationErrorMsg"] = mdmProps["userValidationConfig"]["usernameRegExViolationErrorMsg"];

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js

@@ -40,7 +40,7 @@ function onRequest() {
     }
     var userStores = userModule.getSecondaryUserStores();
     page["userStores"] = userStores;
-    page["charLimit"] = devicemgtProps["usernameLength"];
+    page["charLimit"] = devicemgtProps["userValidationConfig"]["usernameLength"];
     page["usernameJSRegEx"] = devicemgtProps["userValidationConfig"]["usernameJSRegEx"];
     page["usernameHelpMsg"] = devicemgtProps["userValidationConfig"]["usernameHelpMsg"];
     page["usernameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["usernameRegExViolationErrorMsg"];

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.logo/logo.hbs

@@ -15,4 +15,5 @@
   specific language governing permissions and limitations
   under the License.
 }}
-{{#zone "productName"}}WSO2 IoT{{/zone}}
+{{#zone "productName"}}WSO2 IoT Server{{/zone}}
+{{#zone "productNameResponsive"}}WSO2 IoT Server{{/zone}}

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/JWTAuthenticator.java

@@ -90,6 +90,9 @@ public class JWTAuthenticator implements WebappAuthenticator {
         if (requestUri == null || "".equals(requestUri)) {
             authenticationInfo.setStatus(Status.CONTINUE);
         }
+        if (requestUri == null) {
+            requestUri = "";
+        }
         StringTokenizer tokenizer = new StringTokenizer(requestUri, "/");
         String context = tokenizer.nextToken();
         if (context == null || "".equals(context)) {