Commit Graph

46 Commits

Author SHA1 Message Date
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
Dharmakeerthi Lasantha
ac3e144437 Fix OSGI service unbinding issue 2023-07-25 17:33:02 +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
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
3dc567fcfe Fix transaction initiating issue 2023-07-25 17:19:22 +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
prathabanKavin
5a8bcf6711 Add device enrolment log for modifyenrolment 2023-07-25 17:09:26 +05:30
e979130e55 Fix missing imports 2023-07-25 17:09:24 +05:30
inoshperera
a603a69f3e OTP for enrollment with Mutual TLS
Fixes https://roadmap.entgra.net/issues/10093
2023-07-25 16:46:18 +05:30
Oshani Silva
8b928a4aca Remove unwanted check in billing logic
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-07-25 16:30:50 +05:30
builder
48801a3b8e [maven-release-plugin] prepare for next development iteration 2023-07-25 16:28:51 +05:30
builder
4c1963a32b [maven-release-plugin] prepare release v5.0.26 2023-07-25 16:28:51 +05:30
ThilinaPremachandra
ae13169377 add rollback 2023-07-25 16:28:51 +05:30
ThilinaPremachandra
4a239887cb add try with resources 2023-07-25 16:28:49 +05:30
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
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
Amalka Subasinghe
46ee81e78d updated from master 2023-06-12 12:19:20 +05:30
8c7412a2f9 Merge branch 'master' into search-10113 2023-06-09 05:07:31 +00:00
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
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
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
prathabanKavin
bd5776947d Fix issue with delete geofences with mssql db 2023-05-31 21:45:31 +05:30
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
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
osh
2b72f4890b Add by serial number in store 2023-05-23 23:16:55 +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
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