Commit Graph

8131 Commits

Author SHA1 Message Date
Inosh Perara
50887c12f9 Merge pull request 'Add device deletion scenario for billing' (#226) from osh.silva/device-mgt-core:billing-delete-9713 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/226
2023-09-26 05:02:50 +00:00
Rajitha Kumara
69efff10bd Implement state checking and csrf protection
## Purpose

* Fixes for http://roadmap.entgra.net/issues/9846

Co-authored-by: rajitha <rajitha@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/232
Co-authored-by: Rajitha Kumara <rajitha@entgra.io>
Co-committed-by: Rajitha Kumara <rajitha@entgra.io>
2023-09-25 09:51:11 +00:00
Sasini_Sandamali
bb0369cde9 Update addOperation and sql files 2023-09-21 09:53:11 +05:30
795d26f4b0 Merge pull request 'Fix error showing on startup in task-mgt' (#229) from prathabanKavin/device-mgt-core:mssqltaskmgt into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/229
2023-09-20 05:56:08 +00:00
0068a26b58 Merge pull request 'Fix added for loading device groups' (#228) from prathabanKavin/device-mgt-core:sqldevicegroupfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/228
2023-09-20 05:55:38 +00:00
Charitha Goonetilleke
664dfd21c9 Warn about orphan scopes 2023-09-18 00:50:40 +00:00
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
osh
8bc0fa37de Add cost calculation for carbon super 2023-09-14 14:35:18 +05:30
osh
5371c5268b Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into billing-delete-9713 2023-09-13 14:50:32 +05:30
osh
6fd84dcbef Comment out cost related code 2023-09-13 14:50:23 +05:30
prathabanKavin
4fc6eb2aa4 Fix error showing on startup in task-mgt 2023-09-13 08:15:36 +05:30
prathabanKavin
661feadcd5 Fix added for loading device groups 2023-09-12 22:09:31 +05:30
Sasini_Sandamali
4a6e0ce727 Update get Activities to increase the performance 2023-09-12 16:14:54 +05:30
Sasini_Sandamali
26a049473c Modify View Activities endpoint by including operation id 2023-09-12 16:02:31 +05:30
Charitha Goonetilleke
9011273ff4 Apply role permission mapping along with scope role mapping 2023-09-12 11:55:29 +05:30
osh
0abf955fe0 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into billing-delete-9713 2023-09-12 08:32:09 +05:30
osh
5d06485a25 Add device deletion scenario for billing 2023-09-12 08:31:47 +05:30
pasindu
ef47f0c20a Update scopes including already existing roles 2023-09-08 11:36:05 +05:30
ThilinaPremachandra
44c7d324de Fix: delete group with GeoFence references issue 2023-09-07 11:29:10 +05:30
0fbe062e49 Fix the SSL error when invoking internal API via HttpClient (#215)
Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/215
2023-09-05 07:58:13 +00:00
Arshana
d20c95a55c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into status 2023-09-05 11:03:41 +05:30
Arshana
9c7fd9027e Fix the API to check if a device is enrolled 2023-09-05 11:02:57 +05:30
Thameera
680f57ade5 URL permission issue fixes (Removed * from root URLs) 2023-09-04 12:32:07 +05:30
shamalka
dc40351293 Change location publishing logic 2023-08-28 13:43:11 +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
ThilinaPremachandra
7b1907cd90 resolve comments 2023-08-28 09:35:00 +05:30
Charitha Goonetilleke
c144507b6c Merge branch 'master' into master 2023-08-28 03:21:55 +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
amalka.subasinghe
d4c3af5d12 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core 2023-08-24 16:32:03 +05:30
amalka.subasinghe
9ecdd486f8 imrpoved heart beat to handle cluster formation changed 2023-08-24 16:31:42 +05:30
amalka.subasinghe
1d7700ab5c imrpoved heart beat to handle cluster formation changed 2023-08-24 16:31:17 +05:30
amalka.subasinghe
21606bc5cd operation timeout task updated to execute only in elected node 2023-08-24 16:30:24 +05:30
amalka.subasinghe
349fce4e63 improved push notofication task to get allocated operations when heart beat enabled 2023-08-24 16:29:22 +05:30
amalka.subasinghe
cf3d50edf9 added new method getAllocatedOperationMappingsByStatus 2023-08-24 16:28:28 +05:30
navodzoysa
dbc73d18ed Add improvements to certificate component 2023-08-24 16:05:14 +05:30
nishan
017c70fa08 Fix Certificate test case and delete and search option 2023-08-24 13:28:35 +05:30
ThilinaPremachandra
7a7974eb36 Add: hierarchical group count API 2023-08-24 10:58:46 +05:30
d83b417a0b Merge branch 'master' into unmanaged-install-9211 2023-08-23 09:57:24 +00:00
Thameera
70c27b647b Operation Template releated changes 2023-08-23 13:47:30 +05:30
osh
195bb64bea Resolve comments 2023-08-23 12:42:57 +05:30
osh
4fbcd75a61 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into unmanaged-install-9211 2023-08-22 09:43:51 +05:30
osh
1fed47e8fd Add app details for UNMANAGED_APP_UNINSTALL 2023-08-21 23:27:58 +05:30
388f34e3b8 Fix try-it meta-info getting issue 2023-08-21 12:44:42 +05:30
shamalka
f286cb2306 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into device-info-config 2023-08-17 01:20:50 +05:30
tcdlpds
f9ae594326 Fix APPs getting issue in APPM DAO 2023-08-16 08:35:45 +05:30
Lasantha Dharmakeerthi
3066e51354 Show device identifier and delete certificate using certificate Id 2023-08-15 10:09:55 +00:00
shamalka
67864cb762 Add deviceinfo config beans 2023-08-15 12:48:58 +05:30
osh
81e57ce78f Retrieve extra details 2023-08-10 13:01:41 +05:30
osh
1d712e1bc2 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into app-install-9211 2023-08-09 15:03:36 +05:30
osh
e2a467bc45 Update activity loading 2023-08-09 15:03:29 +05:30
osh
9fa34a32af Resolve conflicts 2023-08-09 00:29:30 +05:30
osh
e6ee539239 Add api changes for getting app details of operation 2023-08-09 00:27:33 +05:30
navodzoysa
453034c0e2 Revert Windows permission temp fix 2023-08-08 23:47:48 +05:30
osh
90a513590e Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-08-07 13:28:37 +05:30
osh
4635e2bd14 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into device-apps-api-1 2023-08-07 12:21:06 +05:30
osh
a20c5a723c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-08-07 11:41:55 +05:30
Amalka Subasinghe
0375eab755 fixed build break 2023-08-03 11:11:46 +05:30
Lasantha Dharmakeerthi
b11c932814 Notify cluster formation changed implementation 2023-08-02 10:41:23 +00:00
Amalka Subasinghe
f33e104755 refactor oauth2 token generator 2023-08-02 16:05:50 +05:30
Amalka Subasinghe
35f11a0d94 ws token generator 2023-08-02 16:00:43 +05:30
Amalka Subasinghe
7de0e1aabd fixed merge conflict 2023-08-02 15:45:29 +05:30
Charitha Goonetilleke
462669e3ec Merge branch 'master' into master 2023-08-02 08:34:57 +00:00
pasindu
7d859a317c Improve check revision deployment list length logic 2023-08-02 13:55:15 +05:30
Amalka Subasinghe
c6c2ef9a01 fixed ws api publishing and dynamic endpoint configurations 2023-07-31 14:20:55 +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
8011170379 Fix issue in tenant id not append to certificate subject (#188)
Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/188
2023-07-26 15:24:05 +00:00
osh
4436c48228 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into device-apps-api-1 2023-07-24 21:19:09 +05:30
Amalka Subasinghe
66f33f4845 notify cluster formation changed nug fixes 2023-07-24 13:17:46 +05:30
Amalka Subasinghe
615da6303f notify cluster formation changed implementation 2023-07-24 11:52:23 +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
osh
77b68af5d0 Add pagination 2023-07-18 23:10:23 +05:30
osh
e7b0255a95 Add get device apps by id service 2023-07-18 19:34:11 +05:30
osh
dd7910268e Add vpp token field 2023-07-17 13:36:39 +05:30
osh
b576f3d9bb Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-07-17 10:43:21 +05:30
Inosh Perara
2dd3e86f69 Merge pull request 'Grouping Issues' (#181) from ThilinaPremachandra/device-mgt-core:groupingIssues into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/181
2023-07-15 11:28:14 +00:00
ThilinaPremachandra
6dbad29776 fix: role sharing issues for other users 2023-07-15 16:27:40 +05:30
osh
cd17d06158 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2 2023-07-14 09:46:41 +05:30
Charitha Goonetilleke
6e1e58f2ec Merge branch 'master' into master 2023-07-13 16:33:56 +00:00
osh
2249520132 Resolve conflicts 2023-07-13 17:46:04 +05:30
navodzoysa
90741dc502 Fix class not found error in analytics component 2023-07-11 23:08:33 +05:30
osh
eb740773aa Improve update asset DAO
fixes https://roadmap.entgra.net/issues/10179
2023-07-11 15:59:42 +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
osh
81fd5687ef Update user service and token retrieval 2023-07-09 00:50:57 +05:30
nishan
2d3f2b94da Show device identifier and changeed to delete certificate using Id 2023-07-07 18:53:21 +05:30
ThilinaPremachandra
253dc03233 fix: deleted roles removing issue 2023-07-06 20:38:06 +05:30
ThilinaPremachandra
907043fd91 Merge branch 'master' 2023-07-06 09:56:47 +05:30
osh
dae8c09761 Resolve comments 2023-07-05 22:38:10 +05:30
osh
b978e31ab0 Resolve conflicts
fixes https://roadmap.entgra.net/issues/10186
2023-07-05 20:56:29 +05:30
osh
0e5478fb5e Add association DAO and fix meta issue
fixes https://roadmap.entgra.net/issues/10186
2023-07-05 20:49:46 +05:30
rajitha
67cdcede69 Fix realm service unbinding issues 2023-07-05 20:21:48 +05:30
inoshperera
026986cd93 Add DAO improvements for user APIs
Fixes https://roadmap.entgra.net/issues/10169
2023-07-05 17:16:38 +05:30