Commit Graph

5728 Commits

Author SHA1 Message Date
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
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
ThilinaPremachandra
253dc03233 fix: deleted roles removing issue 2023-07-06 20:38:06 +05:30
ThilinaPremachandra
907043fd91 Merge branch 'master' 2023-07-06 09:56:47 +05:30
ThilinaPremachandra
6c645db486 add: proper msg for group delete 2023-07-05 11:54:12 +05:30
rajitha
5818a5eaed Fix transaction initiating issue 2023-07-04 18:37: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
navodzoysa
8d9e3c8f51 Remove reserved_user when fetching users 2023-06-29 00:34:09 +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
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
763cd7df25 Fix missing imports 2023-06-26 13:43:13 +05:30
92d7f5b61f Resolve Conflicts 2023-06-26 13:31:39 +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
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
navodzoysa
00bd74734a Remove apim_reserved_user when fetching users 2023-06-22 19:38:33 +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
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
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
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
ThilinaPremachandra
acd3039c65 pom.xml updated by pull 2023-06-09 18:34:52 +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
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
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
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
713759f3f7 Update copyright 2023-05-26 23:58:39 +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
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
Amalka Subasinghe
951dde2a31 fixed build issues after restucturing 2023-05-12 21:51:36 +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
f0380076c1 refactored transport mgt component 2023-05-11 09:31:30 +05:30
Amalka Subasinghe
baf7661e9d refactored task mgt component 2023-05-10 20:08:20 +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
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
osh
f425a0c869 Fix cache issue when billing cache is enabled 2023-05-10 11:21:33 +10: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
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
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
rajitha
e383f3b456 Refactor code 2023-04-19 14:14:44 +05:30
rajitha
64d194bfea add tenant-mgt module 2023-04-18 12:31:09 +05:30
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
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
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
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
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
osh
24064b650b Resolve conflict 2023-03-24 12:35:58 +11:00
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
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
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
osh
79a2d573fa Fix build failure
fixes https://roadmap.entgra.net/issues/9939
2023-03-09 11:58:09 +05:30
osh
36052663ba Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core 2023-03-05 14:49:52 +05:30
osh
66afe95fe9 Add api for self guide enrollment
fixes https://roadmap.entgra.net/issues/9939
2023-03-05 14:49:34 +05:30
Charitha Goonetilleke
1db4b4095e Enhance dynamic task watcher functionality 2023-02-23 13:00:52 +05:30
Charitha Goonetilleke
78f8e80718 Enhance dynamic task execution functionality 2023-02-21 22:23:10 +05:30
Charitha Goonetilleke
17f28c8b55 Suppress unnecessary logs 2023-02-20 03:41:07 +05:30
builder
2d56b0ea9a [maven-release-plugin] prepare for next development iteration 2023-02-16 21:01:29 +05:30
builder
73d17e61a8 [maven-release-plugin] prepare release v5.0.19 2023-02-16 21:01:22 +05:30
Thashmi-nil
9c3020fc77 Add improvements for chat feature 2023-02-16 13:37:19 +05:30
builder
d715609b53 [maven-release-plugin] prepare for next development iteration 2023-02-11 23:48:28 +05:30
builder
0beeedef43 [maven-release-plugin] prepare release v5.0.18 2023-02-11 23:48:21 +05:30
5228a84400 Revert "Change the device status and see the device status lifecycle history (#58)"
This reverts commit 7f327bac08.
2023-02-10 17:53:05 +05:30
builder
9f724eeffb [maven-release-plugin] prepare for next development iteration 2023-02-09 22:41:22 +05:30
builder
50bc5560f8 [maven-release-plugin] prepare release v5.0.17 2023-02-09 22:41:16 +05:30
846d7a0f59 Add support to perform group operations (#59)
## Purpose
* Fixes https://roadmap.entgra.net/issues/8916

## Description
* Created a new API to check whether groups has relevant(Android, iOS, Windows) device types.

Co-authored-by: Arshana <arshana790@gmail.com>
Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/59
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-02-08 11:17:02 +00:00
7f327bac08 Change the device status and see the device status lifecycle history (#58)
## Purpose
* Fixes https://roadmap.entgra.net/issues/9266

## Feature
* Change device's status and view device's status life-cycle history

## Approach
* Created a API for change status and store changed status in to database.
* Created another API to view the device's life-cycle status history.
* lifecycle of the status is as shown in the diagram.
* lifecycle Status are taken from a xml file.

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/58
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-02-07 06:52:04 +00:00
9401a4501b Add Entgra Device Notification Feature 2023-02-06 16:01:24 +05:30
db624d26df Add Entgra Device Notification Logger 2023-02-06 11:06:05 +05:30
Rushdi
5cf7377a85 Update sendDeviceNameChangedNotification 2023-01-30 13:05:55 +05:30
builder
071b9486bb [maven-release-plugin] prepare for next development iteration 2023-01-27 19:20:14 +05:30
builder
cf305362b4 [maven-release-plugin] prepare release v5.0.16 2023-01-27 19:20:08 +05:30
9ef3e0cf6e Revert "Change the device status and see the device status lifecycle history"
This reverts commit df6a8e20a3.
2023-01-26 22:22:20 +05:30
86f709a74a Revert "Fix api errors in Lifecycle methods"
This reverts commit d69619bf65.
2023-01-26 22:21:24 +05:30
Rushdi Mohamed
a7cf4fa86c Add pagination sort by column (#48)
## Purpose

Fixes [issues/9743](https://roadmap.entgra.net/issues/9743)

## Improvement

Sort in ASC OR DESC on pagination requested by column name

Co-authored-by: Rushdi <rushdi@entgra.io>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/48
Co-authored-by: Rushdi Mohamed <rushdi@entgra.io>
Co-committed-by: Rushdi Mohamed <rushdi@entgra.io>
2023-01-26 14:34:24 +00:00
prathabanKavin
d69619bf65 Fix api errors in Lifecycle methods 2023-01-26 09:25:34 +00:00
2580add403 Merge branch 'master' into android-feature 2023-01-26 08:24:21 +00:00
osh
a5177208f8 Add icon and resolve bug
fixes https://roadmap.entgra.net/issues/9274
2023-01-25 19:18:33 +05:30
prathabanKavin
df6a8e20a3 Change the device status and see the device status lifecycle history 2023-01-24 11:46:57 +05:30
0f8c3e22e6 Merge branch 'master' into android-feature 2023-01-23 14:25:16 +00:00
osh
21669f8dba Resolve conflicts
fixes https://roadmap.entgra.net/issues/9274
2023-01-17 21:19:35 +05:30
Dharmakeerthi Lasantha
01aaa44e89 improve OTP mgt service functionalities 2023-01-11 23:51:08 +05:30
Lasantha Dharmakeerthi
c03e1359d3 Add download URL generating method 2023-01-09 14:22:51 +00:00
Dharmakeerthi Lasantha
d55ea733e7 Add download URL generating method 2023-01-09 19:50:35 +05:30
Oshani Silva
a93f534e06 Improve billing feature
Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>
2023-01-04 21:03:15 +00:00
builder
1b2bddb167 [maven-release-plugin] prepare for next development iteration 2022-12-17 11:54:16 +05:30
builder
fb4e20490a [maven-release-plugin] prepare release v5.0.15 2022-12-17 11:54:10 +05:30
ThilinaPremachandra
1bea33b259 fixed ownership validation issue 2022-12-15 13:36:37 +05:30
ThilinaPremachandra
e4bc9f87f8 fixed the validation issue 2022-12-15 01:05:07 +05:30
shamalka
0712cd744a Remove unwanted lines 2022-12-13 13:51:32 +05:30
shamalka
184716b17a Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into HEAD 2022-12-13 12:12:08 +05:30
shamalka
9a5322845f Change otp api to return token 2022-12-13 10:56:23 +05:30
navodzoysa
a367cd6b35 Fix duplicate group and role error handling responses 2022-12-12 13:44:27 +05:30
builder
9d3e5fbc3a [maven-release-plugin] prepare for next development iteration 2022-11-25 18:02:39 +05:30
builder
744881d21e [maven-release-plugin] prepare release v5.0.14 2022-11-25 18:02:07 +05:30
Deenath Geeganage
7e914aeafd Device names in endpoint-mgt and traccar are not consistent - Fix (#21)
Fix: [https://roadmap.entgra.net/issues/9656](https://roadmap.entgra.net/issues/9656)

When renaming an agent, the update wasn't send to the traccar server.
Added new methods and combined it with existing agent modification code

Co-authored-by: Deenath Geegange <deenathgeeganage@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/21
Co-authored-by: Deenath  Geeganage <deenathgeeganage@gmail.com>
Co-committed-by: Deenath  Geeganage <deenathgeeganage@gmail.com>
2022-11-25 11:59:56 +00:00
a86da84b6f Merge branch 'master' into traccar-fix 2022-11-25 04:03:41 +00:00
Pahansith Gunathilake
7c2b4bd687 Fix group delete 2022-11-25 09:31:57 +05:30
navodzoysa
93684174d4 Update traccar configuration 2022-11-24 20:24:33 +05:30
Pahansith Gunathilake
e5d7512d0a fix traccar nullpointer error 2022-11-24 18:26:18 +05:30
Vigneshan
17638029d3 Fix group update issue 2022-11-24 10:34:58 +00:00
Arshana
777940b896 Fix SendDeviceNameChangedNotification 2022-11-24 13:23:46 +05:30
Arshana
5e612ceaf2 Add capability to send a notification when device rename 2022-11-23 00:00:52 +05:30
builder
b18ddfedce [maven-release-plugin] prepare for next development iteration 2022-11-15 09:29:05 +05:30
builder
ec8d08ca63 [maven-release-plugin] prepare release v5.0.13 2022-11-15 09:29:00 +05:30
builder
b9f2bf9246 [maven-release-plugin] prepare for next development iteration 2022-11-11 01:43:26 +05:30
builder
8f610eea63 [maven-release-plugin] prepare release v5.0.12 2022-11-11 01:42:41 +05:30
Dharmakeerthi Lasantha
388ae39fef Add device mgt denying exception class 2022-11-10 19:48:28 +00:00
Shamalka Navod
df5cdb5240 Fix traccar issues (#5)
* Fix traccar client thredpool issue
* Refactor traccar implementation
* Fix traccar loading issue

Co-authored-by: shamalka <shamalkanavod95@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/5
Co-authored-by: Shamalka Navod <shamalka@entgra.io>
Co-committed-by: Shamalka Navod <shamalka@entgra.io>
2022-11-10 15:36:55 +00:00
Pahansith Gunathilake
3332d8e85e Merge branch 'swagger-fix' into 'master'
Swagger fix

See merge request entgra/carbon-device-mgt!921
2022-10-12 13:26:53 +00:00
Shamalka Navod
3384b597f9 Improve device name search 2022-10-05 18:10:49 +00:00
Kavindya Sathsarani
bb5f779c26 Add a searchable input for App Restriction Settings policy 2022-10-04 09:37:45 +00:00
kavindyaS007
92f2a6f50d improvements in policy ui 2022-09-28 13:08:31 +05:30
inoshperera
c14047f913 Fix issues in the swagger related to URLs 2022-09-28 11:13:00 +05:30
inoshperera
259795a274 fix swagger syntax issues 2022-09-20 22:09:41 +05:30
builder
223637c887 [maven-release-plugin] prepare for next development iteration 2022-09-14 20:25:10 +05:30
builder
b7311af447 [maven-release-plugin] prepare release v5.0.11 2022-09-14 20:25:02 +05:30
Amalka Subasinghe
5f1271db93 Fixes related to publishing ws api and routing requests 2022-09-12 06:03:21 +00:00
shamalka
eaad94b3e9 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-09-02 00:33:35 +05:30
shamalka
83be953583 Fix issues 2022-09-02 00:33:22 +05:30
Pahansith Gunathilake
fef1d41d39 Merge branch 'ldap-fixes' into 'master'
Add optional user store domain query param to user APIs

See merge request entgra/carbon-device-mgt!892
2022-09-01 18:15:58 +00:00
Oshani Silva
cc98f6a881 Update config files to fix billing UI isssues 2022-09-01 09:15:50 +00:00
shamalka
d61814329c Revert global exception msg 2022-09-01 11:03:45 +05:30
Rushdi
df60140f9c Remove unwanted codelines and handle exceptions 2022-08-31 20:38:33 +05:30
Rushdi
ce0d0a1903 revert changes 2022-08-31 16:07:34 +05:30
shamalka
c68478daca Fix formatting issues 2022-08-30 09:10:20 +05:30
shamalka
642067b146 Remove wildcard imports 2022-08-29 17:17:43 +05:30
shamalka
c312e69bf4 Revert unwanted change 2022-08-29 17:14:10 +05:30
shamalka
b311908d47 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-29 17:09:05 +05:30
shamalka
31bb87db41 Add missing error logs and fix formatting issues 2022-08-29 17:07:49 +05:30
Pahansith Gunathilake
6962e42ca8 Merge branch 'fix-groupnames' into 'master'
Fix group names being able to be duplicated when renaming

See merge request entgra/carbon-device-mgt!907
2022-08-25 13:40:55 +00:00
Pahansith Gunathilake
a50d37bbf2 Merge branch 'support-4.1.15' into 'master'
Add Windows app uninstallation feature

See merge request entgra/carbon-device-mgt!904
2022-08-25 10:41:14 +00:00
shamalka
5ff9ef7782 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into traccar 2022-08-23 16:00:16 +05:30
Rushdi
29a2713af0 update the traccar-config.xml on test 2022-08-16 10:26:58 +05:30
navodzoysa
6b6e9ba640 Fix group names being able to be duplicated when renaming 2022-08-03 15:07:26 +05:30
navodzoysa
6a62546440 Add optional user domain query param to user APIs 2022-08-01 20:06:51 +05:30
builder
3c9fc68619 [maven-release-plugin] prepare for next development iteration 2022-07-18 23:07:51 +05:30
builder
0b4fe08847 [maven-release-plugin] prepare release v5.0.10 2022-07-18 23:07:47 +05:30
builder
0290758c25 [maven-release-plugin] prepare for next development iteration 2022-07-12 01:22:56 +05:30
builder
790ab62b34 [maven-release-plugin] prepare release v5.0.9 2022-07-12 01:22:51 +05:30
navodzoysa
c8527bd08b Add Windows app uninstallation feature 2022-07-04 12:15:43 +05:30
builder
7f96ce3c33 [maven-release-plugin] prepare for next development iteration 2022-06-27 19:20:21 +05:30
builder
e851e21bcd [maven-release-plugin] prepare release v5.0.8 2022-06-27 19:19:48 +05:30
Vigneshan
c974c4a0f0 Fix admin role not assigned issue during admin user creation 2022-06-16 13:53:07 +05:30
Rushdi
120c1150ce fix traccar speed measure on kmh 2022-06-13 12:14:22 +05:30
Mohamed Rashd
af25528a8b Delete custom whitelabel favicon and logo on whitelabel reset 2022-06-10 14:48:16 +05:30
Rushdi
6f79180920 removed unwanted codes 2022-06-09 17:40:09 +05:30
Mohamed Rashd
c63168be62 Fix passing favicon image bean when retrieving existing logo 2022-06-09 17:00:52 +05:30
Rushdi
e88d5e9c3b Add traccar configuration on p2.inf and updated mysql.sql 2022-06-09 01:28:17 +05:30
Mohamed Rashd
be15bf9185 Fix log message 2022-06-08 13:45:08 +05:30
Mohamed Rashd
eb061f9450 Refator page tite to app title 2022-06-08 13:40:33 +05:30
Mohamed Rashd
78546125bc Add page title to whitelable 2022-06-08 00:03:37 +05:30
Mohamed Rashd
7df4aff569 Fix retrieving favicon as logo when retrieving existing images for rollback 2022-06-07 13:32:42 +05:30
Mohamed Rashd
743a12083b Refactor whitelabel update api method name to update from create 2022-06-07 09:34:16 +05:30
Rushdi
ab332e20ed Fix platform configuration for traccar 2022-06-03 16:11:18 +05:30