mirror of
https://repository.entgra.net/community/device-mgt-core.git
synced 2025-10-06 02:01:45 +00:00
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
This commit is contained in:
kamidu
commit
42b6882cc1
@ -114,13 +114,6 @@ public interface DeviceManagementService {
|
||||
@QueryParam("user")
|
||||
@Size(max = 45)
|
||||
String user,
|
||||
@ApiParam(
|
||||
name = "roleName",
|
||||
value = "Role name of the devices to be fetched.",
|
||||
required = false)
|
||||
@QueryParam("roleName")
|
||||
@Size(max = 45)
|
||||
String roleName,
|
||||
@ApiParam(
|
||||
name = "ownership",
|
||||
allowableValues = "BYOD, COPE",
|
||||
|
||||
@ -66,7 +66,6 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
||||
@QueryParam("name") @Size(max = 45) String name,
|
||||
@QueryParam("type") @Size(max = 45) String type,
|
||||
@QueryParam("user") @Size(max = 45) String user,
|
||||
@QueryParam("roleName") @Size(max = 45) String roleName,
|
||||
@QueryParam("ownership") @Size(max = 45) String ownership,
|
||||
@QueryParam("status") @Size(max = 45) String status,
|
||||
@QueryParam("since") String since,
|
||||
|
||||
@ -309,8 +309,12 @@ public class RequestValidationUtil {
|
||||
public static void validateRoleDetails(RoleInfo roleInfo) {
|
||||
if (roleInfo == null) {
|
||||
throw new InputValidationException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request body is incorrect or" +
|
||||
" empty").build());
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request body is "
|
||||
+ "empty").build());
|
||||
} else if (roleInfo.getRoleName() == null) {
|
||||
throw new InputValidationException(
|
||||
new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage("Request body is "
|
||||
+ "incorrect").build());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -368,24 +368,31 @@ public class GenericOperationDAOImpl implements OperationDAO {
|
||||
// sql = sql + " OFFSET ?";
|
||||
// }
|
||||
|
||||
String sql = "SELECT dte.ENROLMENT_ID, oor.OPERATION_ID, oor.OP_RES_ID, oor.OPERATION_TYPE, " +
|
||||
"oor.OPERATION_CODE, oor.OPERATION_RESPONSE, dte.DEVICE_TYPE, dte.DEVICE_IDENTIFICATION, " +
|
||||
"oor.RECEIVED_TIMESTAMP, eom.UPDATED_TIMESTAMP, eom.STATUS FROM (SELECT d.DEVICE_IDENTIFICATION, " +
|
||||
"t.NAME AS DEVICE_TYPE, e.ID AS ENROLMENT_ID FROM DM_DEVICE d INNER JOIN DM_DEVICE_TYPE t " +
|
||||
"ON d.DEVICE_TYPE_ID = t.ID INNER JOIN DM_ENROLMENT e ON d.ID = e.DEVICE_ID WHERE " +
|
||||
"e.TENANT_ID = ?) dte INNER JOIN (SELECT o.ID AS OPERATION_ID, o.TYPE AS OPERATION_TYPE, " +
|
||||
"o.OPERATION_CODE, r.ID AS OP_RES_ID, r.OPERATION_RESPONSE, r.RECEIVED_TIMESTAMP, " +
|
||||
"r.ENROLMENT_ID FROM DM_OPERATION o INNER JOIN DM_DEVICE_OPERATION_RESPONSE r ON " +
|
||||
"o.ID = r.OPERATION_ID) oor ON oor.ENROLMENT_ID=dte.ENROLMENT_ID LEFT OUTER JOIN " +
|
||||
"(SELECT ENROLMENT_ID, OPERATION_ID, STATUS, UPDATED_TIMESTAMP FROM DM_ENROLMENT_OP_MAPPING " +
|
||||
"WHERE UPDATED_TIMESTAMP > ? LIMIT ? OFFSET ?) eom ON eom.ENROLMENT_ID=oor.ENROLMENT_ID AND " +
|
||||
"oor.OPERATION_ID=eom.OPERATION_ID ORDER BY oor.OPERATION_ID";
|
||||
String sql = "SELECT feom.ENROLMENT_ID, feom.OPERATION_ID, feom.CREATED_TIMESTAMP, o.TYPE AS OPERATION_TYPE, " +
|
||||
"o.OPERATION_CODE, orsp.OPERATION_RESPONSE, orsp.LATEST_RECEIVED_TIMESTAMP AS RECEIVED_TIMESTAMP, " +
|
||||
"orsp.ID AS OP_RES_ID, feom.STATUS, feom.UPDATED_TIMESTAMP, feom.DEVICE_IDENTIFICATION, " +
|
||||
"feom.DEVICE_TYPE FROM (SELECT eom.ENROLMENT_ID, eom.OPERATION_ID, eom.STATUS, eom.CREATED_TIMESTAMP, " +
|
||||
"eom.UPDATED_TIMESTAMP, fe.DEVICE_IDENTIFICATION, fe.DEVICE_TYPE FROM " +
|
||||
"(SELECT ENROLMENT_ID, OPERATION_ID, STATUS, CREATED_TIMESTAMP, UPDATED_TIMESTAMP " +
|
||||
"FROM DM_ENROLMENT_OP_MAPPING WHERE UPDATED_TIMESTAMP > ? ORDER BY OPERATION_ID LIMIT ? OFFSET ?) eom " +
|
||||
"LEFT OUTER JOIN (SELECT e.ID AS ENROLMENT_ID, d.ID AS DEVICE_ID, d.DEVICE_IDENTIFICATION, " +
|
||||
"t.NAME AS DEVICE_TYPE FROM DM_ENROLMENT e LEFT OUTER JOIN DM_DEVICE d ON e.DEVICE_ID = d.ID " +
|
||||
"LEFT OUTER JOIN DM_DEVICE_TYPE t ON d.DEVICE_TYPE_ID = t.ID WHERE d.TENANT_ID = ? AND " +
|
||||
"e.TENANT_ID = ?) fe ON fe.ENROLMENT_ID = eom.ENROLMENT_ID) feom LEFT OUTER JOIN DM_OPERATION o " +
|
||||
"ON feom.OPERATION_ID = o.ID LEFT OUTER JOIN (SELECT ID, ENROLMENT_ID, OPERATION_ID, " +
|
||||
"OPERATION_RESPONSE, MAX(RECEIVED_TIMESTAMP) LATEST_RECEIVED_TIMESTAMP " +
|
||||
"FROM DM_DEVICE_OPERATION_RESPONSE GROUP BY ENROLMENT_ID , OPERATION_ID) orsp " +
|
||||
"ON o.ID = orsp.OPERATION_ID AND feom.ENROLMENT_ID = orsp.ENROLMENT_ID GROUP BY feom.ENROLMENT_ID";
|
||||
|
||||
stmt = conn.prepareStatement(sql);
|
||||
stmt.setInt(1, PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
|
||||
stmt.setLong(2, timestamp);
|
||||
stmt.setInt(3, limit);
|
||||
stmt.setInt(4, offset);
|
||||
|
||||
stmt.setLong(1, timestamp);
|
||||
stmt.setInt(2, limit);
|
||||
stmt.setInt(3, offset);
|
||||
int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
|
||||
stmt.setInt(4, tenantId);
|
||||
stmt.setInt(5, tenantId);
|
||||
|
||||
rs = stmt.executeQuery();
|
||||
|
||||
int operationId = 0;
|
||||
|
||||
@ -42,7 +42,7 @@ var userModule = function () {
|
||||
privateMethods.getCarbonUser = function () {
|
||||
var carbon = require("carbon");
|
||||
var carbonUser = session.get(constants["USER_SESSION_KEY"]);
|
||||
var utility = require("/modules/utility.js")["utility"];
|
||||
var utility = require("/app/modules/utility.js")["utility"];
|
||||
if (!carbonUser) {
|
||||
log.error("User object was not found in the session");
|
||||
throw constants["ERRORS"]["USER_NOT_FOUND"];
|
||||
@ -174,7 +174,11 @@ var userModule = function () {
|
||||
utility.startTenantFlow(carbonUser);
|
||||
var url = devicemgtProps["httpsURL"] + devicemgtProps["backendRestEndpoints"]["deviceMgt"] + "/users/" +
|
||||
encodeURIComponent(username) + "/roles";
|
||||
return privateMethods.callBackend(url, constants["HTTP_GET"]);
|
||||
var response = privateMethods.callBackend(url, constants["HTTP_GET"]);
|
||||
if (response.status == "success") {
|
||||
response.content = parse(response.content).roles;
|
||||
}
|
||||
return response;
|
||||
} catch (e) {
|
||||
throw e;
|
||||
} finally {
|
||||
|
||||
@ -56,9 +56,9 @@
|
||||
</label>
|
||||
<div class="wr-input-control">
|
||||
<select id="userStore" class="form-control select">
|
||||
<option>PRIMARY</option>
|
||||
<option value="PRIMARY">PRIMARY</option>
|
||||
{{#each userStores}}
|
||||
<option>{{this}}</option>
|
||||
<option value="{{this}}">{{this}}</option>
|
||||
{{/each}}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
specific language governing permissions and limitations
|
||||
under the License.
|
||||
}}
|
||||
{{unit "cdmf.unit.ui.title" pageTitle="User Management"}}
|
||||
{{unit "cdmf.unit.ui.title" pageTitle="User Management | Edit User"}}
|
||||
|
||||
{{#zone "breadcrumbs"}}
|
||||
<li>
|
||||
@ -51,6 +51,15 @@
|
||||
<div id="user-create-error-msg" class="alert alert-danger hidden" role="alert">
|
||||
<i class="icon fw fw-error"></i><span></span>
|
||||
</div>
|
||||
<label class="wr-input-label" title="Select the domain of the user store from the drop-down given below. The domain of the default user store is PRIMARY">
|
||||
User Store Domain
|
||||
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
|
||||
</label>
|
||||
<div class="wr-input-control">
|
||||
<select id="userStore" class="form-control select" disabled>
|
||||
<option value="{{userStore}}" selected>{{userStore}}</option>
|
||||
</select>
|
||||
</div>
|
||||
<label class="wr-input-label">
|
||||
User Name <br>
|
||||
</label>
|
||||
@ -59,8 +68,6 @@
|
||||
data-errormsg="{{usernameRegExViolationErrorMsg}}" class="form-control"
|
||||
value="{{editUser.username}}" disabled/>
|
||||
</div>
|
||||
|
||||
|
||||
<label class="wr-input-label">First Name *</label>
|
||||
<div id="firstNameField" class="form-group wr-input-control">
|
||||
<input type="text" id="firstname" data-regex="{{firstnameJSRegEx}}"
|
||||
@ -95,12 +102,9 @@
|
||||
<span class="wr-help-tip glyphicon glyphicon-question-sign"></span>
|
||||
</label>
|
||||
<div class="wr-input-control">
|
||||
<select id="roles" class="form-control select2" multiple="multiple" selectedVals="
|
||||
{{#each usersRoles}}
|
||||
{{this}},
|
||||
{{/each}}
|
||||
">
|
||||
{{#each userRoles}}
|
||||
<select id="roles" class="form-control select2" multiple="multiple"
|
||||
selectedVals="{{#each rolesByUsername}} {{this}}, {{/each}}">
|
||||
{{#each rolesByUserStore}}
|
||||
<option>{{this}}</option>
|
||||
{{/each}}
|
||||
</select>
|
||||
|
||||
@ -16,14 +16,16 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
function onRequest(context) {
|
||||
function onRequest() {
|
||||
var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
|
||||
var userModule = require("/app/modules/business-controllers/user.js")["userModule"];
|
||||
|
||||
var userName = request.getParameter("username");
|
||||
var user = userModule.getUser(userName)["content"];
|
||||
var devicemgtProps = require("/app/modules/conf-reader/main.js")["conf"];
|
||||
|
||||
if (user) {
|
||||
var title;
|
||||
if (user.firstname || user.lastname) {
|
||||
if (user.firstname && user.lastname) {
|
||||
title = user.firstname + " " + user.lastname;
|
||||
} else {
|
||||
title = user.username;
|
||||
@ -34,6 +36,8 @@ function onRequest(context) {
|
||||
if (userName.indexOf("/") > -1) {
|
||||
userStore = userName.substr(0, userName.indexOf('/'));
|
||||
}
|
||||
page["userStore"] = userStore;
|
||||
|
||||
var response = userModule.getUser(userName);
|
||||
|
||||
if (response["status"] == "success") {
|
||||
@ -41,28 +45,27 @@ function onRequest(context) {
|
||||
}
|
||||
|
||||
response = userModule.getRolesByUsername(userName);
|
||||
var rolesByUsername;
|
||||
if (response["status"] == "success") {
|
||||
page["usersRoles"] = response["content"];
|
||||
}
|
||||
response = userModule.getRolesByUserStore(userStore);
|
||||
if (response["status"] == "success") {
|
||||
var roleVals = response["content"];
|
||||
var filteredRoles = [];
|
||||
var prefix = "Application";
|
||||
for (i = 0; i < roleVals.length; i++) {
|
||||
if(roleVals[i].indexOf(prefix) < 0){
|
||||
filteredRoles.push(roleVals[i]);
|
||||
}
|
||||
}
|
||||
page["userRoles"] = filteredRoles;
|
||||
rolesByUsername = response["content"];
|
||||
}
|
||||
|
||||
response = userModule.getRolesByUserStore(userStore);
|
||||
var rolesByUserStore;
|
||||
if (response["status"] == "success") {
|
||||
rolesByUserStore = response["content"];
|
||||
}
|
||||
page["usernameJSRegEx"] = devicemgtProps.userValidationConfig.usernameJSRegEx;
|
||||
page["usernameRegExViolationErrorMsg"] = devicemgtProps.userValidationConfig.usernameRegExViolationErrorMsg;
|
||||
page["firstnameJSRegEx"] = devicemgtProps.userValidationConfig.firstnameJSRegEx;
|
||||
page["firstnameRegExViolationErrorMsg"] = devicemgtProps.userValidationConfig.firstnameRegExViolationErrorMsg;
|
||||
page["lastnameJSRegEx"] = devicemgtProps.userValidationConfig.lastnameJSRegEx;
|
||||
page["lastnameRegExViolationErrorMsg"] = devicemgtProps.userValidationConfig.lastnameRegExViolationErrorMsg;
|
||||
|
||||
page["rolesByUsername"] = rolesByUsername;
|
||||
page["rolesByUserStore"] = rolesByUserStore;
|
||||
}
|
||||
|
||||
page["usernameJSRegEx"] = devicemgtProps["userValidationConfig"]["usernameJSRegEx"];
|
||||
page["usernameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["usernameRegExViolationErrorMsg"];
|
||||
page["firstnameJSRegEx"] = devicemgtProps["userValidationConfig"]["firstnameJSRegEx"];
|
||||
page["firstnameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["firstnameRegExViolationErrorMsg"];
|
||||
page["lastnameJSRegEx"] = devicemgtProps["userValidationConfig"]["lastnameJSRegEx"];
|
||||
page["lastnameRegExViolationErrorMsg"] = devicemgtProps["userValidationConfig"]["lastnameRegExViolationErrorMsg"];
|
||||
|
||||
return page;
|
||||
}
|
||||
@ -32,6 +32,8 @@ function inputIsValid(regExp, inputString) {
|
||||
var validateInline = {};
|
||||
var clearInline = {};
|
||||
|
||||
var deviceMgtBasePath = "/api/device-mgt/v1.0";
|
||||
|
||||
var enableInlineError = function (inputField, errorMsg, errorSign) {
|
||||
var fieldIdentifier = "#" + inputField;
|
||||
var errorMsgIdentifier = "#" + inputField + " ." + errorMsg;
|
||||
@ -180,7 +182,8 @@ $(document).ready(function () {
|
||||
var usernameInput = $("input#username");
|
||||
var firstnameInput = $("input#firstname");
|
||||
var lastnameInput = $("input#lastname");
|
||||
var charLimit = parseInt($("input#username").attr("limit"));
|
||||
// var charLimit = parseInt($("input#username").attr("limit"));
|
||||
var domain = $("#userStore").val();
|
||||
var username = usernameInput.val().trim();
|
||||
var firstname = firstnameInput.val();
|
||||
var lastname = lastnameInput.val();
|
||||
@ -215,7 +218,7 @@ $(document).ready(function () {
|
||||
} else {
|
||||
var addUserFormData = {};
|
||||
|
||||
addUserFormData.username = username;
|
||||
addUserFormData.username = domain + "/" + username;
|
||||
addUserFormData.firstname = firstname;
|
||||
addUserFormData.lastname = lastname;
|
||||
addUserFormData.emailAddress = emailAddress;
|
||||
@ -225,14 +228,13 @@ $(document).ready(function () {
|
||||
}
|
||||
addUserFormData.roles = roles;
|
||||
|
||||
var addUserAPI = "/devicemgt_admin/users?username=" + username;
|
||||
var addUserAPI = deviceMgtBasePath + "/users/" + username;
|
||||
|
||||
invokerUtil.put(
|
||||
addUserAPI,
|
||||
addUserFormData,
|
||||
function (data) {
|
||||
data = JSON.parse(data);
|
||||
if (data["statusCode"] == 201) {
|
||||
function (data, textStatus, jqXHR) {
|
||||
if (jqXHR.status == 201) {
|
||||
// Clearing user input fields.
|
||||
$("input#username").val("");
|
||||
$("input#firstname").val("");
|
||||
@ -243,13 +245,14 @@ $(document).ready(function () {
|
||||
$("#user-create-form").addClass("hidden");
|
||||
$("#user-created-msg").removeClass("hidden");
|
||||
}
|
||||
}, function (data) {
|
||||
if (data["statusCode"] == 409) {
|
||||
}, function (jqXHR) {
|
||||
var payload = JSON.parse(jqXHR.responseText);
|
||||
if (jqXHR.status == 409) {
|
||||
$(errorMsg).text("User : " + username + " doesn't exists. You cannot proceed.");
|
||||
} else if (data["statusCode"] == 500) {
|
||||
$(errorMsg).text("An unexpected error occurred @ backend server. Please try again later.");
|
||||
} else if (jqXHR.status == 500) {
|
||||
$(errorMsg).text("An unexpected error occurred at backend server. Please try again later.");
|
||||
} else {
|
||||
$(errorMsg).text(data.errorMessage);
|
||||
$(errorMsg).text(payload.message);
|
||||
}
|
||||
$(errorMsgWrapper).removeClass("hidden");
|
||||
}
|
||||
|
||||
@ -116,9 +116,8 @@ $("a.invite-user-link").click(function () {
|
||||
* when a user clicks on "Remove" link
|
||||
* on User Listing page in WSO2 MDM Console.
|
||||
*/
|
||||
function removeUser(uname, uid) {
|
||||
function removeUser(uname) {
|
||||
var username = uname;
|
||||
var userid = uid;
|
||||
var removeUserAPI = apiBasePath + "/users/" + username;
|
||||
$(modalPopupContent).html($('#remove-user-modal-content').html());
|
||||
showPopup();
|
||||
@ -127,7 +126,7 @@ function removeUser(uname, uid) {
|
||||
invokerUtil.delete(
|
||||
removeUserAPI,
|
||||
function () {
|
||||
$("#" + userid).remove();
|
||||
$("#role-" + username).remove();
|
||||
// get new user-list-count
|
||||
var newUserListCount = $(".user-list > span").length;
|
||||
// update user-listing-status-msg with new user-count
|
||||
@ -268,7 +267,7 @@ function loadUsers(searchParam) {
|
||||
|
||||
var fnCreatedRow = function( nRow, aData, iDataIndex ) {
|
||||
$(nRow).attr('data-type', 'selectable');
|
||||
$(nRow).attr('data-username', aData["username"]);
|
||||
$(nRow).attr('data-username', aData["filter"]);
|
||||
}
|
||||
|
||||
var columns = [
|
||||
@ -302,19 +301,19 @@ function loadUsers(searchParam) {
|
||||
class: "text-right content-fill text-left-on-grid-view no-wrap",
|
||||
data: null,
|
||||
render: function ( data, type, row, meta ) {
|
||||
return '<a href="/emm/users/edit-user?username=' + data.username + '" data-username="' + data.username +
|
||||
return '<a href="/emm/user/edit?username=' + data.filter + '" data-username="' + data.filter +
|
||||
'" data-click-event="edit-form" class="btn padding-reduce-on-grid-view edit-user-link"> ' +
|
||||
'<span class="fw-stack"> <i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-edit fw-stack-1x"></i>' +
|
||||
' </span> <span class="hidden-xs hidden-on-grid-view">Edit</span> </a>' +
|
||||
|
||||
'<a href="#" data-username="' + data.username + '" data-userid=' + data.username +
|
||||
' data-click-event="remove-form" onclick="javascript:removeUser(\'' + data.username + '\', \'' +
|
||||
data.username + '\')" class="btn padding-reduce-on-grid-view remove-user-link">' +
|
||||
'<a href="#" data-username="' + data.filter + '" data-userid=' + data.filter +
|
||||
' data-click-event="remove-form" onclick="javascript:removeUser(\'' + data.filter + '\')" ' +
|
||||
'class="btn padding-reduce-on-grid-view remove-user-link">' +
|
||||
'<span class="fw-stack"> <i class="fw fw-ring fw-stack-2x"></i> <i class="fw fw-delete fw-stack-1x">' +
|
||||
'</i> </span> <span class="hidden-xs hidden-on-grid-view">Remove</span> </a>' +
|
||||
|
||||
'<a href="#" data-username="' + data.username + '" data-userid="' + data.username +
|
||||
'" data-click-event="edit-form" onclick="javascript:resetPassword(\'' + data.username +
|
||||
'<a href="#" data-username="' + data.filter + '" data-userid="' + data.filter +
|
||||
'" data-click-event="edit-form" onclick="javascript:resetPassword(\'' + data.filter +
|
||||
'\')" class="btn padding-reduce-on-grid-view remove-user-link"> <span class="fw-stack"> <i class="fw fw-ring fw-stack-2x">' +
|
||||
'</i> <i class="fw fw-key fw-stack-1x"></i> <span class="fw-stack fw-move-right fw-move-bottom"> <i class="fw fw-circle fw-stack-2x fw-stroke fw-inverse"><' +
|
||||
'/i> <i class="fw fw-circle fw-stack-2x"></i> <i class="fw fw-refresh fw-stack-1x fw-inverse">' +
|
||||
|
||||
Loading…
Reference in New Issue
Block a user