Commit Graph

8365 Commits

Author SHA1 Message Date
pasindu
fa37fa33cc Map JsonObject to dto classes in publisher API revesion 2023-10-17 12:25:28 +05:30
pasindu
bdf1e97d84 Map Json object return types to dto classes in Publisher 2023-10-17 12:25:28 +05:30
pasindu
565a7614ad Change JSON object return methods:Scopes 2023-10-17 12:25:28 +05:30
pasindu
1eda7bd237 Fixes in API publishing flow 2023-10-17 12:25:28 +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
Charitha Goonetilleke
e3e9ad851c Merge branch 'master' into master 2023-10-16 05:54:10 +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
Oshani Silva
c3cc4fe6d4 Add fix for search operation (#251)
fixes https://roadmap.entgra.net/issues/10279

Co-authored-by: osh <osh.silva@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/251
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-10-16 05:21:44 +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
Rajitha Kumara
3a63f948a0 Add admin role when adding shared scopes 2023-10-15 14:25:37 +05:30
98954c9374 Merge pull request 'Add default perm config' (#252) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/252
2023-10-13 05:47:00 +00:00
tcdlpds
49747efa18 Add default perm config 2023-10-13 09:39:44 +05:30
Viranga Gunarathna
d63f2a3f24 mapping permissions with scopes 2023-10-12 15:25:20 +05:30
amalka.subasinghe
54cdab5085 Improvements to the device sub type impl 2023-10-12 11:54:23 +05:30
Inosh Perara
db80546a5a Merge pull request 'Fix scope attaching issue' (#247) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/247
2023-10-11 10:16:06 +00:00
tcdlpds
58670028c0 Fix scope attaching issue 2023-10-11 06:54:46 +05:30
8813619929 Merge pull request 'Add scope perm mapping logic' (#235) from tcdlpds/device-mgt-core:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/235
2023-10-08 15:35:35 +00:00
tcdlpds
563077fbfb Add scope perm mapping logic 2023-10-08 19:36:52 +05:30
616c70face Merge pull request 'Fix delete groups with Geo Fence references issue' (#223) from ThilinaPremachandra/device-mgt-core:Bug#10236#issue36 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/223
2023-10-06 09:53:30 +00:00
51f1bf1280 Merge pull request 'Fix analytics publishing for Windows devices' (#240) from navodzoysa/device-mgt-core:fix-windows-analytics into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/240
2023-10-06 09:24:23 +00:00
77823e2839 Modify get Geofence API to get total count 2023-10-06 08:04:38 +05:30
navodzoysa
03a0539d92 Fix incorrect grafana permission annotations 2023-10-02 23:19:32 +05:30
navodzoysa
f8e3fb90e6 Fix analytics publishing for Windows devices 2023-10-02 23:15:16 +05:30
Viranga Gunarathna
9e0427021e Duplicate keys for same permission in different files 2023-09-28 20:14:10 +05:30
Viranga Gunarathna
6c8c2efb80 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into scope-fixes 2023-09-28 00:17:27 +05:30
Viranga Gunarathna
48a72e80e9 Modify scope keys 2023-09-27 23:48:16 +05:30
pasindu
e128a2479f Clear unused method 2023-09-27 15:37:35 +05:30
pasindu
144170c4c9 Fix sso loging app creation payload 2023-09-27 15:10:51 +05:30
osh
3c658f0afe Fix ownership issue in device deletion 2023-09-26 17:42:37 +05:30
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
pasindu
cc6bbf1435 Improvements in App registration 2023-09-22 10:25:29 +05:30
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
tcdlpds
ac0ba00707 Remove unnecessary sources 2023-09-20 09:37:58 +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
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
tcdlpds
317af213be Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420 2023-09-14 17:45:00 +05:30
osh
8bc0fa37de Add cost calculation for carbon super 2023-09-14 14:35:18 +05:30
pasindu
bb879f52ce Fix grant type update method 2023-09-14 14:10:17 +05:30
tcdlpds
43ef843db5 Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420 2023-09-14 11:23:38 +05:30
tcdlpds
5848d68c63 Add app updating intial changes 2023-09-14 11:23:29 +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
pasindu
907d4b0316 Implement method for updateGrantType rest call 2023-09-13 12:20:37 +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
tcdlpds
7e65d9f980 Fix access token validating issue 2023-09-12 00:02:07 +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
tcdlpds
da1f9d2437 Fix admin user details getting issue 2023-08-09 07:34:00 +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
tcdlpds
f117e40fc9 Fix SSO related issues 2023-08-06 23:38:02 +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
Dharmakeerthi Lasantha
a17c5c27ab Fix test case failure 2023-08-02 07:56:01 +05:30
Amalka Subasinghe
c6c2ef9a01 fixed ws api publishing and dynamic endpoint configurations 2023-07-31 14:20:55 +05:30
Dharmakeerthi Lasantha
046c1faf77 Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420 2023-07-31 11:40:53 +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
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
pasindu
2d296a3453 Implement map application keys using dcr response 2023-07-26 14:26:43 +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
83780c6a0c Add improvements to APIM application creating logic 2023-07-25 18:29:34 +05:30
Dharmakeerthi Lasantha
8880ef99db Improve APIM application key generate method 2023-07-25 18:27:09 +05:30
Dharmakeerthi Lasantha
2125519aa6 Add todo Comments 2023-07-25 18:25:13 +05:30
Dharmakeerthi Lasantha
da4f3f1456 Add API integration 2023-07-25 18:18:42 +05:30
Dharmakeerthi Lasantha
52fd8c4b89 Add Application key generating logic 2023-07-25 18:05:16 +05:30
Dharmakeerthi Lasantha
29a8dd5fde Add API app registering refactored code 2023-07-25 18:05:14 +05:30
Dharmakeerthi Lasantha
958f4e43d6 Add Consumer REST API integration 2023-07-25 17:57:21 +05:30
Pasindu Rupasinghe
b7f077e639 Implement service for consumer rest APIs
Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>
2023-07-25 17:52:48 +05:30
Dharmakeerthi Lasantha
ac3e144437 Fix OSGI service unbinding issue 2023-07-25 17:33:02 +05:30
Dharmakeerthi Lasantha
f2243ebd0e Fix formatting issue 2023-07-25 17:33:02 +05:30
navodzoysa
f72166895f Fix class not found error in analytics component 2023-07-25 17:33:01 +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
rajitha
a1ae369fe5 Fix realm service unbinding issues 2023-07-25 17:19:22 +05:30
rajitha
3dc567fcfe Fix transaction initiating issue 2023-07-25 17:19:22 +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
50beae1bf8 Remove the user has role validation 2023-07-25 17:11:26 +05:30
nishan
da6f7158cf add api for get visible roles 2023-07-25 17:11:24 +05:30
Thilina Sandaruwan
0ce7cd954c HierarchicalGrouping (#153)
Goals
Complete hierarchical grouping task
https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Approach
Fix the encountered issues

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/153
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-07-25 17:09:26 +05:30
rajitha
729f1fd85f Update invite link 2023-07-25 17:09:26 +05:30