Sync apim420 branch with master branch #261

Merged

tcdlpds merged 206 commits from pasindu/device-mgt-core:sync-master into apim420

pasindu commented

There is no content yet.

pasindu added 193 commits

9ccf3a5fa5 Add vpp user apis

fixes https://roadmap.entgra.net/issues/10162

9dd24eda17 Merge pull request 'Add vpp user apis' (#147 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #147

cc8470d3c0 add vpp user services

f246d6b8de Merge pull request 'add vpp user services' (#151 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #151

cd42a2c48f Adding the DAO layer for vpp user management

fixes https://roadmap.entgra.net/issues/10169

665702d504 Add asset apis

Fixes https://roadmap.entgra.net/issues/10178

2e799a545f Resolve comments

fa565eb1ea Merge pull request 'Adding the DAO layer for vpp user management' (#155 ) from osh.silva/device-mgt-core:vpp-user-dao-10169 into vpp-v2

Reviewed-on: #155

61ffd4abff Fixing conflics

caa9959dcd Merge pull request 'Add asset apis' (#156 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #156

54111b4d94 Add association apis

fixes https://roadmap.entgra.net/issues/10182

1263c09079 Add DAOs for asset management

fixes https://roadmap.entgra.net/issues/10179

a69218d436 Merge pull request 'Add association apis' (#161 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #161

c9ed09ee25 Resolve conflicts

949fbef41b Merge pull request 'Add DAOs for asset management' (#162 ) from osh.silva/device-mgt-core:asset-dao-10179 into vpp-v2

Reviewed-on: #162

026986cd93 Add DAO improvements for user APIs

Fixes https://roadmap.entgra.net/issues/10169

8507a88cad Merge pull request 'Add DAO improvements for user APIs' (#166 ) from inosh/device-mgt-core:vpp into vpp-v2

Reviewed-on: #166

0e5478fb5e Add association DAO and fix meta issue

fixes https://roadmap.entgra.net/issues/10186

b978e31ab0 Resolve conflicts

fixes https://roadmap.entgra.net/issues/10186

dae8c09761 Resolve comments

2d3f2b94da Show device identifier and changeed to delete certificate using Id

81fd5687ef Update user service and token retrieval

b3a4649b64 Merge pull request 'Add DAO Layer for VPP Associate' (#168 ) from osh.silva/device-mgt-core:vpp-associate into vpp-v2

Reviewed-on: #168

eb740773aa Improve update asset DAO

fixes https://roadmap.entgra.net/issues/10179

fefc66bc59 Merge pull request 'Improve update asset DAO' (#174 ) from osh.silva/device-mgt-core:vpp-daos into vpp-v2

Reviewed-on: #174

01df370032 Add db scripts

2249520132 Resolve conflicts

cd17d06158 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

ec88734831 Merge pull request 'Add db scripts for VPP feature' (#179 ) from osh.silva/device-mgt-core:vpp-db-scripts into vpp-v2

Reviewed-on: #179

b576f3d9bb Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

dd7910268e Add vpp token field

32a289e10e Merge branch 'vpp-v2' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-token-change-10156

4b9cad1c75 Update db queries

8d552b3070 Merge pull request 'Add VPP token field' (#182 ) from osh.silva/device-mgt-core:vpp-token-change-10156 into vpp-v2

Reviewed-on: #182

e7b0255a95 Add get device apps by id service

77b68af5d0 Add pagination

615da6303f notify cluster formation changed implementation

66f33f4845 notify cluster formation changed nug fixes

4436c48228 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into device-apps-api-1

c6c2ef9a01 fixed ws api publishing and dynamic endpoint configurations

7d859a317c Improve check revision deployment list length logic

462669e3ec Merge branch 'master' into master

7007e1894b Improve check API revision deployment list length logic

7de0e1aabd fixed merge conflict

e87d4b5036 Fix WS API publishing and dynamic endpoint configurations

35f11a0d94 ws token generator

f33e104755 refactor oauth2 token generator

80adbe665a WS token generator

b11c932814 Notify cluster formation changed implementation

0375eab755 fixed build break

2dcb65bc35 Merge pull request 'fixed build break' (#197 ) from amalka.subasinghe/device-mgt-core:master into master

Reviewed-on: #197

a20c5a723c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

4635e2bd14 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into device-apps-api-1

30430712cf Merge pull request 'Add get device apps by id service' (#184 ) from osh.silva/device-mgt-core:device-apps-api-1 into master

Reviewed-on: #184

90a513590e Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into vpp-v2

19ec02828e Merge pull request 'Merge vpp-v2 changes to master' (#200 ) from osh.silva/device-mgt-core:vpp-v2 into master

Reviewed-on: #200

453034c0e2 Revert Windows permission temp fix

607b11a224 Add missing Windows enroll scope

e6ee539239 Add api changes for getting app details of operation

9fa34a32af Resolve conflicts

f87f742262 Merge pull request 'Revert temp fix done for Windows enrollment and add missing enroll scope' (#202 ) from navodzoysa/device-mgt-core:issue-10235/windows-auth into master

Reviewed-on: #202

e2a467bc45 Update activity loading

1d712e1bc2 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into app-install-9211

81e57ce78f Retrieve extra details

74d4e2dded Add vpp scopes

8907903e26 Merge pull request 'Retrieve app details of Operation' (#203 ) from osh.silva/device-mgt-core:app-install-9211 into master

Reviewed-on: #203

67864cb762 Add deviceinfo config beans

d869159625 Add missing type params to device info xml

3066e51354 Show device identifier and delete certificate using certificate Id

f9ae594326 Fix APPs getting issue in APPM DAO

cf5664bb59 Fix APPs getting issue in APPM DAO

4ab0c77e8e Add i8n support

f286cb2306 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into device-info-config

f6cd325bff Add device info config into mdm-ui-config.xml

6d6d3f4f40 Add firmware system version column

bef4ff3768 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into device-info-config

5f5ac9d5ab Merge pull request 'Add firmware system version column' (#206 ) from shamalka1/device-mgt-core:device-info-config into master

Reviewed-on: #206

388f34e3b8 Fix try-it meta-info getting issue

1fed47e8fd Add app details for UNMANAGED_APP_UNINSTALL

127b554ef7 Remove not null constraints from metainfo field

6ae3990bba Remove not null constraints from metainfo field

44f58ccbc0 Fix try-it meta-info getting issue

4fbcd75a61 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into unmanaged-install-9211

195bb64bea Resolve comments

70c27b647b Operation Template releated changes

9e8b8efd4b Merge pull request 'Operation Template releated changes' (#212 ) from thameera/device-mgt-core:feature/operation-template into master

Reviewed-on: #212

d83b417a0b Merge branch 'master' into unmanaged-install-9211

7afe7fca08 Merge pull request 'Add app details for UNMANAGED_APP_UNINSTALL' (#210 ) from osh.silva/device-mgt-core:unmanaged-install-9211 into master

Reviewed-on: #210

7a7974eb36 Add: hierarchical group count API

017c70fa08 Fix Certificate test case and delete and search option

dbc73d18ed Add improvements to certificate component

a2b59c2a35 Add improvements to certificate component

cf3d50edf9 added new method getAllocatedOperationMappingsByStatus

349fce4e63 improved push notofication task to get allocated operations when heart beat enabled

21606bc5cd operation timeout task updated to execute only in elected node

1d7700ab5c imrpoved heart beat to handle cluster formation changed

9ecdd486f8 imrpoved heart beat to handle cluster formation changed

d4c3af5d12 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core

f7c3e129c4 [maven-release-plugin] prepare release v5.0.29

7c0adfbc89 [maven-release-plugin] prepare for next development iteration

c144507b6c Merge branch 'master' into master

6d3127a008 Merge pull request 'improvements to heart beat, push notification task and operation timeout task' (#217 ) from amalka.subasinghe/device-mgt-core:master into master

Reviewed-on: #217

7b1907cd90 resolve comments

28b18941aa Merge pull request 'Add hierarchical group count API' (#214 ) from ThilinaPremachandra/device-mgt-core:Bug#10300 into master

Reviewed-on: #214

b9f12e49ee [maven-release-plugin] prepare release v5.0.30

7c66f6b693 [maven-release-plugin] prepare for next development iteration

dc40351293 Change location publishing logic

913f6175af Merge pull request 'Change location publishing logic' (#218 ) from shamalka1/device-mgt-core:location-fix into master

Reviewed-on: #218

203475f87d Remove custom properties from device table column selection

693e3a51d5 Remove custom properties from device table column selection

680f57ade5 URL permission issue fixes (Removed * from root URLs)

b761bdd5ea Merge pull request 'URL permission issue fixes (Removed * from root URLs)' (#221 ) from thameera/device-mgt-core:permission_issue into master

Reviewed-on: #221

9c7fd9027e Fix the API to check if a device is enrolled

d20c95a55c Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into status

320d012f5a Merge pull request 'Fix the API to check if a device is enrolled' (#222 ) from arshana790/device-mgt-core-fork:status into master

Reviewed-on: #222

0fbe062e49 Fix the SSL error when invoking internal API via HttpClient (#215 )

Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: #215

44c7d324de Fix: delete group with GeoFence references issue

ef47f0c20a Update scopes including already existing roles

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: #224

94b0278471 Fix dbscripts causing errors on startup

42ef84e8a3 Fix table DM_TRACCAR_UNSYNCED_DEVICES

5d06485a25 Add device deletion scenario for billing

0abf955fe0 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into billing-delete-9713

9011273ff4 Apply role permission mapping along with scope role mapping

26a049473c Modify View Activities endpoint by including operation id

4a6e0ce727 Update get Activities to increase the performance

ea6744288a Merge pull request 'Modify View Activities endpoint' (#227 ) from Sasini_Sandamali/device-mgt-core-forked:master into master

Reviewed-on: #227

661feadcd5 Fix added for loading device groups

4fc6eb2aa4 Fix error showing on startup in task-mgt

6fd84dcbef Comment out cost related code

5371c5268b Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into billing-delete-9713

8bc0fa37de Add cost calculation for carbon super

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: #208
Co-authored-by: Pramila Niroshan <pramila@entgra.io>
Co-committed-by: Pramila Niroshan <pramila@entgra.io>

664dfd21c9 Warn about orphan scopes

f4c0e5f929 Merge pull request 'Fix dbscripts causing errors on startup with MSSQL' (#225 ) from prathabanKavin/device-mgt-core:mssqldbscriptfix into master

Reviewed-on: #225

0068a26b58 Merge pull request 'Fix added for loading device groups' (#228 ) from prathabanKavin/device-mgt-core:sqldevicegroupfix into master

Reviewed-on: #228

795d26f4b0 Merge pull request 'Fix error showing on startup in task-mgt' (#229 ) from prathabanKavin/device-mgt-core:mssqltaskmgt into master

Reviewed-on: #229

bb0369cde9 Update addOperation and sql files

327f507aa8 Merge pull request 'Update addOperation and sql files' (#233 ) from Sasini_Sandamali/device-mgt-core-forked:master into master

Reviewed-on: #233

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: #232
Co-authored-by: Rajitha Kumara <rajitha@entgra.io>
Co-committed-by: Rajitha Kumara <rajitha@entgra.io>

50887c12f9 Merge pull request 'Add device deletion scenario for billing' (#226 ) from osh.silva/device-mgt-core:billing-delete-9713 into master

Reviewed-on: #226

3c658f0afe Fix ownership issue in device deletion

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: #234

966b9194f2 Add missing scope

a1856323b5 Add missing scope

48a72e80e9 Modify scope keys

6c8c2efb80 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into scope-fixes

9e0427021e Duplicate keys for same permission in different files

a620cffb31 Merge pull request 'Modify permission scope keys' (#239 ) from viranga/device-mgt-core:scope-fixes into master

Reviewed-on: #239

f8e3fb90e6 Fix analytics publishing for Windows devices

03a0539d92 Fix incorrect grafana permission annotations

77823e2839 Modify get Geofence API to get total count

28eb838846 Merge pull request 'Fix incorrect grafana permission annotations' (#241 ) from navodzoysa/device-mgt-core:grafana-perm into master

Reviewed-on: #241

51f1bf1280 Merge pull request 'Fix analytics publishing for Windows devices' (#240 ) from navodzoysa/device-mgt-core:fix-windows-analytics into master

Reviewed-on: #240

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: #223

563077fbfb Add scope perm mapping logic

8813619929 Merge pull request 'Add scope perm mapping logic' (#235 ) from tcdlpds/device-mgt-core:master into master

Reviewed-on: #235

58670028c0 Fix scope attaching issue

db80546a5a Merge pull request 'Fix scope attaching issue' (#247 ) from tcdlpds/device-mgt-core:master into master

Reviewed-on: #247

54cdab5085 Improvements to the device sub type impl

d63f2a3f24 mapping permissions with scopes

49747efa18 Add default perm config

6b7c4e9069 Merge pull request 'Fix scope-permission mapping issue' (#249 ) from viranga/device-mgt-core:scope-fixes into master

Reviewed-on: #249

98954c9374 Merge pull request 'Add default perm config' (#252 ) from tcdlpds/device-mgt-core:master into master

Reviewed-on: #252

3a63f948a0 Add admin role when adding shared scopes

4418caa631 Update db scripts

fe795bc399 Add admin role when adding shared scopes

22b9897a4b Add permission updating logic

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: #243

1b0ad156b2 Add Java Doc comments

c3cc4fe6d4 Add fix for search operation (#251 )

fixes https://roadmap.entgra.net/issues/10279

Co-authored-by: osh <osh.silva@gmail.com>
Reviewed-on: #251
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>

15de6d397e Merge pull request 'Add permission updating logic' (#254 ) from tcdlpds/device-mgt-core:master into master

Reviewed-on: #254

e3e9ad851c Merge branch 'master' into master

7a9869f044 Merge pull request 'Improvements to the device sub type impl' (#248 ) from amalka.subasinghe/device-mgt-core:master into master

Reviewed-on: #248

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: #244
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>