From 235b41c9df39169741c67738eb25d920c8daebfb Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Wed, 4 Jan 2017 22:28:13 +0530
Subject: [PATCH] config.json [usernameLength] moved to
 [userValidationConfig][usernameLength]

---
 .../main/resources/jaggeryapps/devicemgt/api/user-api.jag   | 6 +++---
 .../resources/jaggeryapps/devicemgt/app/conf/config.json    | 2 +-
 .../app/pages/cdmf.page.certificate.create/create.js        | 2 +-
 .../devicemgt/app/pages/cdmf.page.user.create/create.js     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
index 7303a5ee8c..9d12aa9360 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/api/user-api.jag
+++ b/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) {
-            log.error("Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long");
-            result = "Username Must be between 1 and " + devicemgtProps.usernameLength + " characters long";
+        if (username.length < devicemgtProps.userValidationConfig.usernameLength) {
+            log.error("Username Must be between 1 and " + devicemgtProps.userValidationConfig.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);
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index d0a421755a..e9e1d99ce6 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -30,8 +30,8 @@
     "adminUser":"admin@carbon.super",
     "adminUserTenantId":"-1234",
     "adminRole":"admin",
-    "usernameLength":30,
     "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.",
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.js
index 6099b8a845..32f427090a 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.certificate.create/create.js
+++ b/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"];
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js
index e1c4b583bd..a05bcc6e7f 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.js
+++ b/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"];