Commit Graph

8395 Commits

Author SHA1 Message Date
ThilinaPremachandra
13545f1c7c remove unnecessary code lines 2023-07-25 16:20:25 +05:30
ThilinaPremachandra
d842fc4085 remove unnecessary imports, fixes line issues 2023-07-25 16:20:21 +05:30
ThilinaPremachandra
32e5456f21 fixes line issues 2023-07-25 16:18:38 +05:30
ThilinaPremachandra
88356c57aa Add hierarchical grouping feature 2023-07-25 16:18:36 +05:30
ThilinaPremachandra
ce4276c93a pom.xml updated by pull 2023-07-25 15:59:47 +05:30
7ad3a0e21b Add custom loggers (#136)
* Fixes https://roadmap.entgra.net/issues/10117

* Added custom logs for below cases:
1. Device connectivity events
2. Policy payload change events
3. Device enrollment history events
4. App install events

**1. Device connectivity logs** - logs for newly added operations and calls for pending operations

Pattern :
{DateTime} {LogLevel} - {ActionTag} {OperationCode} {DeviceId} {DeviceType} {TenantDomain} {TenantId} {UserName} - log_message

```
[2023-06-15 00:12:09,093]  INFO - [ADD_OPERATION] [DEVICE_LOCATION] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:12:10,344]  INFO - [PENDING_OPERATION] [DEVICE_LOCATION] [675c60a9d31492d6] [android] [carbon.super] [-1234] [admin]- Device Connected
[2023-06-15 00:13:49,755]  INFO - [ADD_OPERATION] [DEVICE_LOCK] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:13:56,513]  INFO - [ADD_OPERATION] [DEVICE_MUTE] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:14:23,839]  INFO - [PENDING_OPERATION] [DEVICE_MUTE]
[2023-06-15 00:15:12,549]  INFO - [ADD_OPERATION] [INSTALL_APPLICATION] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:15:29,703]  INFO - [PENDING_OPERATION] [INSTALL_APPLICATION] [675c60a9d31492d6] [android] [carbon.super] [-1234] [admin]- Device Connected
```
**2. Policy payload change events** - logs for creating policy, updating policy, deleting policy, change policy priorities and apply changes to device logs

Pattern :
{DateTime} {LogLevel} - {ActionTag} {PolicyName} {TenantDomain} {TenantId} {Payload} {UserName} - log_message

```
[2023-06-15 00:15:53,264]  INFO - [UPDATE_POLICY] [passcodeios] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":33,"priorityId":1,"profile":{"profileId":33,"profileName":"passcodeios","tenantId":0,"deviceType":"ios","updatedDate":"Jun 15, 2023 12:15:53 AM","profileFeaturesList":[{"id":33,"featureCode":"PASSCODE_POLICY","profileId":0,"deviceType":"ios","content":"{\"forcePIN\":true,\"allowSimple\":true,\"requireAlphanumeric\":true,\"minLength\":7.0,\"minComplexChars\":4.0,\"pinHistory\":\"\"}","correctiveActions":[]}]},"policyName":"passcodeios","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":false,"description":"test","compliance":"enforce","tenantId":-1234,"profileId":33,"policyType":"GENERAL"}] [admin] - Policy updated
[2023-06-15 00:34:38,980]  INFO - [ADD_POLICY] [application management policy] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":65,"priorityId":0,"profile":{"profileId":65,"profileName":"application management policy","tenantId":0,"deviceType":"windows","createdDate":"Jun 15, 2023 12:34:38 AM","updatedDate":"Jun 15, 2023 12:34:38 AM","profileFeaturesList":[{"id":65,"featureCode":"ALLOW_ALL_TRUSTED_APPS","profileId":0,"deviceType":"windows","content":"{\"enabled\":true}","correctiveActions":[]},{"id":73,"featureCode":"RESTRICT_APP_TO_SYSTEM_VOLUME","profileId":0,"deviceType":"windows","content":"{\"enabled\":false}","correctiveActions":[]}]},"policyName":"application management policy","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":false,"description":"test","compliance":"enforce","tenantId":-1234,"profileId":0,"policyType":"GENERAL"}] [admin] - Policy created
[2023-06-15 00:35:05,420]  INFO - [DELETE_POLICY] [passcodeios] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":33,"priorityId":1,"profile":{"profileId":33,"profileName":"passcodeios","tenantId":-1234,"deviceType":"ios","createdDate":"Jun 13, 2023 10:24:30 PM","updatedDate":"Jun 15, 2023 12:15:53 AM","profileFeaturesList":[{"id":33,"featureCode":"PASSCODE_POLICY","profileId":33,"deviceType":"ios","content":"{\"forcePIN\":true,\"allowSimple\":true,\"requireAlphanumeric\":true,\"minLength\":7.0,\"minComplexChars\":4.0,\"pinHistory\":\"\"}","correctiveActions":[]}]},"policyName":"passcodeios","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":true,"description":"test","compliance":"enforce","policyCriterias":[],"tenantId":-1234,"profileId":33,"deviceGroups":[],"policyType":"GENERAL"}] [admin] - Policy deleted
[2023-06-15 00:35:12,768]  INFO - [UPDATE_POLICY_PRIORITIES] [] [carbon.super] [-1234] [[{"id":65,"priorityId":1,"generic":false,"active":false,"updated":false,"tenantId":0,"profileId":0},{"id":34,"priorityId":2,"generic":false,"active":false,"updated":false,"tenantId":0,"profileId":0}]] [admin] - Policy priorities updated
[2023-06-15 00:35:25,395]  INFO - [PUBLISH_CHANGES] [] [carbon.super] [-1234] [] [admin] - Apply changes to device
```
**3. Device enrollment history events** - logs for device enrollment and dis-enrollment

Pattern :
{DateTime} {LogLevel} - {DeviceId} {DeviceType} {Owner} {Ownership} {TenantId} {TenantDomain} {UserName} - log_message

```
[2023-06-15 00:12:09,078]  INFO - [97] [android] [admin] [BYOD] [-1234] [carbon.super] [admin] - Device enrolled successfully
[2023-06-15 00:47:36,278]  INFO - [97] [android] [admin] [BYOD] [-1234] [carbon.super] [admin] - Device disenrolled successfully
```

**4. App install events** - logs for app installation and uninstallation

Pattern :
{DateTime} {LogLevel} - {AppId} {AppName} {AppType} {SubType} {Action} {Device} {TenantId} {TenantDomain} {UserName} - log_message

```
[2023-06-15 00:15:12,550]  INFO - [1] [Calculator] [PUBLIC] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - App install triggered
[2023-06-15 00:46:24,454]  INFO - [2] [Sololearn] [ENTERPRISE] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - App install triggered
[2023-06-15 00:46:40,498]  INFO - [3] [Engineering] [WEB_CLIP] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - Web app install triggered
```

* https://repository.entgra.net/proprietary/product-uem/pulls/6

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/136
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-07-25 15:59:45 +05:30
navodzoysa
74e06047f1 Fix class def not found in grafana component 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
5b85778d27 fixed operation template unit tests 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
80b42315d7 operation template related unit test fixes 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
f63a6ee65b fixed unit tests 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
ce37fdb4be fixed unit tests 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
c286fec27b fixed unit tests 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
da8fa5b895 fixed unit tests 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
bc66555a04 fixed unit tests 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
c855b707e7 fixed mockito dependency issue 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
defb0aed04 fixed unit tests in analytics-mgt 2023-07-25 15:45:15 +05:30
Amalka Subasinghe
5b6b11dc8c fixed unit tests of application-mgt 2023-07-25 15:45:15 +05:30
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
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
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
Dharmakeerthi Lasantha
5098c652ca Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into sync-master 2023-07-18 09:22:28 +05:30
Amalka Subasinghe
bfe9746d70 Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-07-18 09:20:19 +05:30
Dharmakeerthi Lasantha
1d94fb7de1 Fix test case failing 2023-07-18 09:16:25 +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
Dharmakeerthi Lasantha
2cfa73206d Fix OSGI service unbinding issue 2023-07-13 07:54:34 +05:30
Dharmakeerthi Lasantha
a66d6389f9 Fix formatting issue 2023-07-12 00:39:31 +05:30
Dharmakeerthi Lasantha
fe4011cc7e Sync with master 2023-07-12 00:08:41 +05:30
Dharmakeerthi Lasantha
3bf6f7dd75 Improve functionality and fix formatting issues 2023-07-12 00:05:02 +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
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
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
Amalka Subasinghe
2e5579fdc2 fixed operation template unit tests 2023-07-07 11:16:53 +05:30
Amalka Subasinghe
013df183cd operation template related unit test fixes 2023-07-07 11:11:31 +05:30
ThilinaPremachandra
253dc03233 fix: deleted roles removing issue 2023-07-06 20:38:06 +05:30
Amalka Subasinghe
edcf235ff8 fixed unit tests 2023-07-06 14:54:56 +05:30
Amalka Subasinghe
9352382406 fixed unit tests 2023-07-06 14:50:32 +05:30
Amalka Subasinghe
78f9f746d8 fixed unit tests 2023-07-06 14:26:32 +05:30
Amalka Subasinghe
9759520157 fixed unit tests 2023-07-06 14:22:21 +05:30
Amalka Subasinghe
b08f3fcc49 fixed unit tests 2023-07-06 13:15:02 +05:30
Amalka Subasinghe
1c4ee6cacc fixed mockito dependency issue 2023-07-06 10:40:38 +05:30
Amalka Subasinghe
9f19c1d1c1 fixed unit tests in analytics-mgt 2023-07-06 10:35:43 +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
ThilinaPremachandra
6c645db486 add: proper msg for group delete 2023-07-05 11:54:12 +05:30
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
rajitha
5818a5eaed Fix transaction initiating issue 2023-07-04 18:37:39 +05:30
Amalka Subasinghe
204b5d956b fixed unit tests of application-mgt 2023-07-04 16:54:32 +05:30
osh
c9ed09ee25 Resolve conflicts 2023-07-04 08:50:39 +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
osh
1263c09079 Add DAOs for asset management
fixes https://roadmap.entgra.net/issues/10179
2023-06-30 19:05:59 +05:30
inoshperera
54111b4d94 Add association apis
fixes https://roadmap.entgra.net/issues/10182
2023-06-30 13:32:47 +05:30
Amalka Subasinghe
2ff6e2e529 updated jackson-databind version 2023-06-30 12:02:53 +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
inoshperera
61ffd4abff Fixing conflics 2023-06-29 09:31:46 +05:30
navodzoysa
8d9e3c8f51 Remove reserved_user when fetching users 2023-06-29 00:34:09 +05:30
osh
2e799a545f Resolve comments 2023-06-28 21:43:06 +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
inoshperera
665702d504 Add asset apis
Fixes https://roadmap.entgra.net/issues/10178
2023-06-28 21:08:20 +05:30
osh
cd42a2c48f Adding the DAO layer for vpp user management
fixes https://roadmap.entgra.net/issues/10169
2023-06-28 20:03:16 +05:30
Dharmakeerthi Lasantha
e7062b37b2 Fix Cron Expression defining issue 2023-06-28 18:59:30 +05:30
Dharmakeerthi Lasantha
1e9b38440b Improve subscription filtering logic 2023-06-28 09:33:27 +05:30
e0a1cd3dbb Merge pull request 'Add api for get visible roles' (#146) from nishan/device-mgt-core:add-visible-role-api into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/146
2023-06-27 12:50:35 +00:00
Thilina Sandaruwan
498dc7ae34 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-06-27 08:57:23 +00:00
rajitha
d5270c720c Update invite link 2023-06-27 13:42:07 +05:30
979d3b48cb Merge branch 'master' into sync-master 2023-06-27 05:49:13 +00:00
Inosh Perara
da694c3dbe Merge pull request 'Add device enrolment log for modifyenrolment' (#148) from prathabanKavin/device-mgt-core:enrolmentlogfix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/148
2023-06-27 05:32:13 +00:00
Inosh Perara
f246d6b8de Merge pull request 'add vpp user services' (#151) from inosh/device-mgt-core:vpp into vpp-v2
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/151
2023-06-26 13:46:51 +00:00
inoshperera
cc8470d3c0 add vpp user services 2023-06-26 19:10:17 +05:30
navodzoysa
7073deb461 Fix skip app release error 2023-06-26 14:15:29 +05:30
763cd7df25 Fix missing imports 2023-06-26 13:43:13 +05:30
92d7f5b61f Resolve Conflicts 2023-06-26 13:31:39 +05:30
nishan
cd962b8d24 Remove the user has role validation 2023-06-26 07:28:53 +05:30
nishan
4a31d80660 add api for get visible roles 2023-06-26 02:12:52 +05:30
Oshani Silva
6109f58c49 Remove unwanted check in billing logic
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-06-25 19:14:59 +00:00
prathabanKavin
389eb05084 Add device enrolment log for modifyenrolment 2023-06-25 20:04:36 +05:30
Inosh Perara
9dd24eda17 Merge pull request 'Add vpp user apis' (#147) from inosh/device-mgt-core:vpp into vpp-v2
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/147
2023-06-23 17:54:49 +00:00
inoshperera
9ccf3a5fa5 Add vpp user apis
fixes https://roadmap.entgra.net/issues/10162
2023-06-23 23:22:40 +05:30
577e3e9384 Remove unnecessary logs 2023-06-23 20:39:12 +05:30
Inosh Perara
b0dfadbe68 Merge pull request 'iOS user enrollment support' (#143) from inosh/device-mgt-core:ios-user-enrollment into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/143
2023-06-23 04:51:44 +00:00
660fadc39d Merge branch 'support-5.0.24' of ssh://repository.entgra.net:222/support/support-carbon-device-mgt into support-5.0.24 2023-06-23 06:25:07 +05:30
bfdd6cf8d0 Merge branch 'support-5.0.24' into store-certificate-device-id 2023-06-23 00:35:50 +00:00
navodzoysa
00bd74734a Remove apim_reserved_user when fetching users 2023-06-22 19:38:33 +05:30
pasindu
c455bfe187 Fix consumer REST calls 2023-06-22 15:57:35 +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
Inosh Perara
d17925cf7f Merge pull request 'HierarchicalGrouping' (#137) from ThilinaPremachandra/device-mgt-core:syncHierarchicalGrouping into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/137
2023-06-21 05:40:44 +00:00
b18003a1cd Add OTP based remote session implementation 2023-06-21 06:20:17 +05:30
inoshperera
cb99e4c285 iOS user enrollment support
Fixes https://roadmap.entgra.net/issues/10149
2023-06-20 23:37:12 +05:30
rajitha
94408c7ce3 Add otp token 2023-06-20 12:32:44 +05:30
Dharmakeerthi Lasantha
342e201c4c Add improvements to APIM application creating logic 2023-06-20 09:39:49 +05:30
Pasindu Rupasinghe
cb2fb990e7 Get ApiApplicationInfo and access token into single object
Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>
2023-06-19 12:00:20 +00:00
pasindu
da1485d04f Fix getApplication method with Rest api calls 2023-06-19 08:02:41 +05:30
inoshperera
48be39a963 Add the logic to save device id to certificate DB
partialy fixes https://roadmap.entgra.net/issues/10145
2023-06-18 12:22:01 +05:30
1890f07217 Merge branch 'master' into fix-grafana 2023-06-16 10:38:03 +00:00
cf2bd5e935 Add custom loggers (#136)
## Purpose
* Fixes https://roadmap.entgra.net/issues/10117

## Description
* Added custom logs for below cases:
1. Device connectivity events
2. Policy payload change events
3. Device enrollment history events
4. App install events

#### Log structure

**1. Device connectivity logs** - logs for newly added operations and calls for pending operations

Pattern :
{DateTime} {LogLevel} - {ActionTag} {OperationCode} {DeviceId} {DeviceType} {TenantDomain} {TenantId} {UserName} - log_message

```
[2023-06-15 00:12:09,093]  INFO - [ADD_OPERATION] [DEVICE_LOCATION] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:12:10,344]  INFO - [PENDING_OPERATION] [DEVICE_LOCATION] [675c60a9d31492d6] [android] [carbon.super] [-1234] [admin]- Device Connected
[2023-06-15 00:13:49,755]  INFO - [ADD_OPERATION] [DEVICE_LOCK] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:13:56,513]  INFO - [ADD_OPERATION] [DEVICE_MUTE] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:14:23,839]  INFO - [PENDING_OPERATION] [DEVICE_MUTE]
[2023-06-15 00:15:12,549]  INFO - [ADD_OPERATION] [INSTALL_APPLICATION] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:15:29,703]  INFO - [PENDING_OPERATION] [INSTALL_APPLICATION] [675c60a9d31492d6] [android] [carbon.super] [-1234] [admin]- Device Connected
```
**2. Policy payload change events** - logs for creating policy, updating policy, deleting policy, change policy priorities and apply changes to device logs

Pattern :
{DateTime} {LogLevel} - {ActionTag} {PolicyName} {TenantDomain} {TenantId} {Payload} {UserName} - log_message

```
[2023-06-15 00:15:53,264]  INFO - [UPDATE_POLICY] [passcodeios] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":33,"priorityId":1,"profile":{"profileId":33,"profileName":"passcodeios","tenantId":0,"deviceType":"ios","updatedDate":"Jun 15, 2023 12:15:53 AM","profileFeaturesList":[{"id":33,"featureCode":"PASSCODE_POLICY","profileId":0,"deviceType":"ios","content":"{\"forcePIN\":true,\"allowSimple\":true,\"requireAlphanumeric\":true,\"minLength\":7.0,\"minComplexChars\":4.0,\"pinHistory\":\"\"}","correctiveActions":[]}]},"policyName":"passcodeios","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":false,"description":"test","compliance":"enforce","tenantId":-1234,"profileId":33,"policyType":"GENERAL"}] [admin] - Policy updated
[2023-06-15 00:34:38,980]  INFO - [ADD_POLICY] [application management policy] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":65,"priorityId":0,"profile":{"profileId":65,"profileName":"application management policy","tenantId":0,"deviceType":"windows","createdDate":"Jun 15, 2023 12:34:38 AM","updatedDate":"Jun 15, 2023 12:34:38 AM","profileFeaturesList":[{"id":65,"featureCode":"ALLOW_ALL_TRUSTED_APPS","profileId":0,"deviceType":"windows","content":"{\"enabled\":true}","correctiveActions":[]},{"id":73,"featureCode":"RESTRICT_APP_TO_SYSTEM_VOLUME","profileId":0,"deviceType":"windows","content":"{\"enabled\":false}","correctiveActions":[]}]},"policyName":"application management policy","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":false,"description":"test","compliance":"enforce","tenantId":-1234,"profileId":0,"policyType":"GENERAL"}] [admin] - Policy created
[2023-06-15 00:35:05,420]  INFO - [DELETE_POLICY] [passcodeios] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":33,"priorityId":1,"profile":{"profileId":33,"profileName":"passcodeios","tenantId":-1234,"deviceType":"ios","createdDate":"Jun 13, 2023 10:24:30 PM","updatedDate":"Jun 15, 2023 12:15:53 AM","profileFeaturesList":[{"id":33,"featureCode":"PASSCODE_POLICY","profileId":33,"deviceType":"ios","content":"{\"forcePIN\":true,\"allowSimple\":true,\"requireAlphanumeric\":true,\"minLength\":7.0,\"minComplexChars\":4.0,\"pinHistory\":\"\"}","correctiveActions":[]}]},"policyName":"passcodeios","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":true,"description":"test","compliance":"enforce","policyCriterias":[],"tenantId":-1234,"profileId":33,"deviceGroups":[],"policyType":"GENERAL"}] [admin] - Policy deleted
[2023-06-15 00:35:12,768]  INFO - [UPDATE_POLICY_PRIORITIES] [] [carbon.super] [-1234] [[{"id":65,"priorityId":1,"generic":false,"active":false,"updated":false,"tenantId":0,"profileId":0},{"id":34,"priorityId":2,"generic":false,"active":false,"updated":false,"tenantId":0,"profileId":0}]] [admin] - Policy priorities updated
[2023-06-15 00:35:25,395]  INFO - [PUBLISH_CHANGES] [] [carbon.super] [-1234] [] [admin] - Apply changes to device
```
**3. Device enrollment history events** - logs for device enrollment and dis-enrollment

Pattern :
{DateTime} {LogLevel} - {DeviceId} {DeviceType} {Owner} {Ownership} {TenantId} {TenantDomain} {UserName} - log_message

```
[2023-06-15 00:12:09,078]  INFO - [97] [android] [admin] [BYOD] [-1234] [carbon.super] [admin] - Device enrolled successfully
[2023-06-15 00:47:36,278]  INFO - [97] [android] [admin] [BYOD] [-1234] [carbon.super] [admin] - Device disenrolled successfully
```

**4. App install events** - logs for app installation and uninstallation

Pattern :
{DateTime} {LogLevel} - {AppId} {AppName} {AppType} {SubType} {Action} {Device} {TenantId} {TenantDomain} {UserName} - log_message

```
[2023-06-15 00:15:12,550]  INFO - [1] [Calculator] [PUBLIC] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - App install triggered
[2023-06-15 00:46:24,454]  INFO - [2] [Sololearn] [ENTERPRISE] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - App install triggered
[2023-06-15 00:46:40,498]  INFO - [3] [Engineering] [WEB_CLIP] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - Web app install triggered
```

## Related PRs
* https://repository.entgra.net/proprietary/product-uem/pulls/6

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/136
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-06-16 10:06:30 +00:00
ThilinaPremachandra
647d4fdb78 add rollback 2023-06-16 09:48:52 +05:30
Dharmakeerthi Lasantha
bfaeb1778f Add JWT support 2023-06-16 08:03:11 +05:30
ThilinaPremachandra
3722bfc761 add try with resources 2023-06-16 01:58:42 +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
43ef801ac3 Improvements in consumer rest apis 2023-06-15 10:28:22 +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
bc2bccac84 remove unnecessary code lines 2023-06-14 18:38:11 +05:30
ThilinaPremachandra
bb50717370 remove unnecessary imports, fixes line issues 2023-06-14 17:45:27 +05:30
ThilinaPremachandra
67c529b0fa fixes line issues 2023-06-14 17:16:38 +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
253157ba1a Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-06-14 01:46:46 +05:30
navodzoysa
331ba08f4d Fix class def not found in grafana component 2023-06-13 09:19:43 +05:30
Dharmakeerthi Lasantha
1edaa8a2a5 Improve API key generating method 2023-06-13 08:48:22 +05:30
pasindu
7826e5c285 Fix key generation method 2023-06-13 07:32:32 +05:30
Dharmakeerthi Lasantha
730f3aaa07 Improve API publishing functionality 2023-06-13 04:06:04 +05:30
Dharmakeerthi Lasantha
840ba3755a Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420 2023-06-12 16:29:12 +05:30
Dharmakeerthi Lasantha
af17e4fa8e Improve APIM application key generate method 2023-06-12 16:27:38 +05:30
pasindu
3b8405e72e Fix version issues in REST APIs 2023-06-12 14:37:00 +05:30
Amalka Subasinghe
46ee81e78d updated from master 2023-06-12 12:19:20 +05:30
Dharmakeerthi Lasantha
a09d72c33c Add todo Comments 2023-06-10 11:43:27 +05:30
ThilinaPremachandra
acd3039c65 pom.xml updated by pull 2023-06-09 18:34:52 +05:30
Dharmakeerthi Lasantha
0927dfc835 sync with upstream 2023-06-09 14:44:08 +05:30
Dharmakeerthi Lasantha
f741df7c4b Add ToDos 2023-06-09 14:12:30 +05:30
8c7412a2f9 Merge branch 'master' into search-10113 2023-06-09 05:07:31 +00:00
743d5c09ec Merge pull request 'Implement DeleteDeviceLocation method for deleting location from a device' (#128) from Gimhan-minion/device-mgt-core:dev into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/128
2023-06-09 02:25:39 +00:00
Dharmakeerthi Lasantha
c227969a61 Improve the functionality 2023-06-09 05:06:01 +05:30
Dharmakeerthi Lasantha
189a572d31 Improve functionality 2023-06-09 04:51:05 +05:30
pasindu
94e1df617a Get apiApplication registration to single method and fix generateApplicationKeys 2023-06-09 03:07:42 +05:30
656acbb34e Remove Application mgt API feature from device mgt core 2023-06-08 12:30:34 +05:30
Dharmakeerthi Lasantha
d251253948 Improve application key generating functionality 2023-06-08 06:02:23 +05:30
pasindu
0e62245064 modify generateAndRetrieveApplicationKeys method 2023-06-07 23:24:13 +05:30
Dharmakeerthi Lasantha
6bf6adf2b5 Add API integration 2023-06-07 20:58:48 +05:30
pasindu
c53c8f3d63 minor fix 2023-06-07 10:43:34 +05:30
Gimhan-minion
a6a9e82c35 Update debug and error logs 2023-06-07 10:43:32 +05:30
Gimhan-minion
b58b8c931b Implement DeleteDeviceLocation method for deleting location from a device 2023-06-07 10:43:32 +05:30
pasindu
45d98d5e49 Improve get all api method to accept header params 2023-06-07 07:57:18 +05:30
pasindu
a8d45ee41a Create methods for consumer api app creation and get details of app 2023-06-07 07:57:18 +05:30
pasindu
a513c13037 Improvements in consumer rest apis 2023-06-07 07:57:18 +05:30
Dharmakeerthi Lasantha
c46a459e6d Add Application key generating logic 2023-06-06 17:03:33 +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
Dharmakeerthi Lasantha
2d37dcb340 Add API app registering refactored code 2023-06-06 11:17:29 +05:30
Lasantha Dharmakeerthi
cebc3bf5d4 Fix issue with delete geofences with MSSQL db 2023-06-02 05:59:40 +00:00
osh
891e7972c8 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into search-10113 2023-06-01 23:37:13 +05:30
osh
96e3c3f0e0 Fix search by user
fixes https://roadmap.entgra.net/issues/10113
2023-06-01 23:37:01 +05:30
prathabanKavin
1fb777264d Check for logged in tenant id 2023-06-01 22:55:04 +05:30
Sanjana Rajapakshe
c06fd22ecd Add original app icons into single device app list and application restriction policy app list
Co-authored-by: Sanjana Rajapakshe <sanjana@entgra.io>
Co-committed-by: Sanjana Rajapakshe <sanjana@entgra.io>
2023-06-01 16:11:35 +00:00
Dharmakeerthi Lasantha
22f4da908f Add Consumer REST API integration 2023-06-01 17:13:51 +05:30
Pasindu Rupasinghe
c98237dc6f Implement service for consumer rest APIs
Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>
2023-06-01 09:50:58 +00:00
Dharmakeerthi Lasantha
c3d23c3cfa Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-06-01 15:01:51 +05:30
Dharmakeerthi Lasantha
6e0fe2e26e Integrate with APIM dev-portal APIs 2023-06-01 08:52:26 +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
prathabanKavin
bd5776947d Fix issue with delete geofences with mssql db 2023-05-31 21:45:31 +05:30
Lasantha Dharmakeerthi
d2f8d30cca Fix create geofence issue with MSSQL db 2023-05-31 07:30:44 +00:00
prathabanKavin
79d49a0512 used try with resources 2023-05-31 12:09:53 +05:30
prathabanKavin
d49ab1c7f0 Fix create geofence issue with mssql db 2023-05-30 23:59:39 +05:30
pasindu
1404f573e2 Make separate feature for apim rest api component 2023-05-30 16:27:41 +05:30
7100b36e35 Fix package name issue 2023-05-29 12:27:50 +05:30
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
pasindu
c5a7902386 Fix error message and minor fixes in loop and if condition 2023-05-25 16:50:43 +05:30
pasindu
014f95bd10 Rename API dto file and refactor 2023-05-25 14:04:24 +05:30
pasindu
b133f56965 Cleanup code base and fix getApiRevision method 2023-05-25 13:17:07 +05:30
pasindu
7246209bd8 Added licence header for newly added files 2023-05-25 12:55:25 +05:30
pasindu
a683bd7110 Fix API response 2023-05-25 12:49:14 +05:30
209f2b66c9 Add tenant based storing and loading SCEP certificates 2023-05-25 11:55:14 +05:30
inoshperera
1aafd53d3e OTP for enrollment with Mutual TLS
Fixes https://roadmap.entgra.net/issues/10093
2023-05-24 16:48:17 +05:30
Lasantha Dharmakeerthi
19ce7d6fac Add try it now feature (#99)
Co-authored-by: Dharmakeerthi Lasantha <tcdlpds@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/99
Co-authored-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
Co-committed-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
2023-05-24 16:48:13 +05:30
d34adaae96 Fix issue with Nginx not recognizing the SCEP client certificate (#105)
Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/105
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Co-committed-by: Pahansith Gunathilake <pahansith@entgra.io>
2023-05-24 16:47:42 +05:30
inoshperera
dfe957b019 Add SCEP support
fixes https://roadmap.entgra.net/issues/10042
2023-05-24 16:47:39 +05:30
pasindu
cbb03d4d1f Minor fixes in api requests 2023-05-24 09:06:51 +05:30
pasindu
7e94f152ea Remove wild card imports 2023-05-24 09:06:51 +05:30
pasindu
65da984f66 Remove comented code lines 2023-05-24 09:06:51 +05:30
pasindu
a8cc35ef3d Fix apis 2023-05-24 09:06:51 +05:30
pasindu
c6b43cc794 Implment API layer for API publisher 2023-05-24 09:06:51 +05:30
pasindu
fa3c112a68 Implement on progress publisher api layer 2023-05-24 09:06:51 +05:30
osh
2b72f4890b Add by serial number in store 2023-05-23 23:16:55 +05:30
prathabanKavin
402e4e769d Fix operation log timing incorrectness 2023-05-23 22:44:08 +05:30
osh
7d6cfaa3b1 Add fix for serial number search
fixes components/device-mgt/io.entgra.device.mgt.core.device.mgt.core/src/main/java/io/entgra/device/mgt/core/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java
2023-05-23 11:54:48 +05:30
7688aa375d Fix operation logs not loading with mssql
## Purpose
* Fixes https://roadmap.entgra.net/issues/10050

## Description
* Converting BIGINT to timestamp directly is not supported with MSSQL. Timestamp class is used for conversion.

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/117
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-05-17 05:58:02 +00:00
prathabanKavin
9bf0fa553a Fix remote session not working with MSSQL 2023-05-17 10:51:01 +05:30
Amalka Subasinghe
0ef880eb3c fix issues related to uem test failures 2023-05-15 22:50:55 +05:30
pasindu
9ceb6cc0cf mend 2023-05-15 21:58:39 +05:30
pasindu
401c549f13 Fix SSL timeout issue in Rest client 2023-05-15 21:54:31 +05:30
Amalka Subasinghe
a438b0fbd4 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core 2023-05-12 21:51:42 +05:30
Amalka Subasinghe
951dde2a31 fixed build issues after restucturing 2023-05-12 21:51:36 +05:30
kavindya_devindi
55e3bb953f Add missing log method's contents in logger component 2023-05-12 16:17:06 +05:30
Amalka Subasinghe
1229f275f6 fixing issues after component refactoring 2023-05-11 18:59:03 +05:30
Amalka Subasinghe
61f8589113 refactored version variables, oauth extension component 2023-05-11 14:38:47 +05:30
Amalka Subasinghe
0bf534689f refactiored device mgt components 2023-05-11 13:29:16 +05:30
Amalka Subasinghe
243a74da8c refactored heart beat, notification logger, identity extensions component 2023-05-11 12:30:03 +05:30
Amalka Subasinghe
75309b8d96 refactored device-mgt extension component 2023-05-11 12:14:29 +05:30
Amalka Subasinghe
0bf6b3899e refactored apimgt extension component 2023-05-11 11:33:09 +05:30
Amalka Subasinghe
d98abb1ddf refactored application mgt component 2023-05-11 11:03:21 +05:30
Amalka Subasinghe
162507ac8b refactored policy mgt component 2023-05-11 10:43:14 +05:30
Amalka Subasinghe
5d5980c720 refactored cert mgt component 2023-05-11 09:51:57 +05:30
Amalka Subasinghe
1d0f27b98e refactored ui request handler component 2023-05-11 09:40:03 +05:30
Amalka Subasinghe
f0380076c1 refactored transport mgt component 2023-05-11 09:31:30 +05:30
Amalka Subasinghe
8e26f3b4dd refactored analytics mgt component 2023-05-11 09:23:38 +05:30
Amalka Subasinghe
7215c2f827 refactored webapp authentication component 2023-05-11 09:14:19 +05:30
Amalka Subasinghe
baf7661e9d refactored task mgt component 2023-05-10 20:08:20 +05:30
Amalka Subasinghe
721de62362 refactored sub type mgt component 2023-05-10 19:55:42 +05:30
Amalka Subasinghe
2caf5a4f28 refactored tenant mgt component 2023-05-10 19:51:16 +05:30
Amalka Subasinghe
e3c4765650 refactored operation mgt component 2023-05-10 19:41:37 +05:30
Amalka Subasinghe
fdedc2b8f4 refactored feature artifact ids and folder names 2023-05-10 19:34:56 +05:30
Amalka Subasinghe
fa2056e9d6 fixed parent artifact id 2023-05-10 11:56:29 +05:30
Amalka Subasinghe
a71abaa6e9 change the group id 2023-05-10 11:53:11 +05:30
Amalka Subasinghe
18c35218fd fixed build issues due to op template feature 2023-05-10 10:47:39 +05:30
bd35583737 Fix device enrolment and syncing with MSSQL db
## Purpose
* Fixes https://roadmap.entgra.net/issues/9859
* Fixes https://roadmap.entgra.net/issues/9892

## Details
* Fix dbscripts to support events and events mapping
* Fix config operation implementation in MSSQL

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/113
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-05-10 04:47:36 +00:00
Charitha Goonetilleke
9159b1105b Merge branch 'master' into feature/operation-template 2023-05-10 04:31:56 +00:00
osh
f425a0c869 Fix cache issue when billing cache is enabled 2023-05-10 11:21:33 +10:00
Thameera
8533542035 Update operation template core changes 2023-05-09 22:46:15 +05:30
Thameera
f92e766856 add version changes and modifications 2023-05-09 21:41:33 +05:30
Thameera
800fa4fb9a add some modifications to operation template 2023-05-09 21:41:33 +05:30
Thameera
7562c1fbf1 Operation Template implementation 2023-05-09 21:41:33 +05:30
Lasantha Dharmakeerthi
dc0f8f9979 Fix web app URL missing issue when editing the web app 2023-05-09 13:35:45 +00:00
Oshani Silva
d7d28b1879 Fix billing issues
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-05-05 07:28:25 +00:00
Nishan Sangeeth
00b2c06ec0 Fix-invite-users-issue
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2023-05-05 07:22:02 +00:00
dilini
d69809b319 Fix : Web-app url not updating 2023-04-27 21:39:13 +05:30
kavindya_devindi
c3abf3d6b7 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core 2023-04-27 17:57:11 +05:30
kavindya_devindi
06ec100ae1 Fix dependency issue in subtype mgt component 2023-04-27 17:52:51 +05:30
pasindu
bb325f7c46 Remove wild card imports 2023-04-27 09:32:04 +05:30
pasindu
6b6b303d87 Create interface for Publlisher rest api services 2023-04-26 23:38:32 +05:30
pasindu
455917f21e Implement method for Https ssl trustmanager and improve exception 2023-04-26 20:43:16 +05:30
pasindu
eb11036b6c Change version snd remove unwanted dependencies 2023-04-26 11:52:36 +05:30
pasindu
2ca425819e Get hardcoded values as constats and fix exception error handling 2023-04-26 09:28:54 +05:30
pasindu
ba5effbf65 Remove unwanted dependencies and minor fixes 2023-04-26 09:28:53 +05:30
pasindu
9ced84a2df Fix scope id issue 2023-04-26 09:28:53 +05:30
pasindu
50fbb5120a Minor fixes 2023-04-26 09:28:53 +05:30
pasindu
07c157e9d6 Fix URL Generation, Make feature, Refactor the module 2023-04-26 09:28:53 +05:30
pasindu
34ae40e233 Code format fixes 2023-04-26 09:28:53 +05:30
pasindu
aab94d8fdd Implement get scopesID API call and rename the module 2023-04-26 09:28:53 +05:30
pasindu
e920df6da3 Minor changes 2023-04-26 09:28:53 +05:30
pasindu
0d70576401 change http client to okhttp 2023-04-26 09:28:53 +05:30
pasindu
f1120baec3 Implement exception handling 2023-04-26 09:28:53 +05:30
pasindu
8e4998ede8 Test okhttp 2023-04-26 09:28:53 +05:30
pasindu
a9bb2fcb93 Use apache http client 2023-04-26 09:28:53 +05:30
pasindu
ac834d0359 Automated api calls with http client 2023-04-26 09:28:53 +05:30
builder
fa7ee67aed [maven-release-plugin] prepare for next development iteration 2023-04-26 09:20:38 +05:30
builder
71007cc03c [maven-release-plugin] prepare release v5.0.25 2023-04-26 09:20:33 +05:30
Kavindya Devindi
47990e4a16 Add subtype-mgt feature (#74)
## Purpose

To seperate out component with main generic things of subtype management.

## Goals

This subtype-mgt component enables the dynamic implementation of any subtypes using APIs. PFA

## Approach

* Add generic methods to subtype management component.
* Add cacheloader mechanism to optimum data loading part.
* Add unit test cases for all subtype's methods.

## Documentation
Requirement & Design Approach of Subtype Management ->
https://docs.google.com/document/d/1Cp7LqFKuV2FZOhN-cOCveLYcjyrzbZTDA0gNPYuV918/edit?usp=sharing

## Automation tests
 - Unit tests
    - service test
    - service negative test
    - DAO test
    - DAO negative test

 - Integration tests
   > N/A

## Security checks
> N/A

## Related MRs
> N/A

## Test environment
Linux 22.04

## Learning
> N/A

Co-authored-by: kavindya_devindi <kavindyadevindi038@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/74
Co-authored-by: Kavindya Devindi <kavindya@entgra.io>
Co-committed-by: Kavindya Devindi <kavindya@entgra.io>
2023-04-25 08:25:27 +00:00
kavindya_devindi
129d49e897 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core 2023-04-25 13:47:23 +05:30
Sasini Sandamali
7324acb8d3 Add API doc while publishing APIs (#79)
Co-authored-by: Sasini_Sandamali <sasini@entgra.io>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/79
Co-authored-by: Sasini Sandamali <sasini@entgra.io>
Co-committed-by: Sasini Sandamali <sasini@entgra.io>
2023-04-25 08:15:47 +00:00
102d70253a Merge branch 'master' into issue-9736-2 2023-04-25 07:57:43 +00:00
36bae5e3c1 Fix geofences not loading with MSSQL db (#75)
## Purpose
* Fixes https://roadmap.entgra.net/issues/9987

## Description
* Fix geofences page not loading when starting the pack with MSSQL databases.

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/75
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-04-25 07:54:05 +00:00
27cceecd33 Fix device enrolment using MSSQL as database (#72)
## Purpose
* Fixes https://roadmap.entgra.net/issues/9859

## Description
* Fix device enrolment using MSSQL as database
* Fix test case failures of database engine getting a null value

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/72
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-04-25 07:50:37 +00:00
Charitha Goonetilleke
7a2827e73a Merge branch 'master' into master 2023-04-24 11:22:21 +00:00
Amalka Subasinghe
290dcf61ae change format of device scope 2023-04-21 22:36:45 +05:30
Amalka Subasinghe
3b7544770d avoid replacing _ in device types 2023-04-21 22:31:45 +05:30
dilini
ee64c3edca Fix : Custom app update permission issue 2023-04-21 08:43:39 +05:30
Lasantha Dharmakeerthi
c566d95f77 Add tenant-mgt component 2023-04-19 08:50:20 +00:00
rajitha
e383f3b456 Refactor code 2023-04-19 14:14:44 +05:30
a668d3e364 Fix issue with Nginx not recognizing the SCEP client certificate (#105)
Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/105
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Co-committed-by: Pahansith Gunathilake <pahansith@entgra.io>
2023-04-19 06:46:09 +00:00
kavindya_devindi
03110f1eba Bump new versions for device subtype 2023-04-19 11:24:43 +05:30
kavindya_devindi
ed81c55380 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core 2023-04-19 09:49:19 +05:30
kavindya_devindi
93ad9a3fd0 change subtype id as String field & add review changes 2023-04-19 09:38:39 +05:30
rajitha
9c9c391fd4 Code refactor 2023-04-18 15:51:02 +05:30
rajitha
4c2a02fdf0 Add license 2023-04-18 15:40:28 +05:30
rajitha
c33f402fd1 Fix bundling issues 2023-04-18 15:34:07 +05:30
rajitha
64d194bfea add tenant-mgt module 2023-04-18 12:31:09 +05:30
0171cb47e8 Merge branch 'master' into mutual-tls-auth 2023-04-17 11:03:06 +00:00
builder
3238e78f0c [maven-release-plugin] prepare for next development iteration 2023-04-11 21:09:57 +05:30
builder
6d43a16ab2 [maven-release-plugin] prepare release v5.0.24 2023-04-11 21:09:47 +05:30
shamalka
994f49db16 Add missing db scripts 2023-04-11 11:06:58 +05:30
builder
b75cabfce7 [maven-release-plugin] prepare for next development iteration 2023-04-10 21:20:03 +05:30
builder
c8e176c930 [maven-release-plugin] prepare release v5.0.23 2023-04-10 21:19:54 +05:30
Lasantha Dharmakeerthi
f06a27c46e Add try it now feature (#99)
Co-authored-by: Dharmakeerthi Lasantha <tcdlpds@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/99
Co-authored-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
Co-committed-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
2023-04-10 14:55:07 +00:00
Lasantha Dharmakeerthi
63889f4e05 Fix default theme loading issue (#98)
Co-authored-by: Dharmakeerthi Lasantha <tcdlpds@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/98
Co-authored-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
Co-committed-by: Lasantha Dharmakeerthi <lasantha@entgra.io>
2023-04-10 06:23:40 +00:00
b4d5babd93 Add user log context to user handler (#97)
Co-authored-by: pramilaniroshan <pramila@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/97
Co-authored-by: Pramila Niroshan <pramila@entgra.io>
Co-committed-by: Pramila Niroshan <pramila@entgra.io>
2023-04-10 05:37:19 +00:00
inoshperera
eff20c7d33 Add SCEP support
fixes https://roadmap.entgra.net/issues/10042
2023-04-09 11:50:14 +05:30
Thashmi-nil
e2d95f76ba Fix chat history persisting issue 2023-04-08 00:17:49 +05:30
builder
dda5860e57 [maven-release-plugin] prepare for next development iteration 2023-04-07 15:33:50 +05:30
builder
abb66486d8 [maven-release-plugin] prepare release v5.0.22 2023-04-07 15:33:43 +05:30
ebc0f532f6 Merge branch 'master' into fix/qr-gen 2023-04-07 09:45:58 +00:00
navodzoysa
dab2a5ded7 Check tenant IDs of cached queries before sending to Grafana 2023-04-07 15:00:15 +05:30
Lasantha Dharmakeerthi
b53bfdf780 Add offset and limit when querying policies from DAO layer 2023-04-07 09:06:51 +00:00
Sanjana Rajapakshe
4d97a6ee14 Fix on API response messages (#50)
Co-authored-by: Thashmi-nil <nilupuleethash765@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/50
Co-authored-by: Sanjana Rajapakshe <sanjana@entgra.io>
Co-committed-by: Sanjana Rajapakshe <sanjana@entgra.io>
2023-04-07 09:04:49 +00:00
Shamalka Navod
fbbd07d262 Restructure Traccar integration on device management (#81)
Co-authored-by: shamalka <shamalkanavod95@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/81
Co-authored-by: Shamalka Navod <shamalka@entgra.io>
Co-committed-by: Shamalka Navod <shamalka@entgra.io>
2023-04-06 05:14:02 +00:00
navodzoysa
708d6be59d Add offset and limit when querying policies from DAO layer 2023-04-05 13:28:21 +05:30
builder
f5ef8bafd6 [maven-release-plugin] prepare for next development iteration 2023-04-04 11:40:46 +05:30
builder
5720651046 [maven-release-plugin] prepare release v5.0.21 2023-04-04 11:40:39 +05:30
osh
95d4afbc3b Fix PR comments 2023-04-04 11:02:47 +05:30
osh
ad7466ee1e Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into pr/feature/whitelabel 2023-04-03 10:27:11 +05:30
Lasantha Dharmakeerthi
c8c18c4f3d Fix policy bundle repeating issue 2023-03-31 03:35:46 +00:00
Thashmi-nil
19750486de Add improvements 2023-03-30 23:20:15 +05:30
osh
35a09566e4 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into pr/feature/whitelabel 2023-03-30 15:12:52 +05:30
Amalka Subasinghe
5da3df3984 fixed template location 2023-03-29 22:56:22 +05:30
Amalka Subasinghe
766606f9f7 added analytics extension to persist event streams,receivers,publishers 2023-03-29 22:50:08 +05:30
osh
9b9defed19 Resolve conflicts 2023-03-29 18:18:46 +05:30
osh
c4e08362ff Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into self-guiding-ui-9939 2023-03-29 07:59:37 +05:30
osh
5275bb180e Change config implementation
fixes https://roadmap.entgra.net/issues/9939
2023-03-29 07:59:25 +05:30
Charitha Goonetilleke
802922022b Merge branch 'master' into master 2023-03-28 15:31:17 +00:00
osh
7747d7b425 Update status history path 2023-03-28 16:40:10 +05:30
osh
d2bc463284 Resolve comments
fixes http://roadmap.entgra.net/issues/9939
2023-03-28 12:34:11 +05:30
osh
0f28d318ed Remove unwanted code
fixes http://roadmap.entgra.net/issues/9939
2023-03-27 20:09:04 +05:30
osh
6962e94d44 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into self-guiding-ui-9939 2023-03-27 19:47:06 +05:30
osh
f89e71d4bf Reuse email implementation
fixes http://roadmap.entgra.net/issues/9939
2023-03-27 19:46:51 +05:30
Lasantha Dharmakeerthi
65c93aea81 Add improvements for chat feature 2023-03-27 11:16:07 +00:00
Thashmi-nil
3d8f704699 Add license 2023-03-27 15:55:54 +05:30
Amalka Subasinghe
4dac92b260 fixed adding operation and operation response paths with emqx integration 2023-03-27 15:05:57 +05:30
Thashmi-nil
798e851922 Add modifications 2023-03-27 08:24:05 +05:30
rajitha
4f7b317761 Add functionality to mark previous policy bundles as repeated 2023-03-24 14:11:05 +05:30
cad2468b3d Fix osgi import package error 2023-03-24 12:07:56 +05:30
osh
24064b650b Resolve conflict 2023-03-24 12:35:58 +11:00
kavindya_devindi
9ab437a324 remove power meter related things 2023-03-23 08:00:55 +05:30
Thashmi-nil
2d1879d1b6 Changes on reviews 2023-03-22 22:04:03 +05:30
7441e57d36 Refactor log context name 2023-03-22 12:39:18 +05:30
4005a9e8cb User log context added 2023-03-22 12:37:59 +05:30
b99587f1df Remove test cases 2023-03-22 12:34:54 +05:30
950f67da5f Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into entgra-logger
# Conflicts:
#	components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
#	pom.xml
2023-03-22 07:02:16 +05:30
Amalka Subasinghe
98baaf8fc1 added entgra licence 2023-03-20 09:50:55 +05:30
Amalka Subasinghe
78dd331306 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core 2023-03-20 09:25:46 +05:30
Amalka Subasinghe
6c1b224b89 fixing formatting and licence headers 2023-03-18 12:32:34 +05:30
Charitha Goonetilleke
79b84aa191 Merge remote-tracking branch 'origin/master' 2023-03-18 12:24:00 +05:30
Charitha Goonetilleke
c78abf0564 Remove unnecessary logs 2023-03-18 12:23:50 +05:30
Amalka Subasinghe
44b5b4f44d fixing invalid attribute 2023-03-18 12:20:44 +05:30
Amalka Subasinghe
d3ffba8e26 improve device type configuring and event data publishing 2023-03-18 01:48:21 +05:30
Amalka Subasinghe
bf8efa35a7 updated keymgt extensions to support validity period 2023-03-18 01:45:17 +05:30
builder
4d8d4bdcf7 [maven-release-plugin] prepare for next development iteration 2023-03-17 17:23:59 +05:30
builder
1b363c0978 [maven-release-plugin] prepare release v5.0.20 2023-03-17 17:23:51 +05:30
Charitha Goonetilleke
204ba91010 Remove unnecessary logs 2023-03-17 16:20:57 +05:30
osh
5dab9433a4 Update email subject
fixes https://roadmap.entgra.net/issues/9939
2023-03-17 03:34:18 +05:30
Thashmi-nil
0f6db69c18 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into live-chat-feature 2023-03-13 00:25:02 +05:30
Thashmi-nil
74f50b28c5 Add user identification improvement 2023-03-12 23:27:43 +05:30
osh
0bbcac4a93 Add enrollment guide permissions
fixes https://roadmap.entgra.net/issues/9939
2023-03-10 09:11:40 +05:30