Commit Graph

222 Commits

Author SHA1 Message Date
builder
a47fda9779 [maven-release-plugin] prepare release v5.0.34 2023-12-16 10:49:20 +05:30
osh
8377d0ddf5 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into wifi-10045 2023-12-14 08:40:18 +05:30
osh
0427959f23 Fix reggex issue when configuring wifi 2023-12-14 08:40:00 +05:30
builder
fb65db10fe [maven-release-plugin] prepare for next development iteration 2023-12-08 12:15:31 +05:30
builder
17dcbde4ab [maven-release-plugin] prepare release v5.0.33 2023-12-08 12:15:21 +05:30
tcdlpds
fb859f046d Add upstream changes 2023-11-14 22:13:49 +05:30
95a257ecc6 Merge pull request 'Add multiple device dis-enrollment support' (#279) from pramilaniroshan/device-mgt-core:rm-9970-dis into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/279
2023-11-10 12:57:23 +00:00
46090437f0 Optimize multiple dis-enrollment 2023-11-10 18:06:58 +05:30
8475cb5764 Merge pull request 'Fix user search by partial filters' (#284) from prathabanKavin/device-mgt-core:searchusersfix1 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/284
2023-11-09 05:11:38 +00:00
builder
d01e55ed08 [maven-release-plugin] prepare for next development iteration 2023-11-08 16:05:38 +05:30
builder
8c6ac48c7b [maven-release-plugin] prepare release v5.0.32 2023-11-08 16:05:31 +05:30
Thameera
d297c55b73 Update missiong scope 2023-11-08 15:23:12 +05:30
prathabanKavin
8d1d418f67 Fix user search by partial filters 2023-11-07 21:08:41 +05:30
prathabanKavin
fe9273ab45 Search roles with partial role names 2023-11-03 00:40:19 +05:30
2d6e512fdf Add multiple device dis-enrollment support 2023-11-02 11:42:58 +05:30
Viranga Gunarathna
fdd5a7cfcf change permission string for update password 2023-10-31 11:23:55 +05:30
builder
6b948c9989 [maven-release-plugin] prepare for next development iteration 2023-10-25 15:28:51 +05:30
builder
0e769a8dd9 [maven-release-plugin] prepare release v5.0.31 2023-10-25 15:28:43 +05:30
pasindu
66bc7e88bd Sync with upstream 2023-10-24 18:47:29 +05:30
pasindu
c7494bcd81 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-23 18:09:19 +05:30
Lasantha Dharmakeerthi
ba17f0e778 Add tenant view perm to role permissions 2023-10-23 01:36:37 +00:00
prathabanKavin
9ab12d1b3f Add tenant view perm to role permissions 2023-10-22 12:02:13 +05:30
Rajitha Kumara
9054329e34 Fix not detecting resource path 2023-10-20 14:48:38 +05:30
pasindu
a46ab4c355 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-20 00:43:12 +05:30
pasindu
518bc7271a Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420 2023-10-19 14:34:14 +05:30
Sasini_Sandamali
3631acfe45 Add new get device activities API 2023-10-18 12:51:14 +05:30
9767f7e90f Add validation for user deletion (#244)
## Purpose
* Fixes https://roadmap.entgra.net/issues/10337

## Description
* Add validation to check whether the user has enrolled devices

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/244
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-10-17 04:20:12 +00:00
Inosh Perara
15de6d397e Merge pull request 'Add permission updating logic' (#254) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/254
2023-10-16 05:39:04 +00:00
tcdlpds
1b0ad156b2 Add Java Doc comments 2023-10-16 10:36:51 +05:30
8696ec9343 Merge pull request 'Modify get Geofence API to get total count' (#243) from pramilaniroshan/device-mgt-core:add-geofence-count into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/243
2023-10-16 04:27:46 +00:00
akeela_azhar
22b9897a4b Add permission updating logic 2023-10-16 08:00:42 +05:30
Viranga Gunarathna
d63f2a3f24 mapping permissions with scopes 2023-10-12 15:25:20 +05:30
tcdlpds
58670028c0 Fix scope attaching issue 2023-10-11 06:54:46 +05:30
tcdlpds
563077fbfb Add scope perm mapping logic 2023-10-08 19:36:52 +05:30
77823e2839 Modify get Geofence API to get total count 2023-10-06 08:04:38 +05:30
Viranga Gunarathna
9e0427021e Duplicate keys for same permission in different files 2023-09-28 20:14:10 +05:30
Viranga Gunarathna
48a72e80e9 Modify scope keys 2023-09-27 23:48:16 +05:30
pasindu
cc6bbf1435 Improvements in App registration 2023-09-22 10:25:29 +05:30
tcdlpds
500fa0df98 Add improvements to app registering logic 2023-09-20 09:30:16 +05:30
tcdlpds
088642e7ce Improve API app registration 2023-09-19 13:22:28 +05:30
fccae9b8c0 Add Devices filtering by a Custom Property feature to API and dao layer (#208)
## Purpose
* Related ticket https://roadmap.entgra.net/issues/10262

## Description

This modifed API accept any custom property key value pair as a encoded JSON String for filtering devices

/devicescustomProperty=%7B%22FIRMWARE_APP_VERSION%22%3A%22122%22%2C%22FIRMWARE_VERSION%22%3A%22123%22%7D

## Add Custom property to mdm-ui-config.xml

```
<DeviceInfoConfigurations>
	<DeviceInfoItem>
            <DefinedValue>FIRMWARE_VERSION</DefinedValue>
            <DisplayValue>label_firmware_version</DisplayValue>
            <Type>deviceDetailsMap</Type>
        </DeviceInfoItem>
        <DeviceInfoItem>
            <DefinedValue>FIRMWARE_APP_VERSION</DefinedValue>
            <DisplayValue>label_app_version</DisplayValue>
            <Type>deviceDetailsMap</Type>
        </DeviceInfoItem>
        <DeviceInfoItem>
            <DefinedValue>FIRMWARE_SYSTEM_VERSION</DefinedValue>
            <DisplayValue>label_firmware_system_version</DisplayValue>
            <Type>deviceDetailsMap</Type>
        </DeviceInfoItem>
</DeviceInfoConfigurations>
```

DefinedValue = Key_value in DM_DEVECE_INFO table
DisplayValue = UI display text for filtering
Type = Dont change

Co-authored-by: pramilaniroshan <pramila@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/208
Co-authored-by: Pramila Niroshan <pramila@entgra.io>
Co-committed-by: Pramila Niroshan <pramila@entgra.io>
2023-09-15 04:02:34 +00:00
Sasini_Sandamali
26a049473c Modify View Activities endpoint by including operation id 2023-09-12 16:02:31 +05:30
Arshana
9c7fd9027e Fix the API to check if a device is enrolled 2023-09-05 11:02:57 +05:30
builder
7c66f6b693 [maven-release-plugin] prepare for next development iteration 2023-08-28 10:11:49 +05:30
builder
b9f12e49ee [maven-release-plugin] prepare release v5.0.30 2023-08-28 10:11:44 +05:30
Inosh Perara
28b18941aa Merge pull request 'Add hierarchical group count API' (#214) from ThilinaPremachandra/device-mgt-core:Bug#10300 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/214
2023-08-28 04:11:43 +00:00
builder
7c0adfbc89 [maven-release-plugin] prepare for next development iteration 2023-08-24 21:17:36 +05:30
builder
f7c3e129c4 [maven-release-plugin] prepare release v5.0.29 2023-08-24 21:17:31 +05:30
ThilinaPremachandra
7a7974eb36 Add: hierarchical group count API 2023-08-24 10:58:46 +05:30
osh
1fed47e8fd Add app details for UNMANAGED_APP_UNINSTALL 2023-08-21 23:27:58 +05:30
osh
81e57ce78f Retrieve extra details 2023-08-10 13:01:41 +05:30
osh
e2a467bc45 Update activity loading 2023-08-09 15:03:29 +05:30
osh
e6ee539239 Add api changes for getting app details of operation 2023-08-09 00:27:33 +05:30
Dharmakeerthi Lasantha
938190deca Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-07-31 11:40:04 +05:30
Dharmakeerthi Lasantha
8289db1af8 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into sync-master 2023-07-31 11:29:17 +05:30
builder
fabd3ebae8 [maven-release-plugin] prepare for next development iteration 2023-07-27 21:09:35 +05:30
builder
02458cc4fe [maven-release-plugin] prepare release v5.0.28 2023-07-27 21:09:27 +05:30
prathabanKavin
f091d26f9c Fix issues with retrieving visible roles 2023-07-27 16:39:08 +05:30
prathabanKavin
20906122db Fix for visible role issue 2023-07-27 15:39:52 +05:30
pasindu
7dfcb418f4 Fix jwt token generation 2023-07-26 08:35:23 +05:30
Dharmakeerthi Lasantha
fe58a16d17 sync with upstream apim420 2023-07-26 07:32:55 +05:30
Dharmakeerthi Lasantha
8215186061 Revert "Fixes in JWT token generation and sync with upstream apim420 branch"
This reverts commit d567209c11, reversing
changes made to 437c0e642d.
2023-07-26 07:29:08 +05:30
pasindu
8ea4932019 Fixes in JWT token generation 2023-07-25 18:29:40 +05:30
Dharmakeerthi Lasantha
dc6bbdd282 Improve functionality and fix formatting issues 2023-07-25 17:30:47 +05:30
Dharmakeerthi Lasantha
ef2838414a Fix build failure 2023-07-25 17:29:15 +05:30
Dharmakeerthi Lasantha
087a9fe728 Fix dependency importing issue 2023-07-25 17:29:14 +05:30
Thilina Sandaruwan
b765c8ded3 Grouping Improvements (#169)
Purpose

After deleting a role, delete relevant records from DM_ROLE_GROUP_MAP table
Related tickets: https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/169
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-07-25 17:24:39 +05:30
ThilinaPremachandra
b682e77d34 fix: group assigned role issue 2023-07-25 17:19:21 +05:30
ThilinaPremachandra
0581151248 add: super-tenant admin check 2023-07-25 17:17:51 +05:30
ThilinaPremachandra
fde6de94bb fix: sub tenants grouping issue 2023-07-25 17:17:51 +05:30
navodzoysa
d90c5c459a Remove reserved_user when fetching users 2023-07-25 17:17:51 +05:30
Nishan Sangeeth
1844db87d8 Improve app visibility restricting functionality
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2023-07-25 17:17:50 +05:30
nishan
da6f7158cf add api for get visible roles 2023-07-25 17:11:24 +05:30
navodzoysa
566942694c Remove apim_reserved_user when fetching users 2023-07-25 16:28:51 +05:30
builder
48801a3b8e [maven-release-plugin] prepare for next development iteration 2023-07-25 16:28:51 +05:30
builder
4c1963a32b [maven-release-plugin] prepare release v5.0.26 2023-07-25 16:28:51 +05:30
ThilinaPremachandra
7d05446a38 add error log 2023-07-25 16:20:25 +05:30
ThilinaPremachandra
cd9d127a5e remove unnecessary variable, change error msg 2023-07-25 16:20:25 +05:30
ThilinaPremachandra
88356c57aa Add hierarchical grouping feature 2023-07-25 16:18:36 +05:30
Dharmakeerthi Lasantha
74041070f9 Fix class def not found issue 2023-07-24 20:22:54 +05:30
Dharmakeerthi Lasantha
349bb0a3dc Fix test case failure 2023-07-24 18:33:00 +05:30
builder
f19f48d050 [maven-release-plugin] prepare for next development iteration 2023-07-23 21:35:40 +05:30
builder
ff9971ed77 [maven-release-plugin] prepare release v5.0.27 2023-07-23 21:35:33 +05:30
Rajitha Kumara
7c9d3a2108 Fixes for grouping issues (#186)
Co-authored-by: rajitha <rajitha@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/186
Co-authored-by: Rajitha Kumara <rajitha@entgra.io>
Co-committed-by: Rajitha Kumara <rajitha@entgra.io>
2023-07-23 15:12:37 +00:00
Charitha Goonetilleke
6e1e58f2ec Merge branch 'master' into master 2023-07-13 16:33:56 +00:00
Dharmakeerthi Lasantha
3bf6f7dd75 Improve functionality and fix formatting issues 2023-07-12 00:05:02 +05:30
Dharmakeerthi Lasantha
78aee58c1a Fix build failure 2023-07-11 12:13:53 +05:30
Dharmakeerthi Lasantha
11efc83b06 Fix dependency importing issue 2023-07-11 11:43:26 +05:30
Dharmakeerthi Lasantha
816ade11e6 Sync with master 2023-07-11 11:28:31 +05:30
Sasini_Sandamali
b9ecb8ce40 Rearrange getOperations by eliminating the necessity of the owner param 2023-07-10 13:18:07 +05:30
Thilina Sandaruwan
38b8c8d7b1 Grouping Improvements (#169)
Purpose

After deleting a role, delete relevant records from DM_ROLE_GROUP_MAP table
Related tickets: https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/169
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-07-10 07:46:21 +00:00
Dharmakeerthi Lasantha
437c0e642d Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-07-04 23:49:24 +05:30
ThilinaPremachandra
6d012bc614 fix: group assigned role issue 2023-07-03 18:53:34 +05:30
ThilinaPremachandra
aecc106f95 add: super-tenant admin check 2023-07-02 01:23:13 +05:30
ThilinaPremachandra
39f5ee8ca3 fix: sub tenants grouping issue 2023-07-01 21:06:29 +05:30
Amalka Subasinghe
1c3cd7cd2f fixed webapp deploying failure 2023-06-30 12:02:17 +05:30
Dharmakeerthi Lasantha
35ee44f799 Remove Capp Deploying service 2023-06-29 15:47:08 +05:30
navodzoysa
8d9e3c8f51 Remove reserved_user when fetching users 2023-06-29 00:34:09 +05:30
Nishan Sangeeth
3616245ae6 Improve app visibility restricting functionality
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2023-06-28 16:00:53 +00:00
nishan
4a31d80660 add api for get visible roles 2023-06-26 02:12:52 +05:30
navodzoysa
00bd74734a Remove apim_reserved_user when fetching users 2023-06-22 19:38:33 +05:30
builder
ab2e1297e5 [maven-release-plugin] prepare for next development iteration 2023-06-21 13:48:25 +05:30
builder
6c9d33a16a [maven-release-plugin] prepare release v5.0.26 2023-06-21 13:48:19 +05:30
Dharmakeerthi Lasantha
342e201c4c Add improvements to APIM application creating logic 2023-06-20 09:39:49 +05:30
Dharmakeerthi Lasantha
bfaeb1778f Add JWT support 2023-06-16 08:03:11 +05:30
ThilinaPremachandra
e66c3dc6f6 add error log 2023-06-15 14:29:10 +05:30
ThilinaPremachandra
00b107ee99 remove unnecessary variable, change error msg 2023-06-15 11:15:23 +05:30
Pasindu Rupasinghe
7dfcc0e33c Get token separately for REST calls
Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>
2023-06-15 02:50:59 +00:00
ThilinaPremachandra
bb50717370 remove unnecessary imports, fixes line issues 2023-06-14 17:45:27 +05:30
ThilinaPremachandra
145740fec6 Add hierarchical grouping feature 2023-06-14 16:14:20 +05:30
Dharmakeerthi Lasantha
d40dccc240 Add improvements to token generation for devices 2023-06-14 12:37:10 +05:30
Dharmakeerthi Lasantha
a09d72c33c Add todo Comments 2023-06-10 11:43:27 +05:30
Amalka Subasinghe
541e517b46 updated from master branch 2023-06-06 14:00:08 +05:30
Amalka Subasinghe
3470c58705 updated apim420 2023-06-06 12:44:48 +05:30
Amalka Subasinghe
1bb571acde fixing dependency issues when installing on apim420 2023-06-06 12:42:33 +05:30
Oshani Silva
2cf7cf8705 Add policy search functionality to API
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-06-01 03:19:37 +00:00
Dharmakeerthi Lasantha
36f7d9ea9b Sync with master 2023-05-28 23:54:31 +05:30
Dharmakeerthi Lasantha
713759f3f7 Update copyright 2023-05-26 23:58:39 +05:30
Amalka Subasinghe
073762c9db updated versions for apim 420 and jdk 17 2023-05-26 11:46:35 +05:30
Amalka Subasinghe
0ef880eb3c fix issues related to uem test failures 2023-05-15 22:50:55 +05:30
Amalka Subasinghe
951dde2a31 fixed build issues after restucturing 2023-05-12 21:51:36 +05:30
Amalka Subasinghe
0bf534689f refactiored device mgt components 2023-05-11 13:29:16 +05:30