community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Change deletion warning for users with device' (#301) from prathabanKavin/device-mgt-core:userdeletewarning into master

Browse Source 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/301
This commit is contained in:
Pahansith Gunathilake 2023-12-20 05:47:57 +00:00
commit c0ecb841e0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/device-mgt/io.entgra.device.mgt.core.device.mgt.api/src/main/java/io/entgra/device/mgt/core/device/mgt/api/jaxrs/service/impl/UserManagementServiceImpl.java
View File

@ -349,9 +349,9 @@ public class UserManagementServiceImpl implements UserManagementService {
} }
return Response.status(Response.Status.OK).build(); return Response.status(Response.Status.OK).build();
} else { } else {
String msg = "There are enrolled devices for user: " + username + ". Please remove them before deleting the user."; String msg = "Before deleting this user, ensure there are no devices assigned to the user. You can either remove the devices or change their owner through an update enrollment operation.";
log.error(msg); log.error(msg);
return Response.status(400).entity(msg).build(); return Response.status(409).entity(msg).build();
} }
} catch (DeviceManagementException | UserStoreException e) { } catch (DeviceManagementException | UserStoreException e) {
String msg = "Exception in trying to remove user by user: " + username; String msg = "Exception in trying to remove user by user: " + username;