Commit Graph

10742 Commits

Author SHA1 Message Date
28eb838846 Merge pull request 'Fix incorrect grafana permission annotations' (#241) from navodzoysa/device-mgt-core:grafana-perm into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/241
2023-10-06 09:07:45 +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
Inosh Perara
a620cffb31 Merge pull request 'Modify permission scope keys' (#239) from viranga/device-mgt-core:scope-fixes into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/239
2023-10-02 00:41:29 +00:00
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
Lasantha Dharmakeerthi
a1856323b5 Add missing scope 2023-09-27 05:50:11 +00:00
rajitha
966b9194f2 Add missing scope 2023-09-27 11:05:48 +05:30
Inosh Perara
bf5ce17bdc Merge pull request 'Fix ownership issue in device deletion' (#234) from osh.silva/device-mgt-core:billing-delete-fix-9713 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/234
2023-09-26 14:58:19 +00:00
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
Lasantha Dharmakeerthi
6b2d77f33e Improvements in App registration flow 2023-09-25 04:08:19 +00:00
pasindu
cc6bbf1435 Improvements in App registration 2023-09-22 10:25:29 +05:30
Charitha Goonetilleke
327f507aa8 Merge pull request 'Update addOperation and sql files' (#233) from Sasini_Sandamali/device-mgt-core-forked:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/233
2023-09-21 05:48:16 +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
f4c0e5f929 Merge pull request 'Fix dbscripts causing errors on startup with MSSQL' (#225) from prathabanKavin/device-mgt-core:mssqldbscriptfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/225
2023-09-20 05:28:36 +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
Lasantha Dharmakeerthi
b3a0d8e931 Fix grant type update method 2023-09-14 11:20:21 +00:00
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
Lasantha Dharmakeerthi
870603ee16 Implement method for updateGrantType rest call 2023-09-13 07:21:54 +00:00
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
Charitha Goonetilleke
ea6744288a Merge pull request 'Modify View Activities endpoint' (#227) from Sasini_Sandamali/device-mgt-core-forked:master into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/227
2023-09-12 11:28:51 +00:00
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
prathabanKavin
42ef84e8a3 Fix table DM_TRACCAR_UNSYNCED_DEVICES 2023-09-11 08:51:04 +05:30
prathabanKavin
94b0278471 Fix dbscripts causing errors on startup 2023-09-11 08:47:10 +05:30
Amalka Subasinghe
64cb1be253 Merge pull request 'Fix API publisher to update scopes including already existing roles' (#224) from pasindu/device-mgt-core:Bug10322 into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/224
2023-09-08 09:19:05 +00:00