community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,593 Commits 31 Branches 461 Tags 183 MiB
e1519fa2a8
Commit Graph

8252 Commits

Author SHA1 Message Date
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
Pahansith Gunathilake
102d70253a Merge branch 'master' into issue-9736-2 2023-04-25 07:57:43 +00:00
Kavin Prathaban
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
Kavin Prathaban
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
Pahansith Gunathilake
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
Pahansith Gunathilake
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
Pramila Niroshan
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
Pahansith Gunathilake
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
pramilaniroshan
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
pramilaniroshan
7441e57d36 Refactor log context name 2023-03-22 12:39:18 +05:30
pramilaniroshan
4005a9e8cb User log context added 2023-03-22 12:37:59 +05:30
pramilaniroshan
b99587f1df Remove test cases 2023-03-22 12:34:54 +05:30
pramilaniroshan
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
osh
79a2d573fa Fix build failure 
fixes https://roadmap.entgra.net/issues/9939
 2023-03-09 11:58:09 +05:30
kavindya_devindi
680992f88c Update license headers 2023-03-08 10:37:56 +05:30
kavindya_devindi
338d0973e9 Add subtype-mgt feature 2023-03-08 07:36:58 +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
0009bdd460 Merge remote-tracking branch 'origin/master' 2023-02-24 23:41:56 +05:30
Charitha Goonetilleke
ce20ead035 Fix issues with task id getting null 2023-02-24 23:41:46 +05:30
Charitha Goonetilleke
0a9b20e0fc Fix issues with unnecessary task deletion 2023-02-24 17:29:50 +05:30
Inosh Perara
b51a608a41 Merge pull request 'Add fix to load apps and create app' (#68) from prathabanKavin/device-mgt-core:mssqlcreateappfix into master 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/68
 2023-02-24 04:45:52 +00:00
Charitha Goonetilleke
1db4b4095e Enhance dynamic task watcher functionality 2023-02-23 13:00:52 +05:30
prathabanKavin
fb3797774e Add fix to load apps and create app 2023-02-23 00:41:02 +05:30
Charitha Goonetilleke
78f8e80718 Enhance dynamic task execution functionality 2023-02-21 22:23:10 +05:30
Charitha Goonetilleke
ce0d834b12 Fix NPE 2023-02-20 03:41:19 +05:30
Charitha Goonetilleke
17f28c8b55 Suppress unnecessary logs 2023-02-20 03:41:07 +05:30
Chamindu Senanayake
89e72bdf86 Add dynamic task manager and task watcher (#65) 
## Purpose

To Distribute dynamic task execution in multiple nodes.

## Goals

This allows distribute task execution in multiple nodes. Especially this is useful, when system has multiple nodes

## Approach

- Add task manager to handle dynamic tasks and dynamic task properties while adding   task into the wso2 ntask core.
- Add task watcher to run periodically after iot server start up and compare tasks 	 from Entgra task manager and wso2 ntask core.
- Add configuration to enable task monitoring in task watcher.

## Documentation
> N/A

## Automation tests
 - Unit tests
   > N/A
 - Integration tests
   > N/A

## Security checks
   > N/A

## Related MRs
 > N/A

## Test environment
Linux 22.04

## Learning
> N/A

Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/65
Co-authored-by: Chamindu Senanayake <chamindu@entgra.io>
Co-committed-by: Chamindu Senanayake <chamindu@entgra.io>
 2023-02-18 14:06:02 +00:00
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
Pahansith
9644dda7ef Remove device details loading while processing policies 2023-02-16 10:23:59 +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
Pahansith
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
Kavin Prathaban
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
pramilaniroshan
12b3b1a41d Add missing dependency 2023-02-07 22:08:11 +05:30
Kavin Prathaban
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
pramilaniroshan
9401a4501b Add Entgra Device Notification Feature 2023-02-06 16:01:24 +05:30
pramilaniroshan
db624d26df Add Entgra Device Notification Logger 2023-02-06 11:06:05 +05:30
pramilaniroshan
80458a4b9d Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into entgra-logger 2023-02-02 16:32:53 +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
Pahansith
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
Pahansith
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
Pahansith Gunathilake
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
Pahansith Gunathilake
0f8c3e22e6 Merge branch 'master' into android-feature 2023-01-23 14:25:16 +00:00
pramilaniroshan
d5c709cfc0 Add Entgra Device Notification Logger 2023-01-20 10:32:40 +05:30
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
Ravindu Madhubhashana
e28c71d4ae Added validation for app name length when creating an app 
Co-authored-by: Ravindu Madhubhashana <ravindu.kp@gmail.com>
Co-committed-by: Ravindu Madhubhashana <ravindu.kp@gmail.com>
 2023-01-10 01:12:07 +00:00
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
Vigneshan
338e15f563 Handle null values while fetching default savings goal of users 2022-12-21 10:11:34 +00:00
navodzoysa
b25fb4e6ad Revert direct app publishing merge conflict 2022-12-21 10:26:21 +05:30
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
Pahansith Gunathilake
d5b2d8ac3b Merge branch 'master' into publisher-fix 2022-12-17 06:05:21 +00:00
navodzoysa
472d34dc09 Fix incorrect query param when directly publishing an app 2022-12-16 08:31:22 +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
Amalka Subasinghe
458ab34269 updated EntgraLogger methods (#30) 
Co-authored-by: Amalka Subasinghe <amalkasubasinghe@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/30
Co-authored-by: Amalka Subasinghe <amalka@entgra.io>
Co-committed-by: Amalka Subasinghe <amalka@entgra.io>
 2022-12-12 11:39:01 +00:00
Lasantha Dharmakeerthi
6d72292789 Fix duplicate group and role error handling responses 2022-12-12 08:20:09 +00:00
Kavin Prathaban
71c4e3b4d0 Add fix for error on searching app with AppType with ALL filter 
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
 2022-12-12 08:17:48 +00:00
navodzoysa
a367cd6b35 Fix duplicate group and role error handling responses 2022-12-12 13:44:27 +05:30
navodzoysa
578266a419 Fix error when deleting tags/categories with special characters 2022-12-06 20:11:20 +05:30
shamalka
4e567a0a4f Fix app publishing issue on publisher 2022-12-05 13:16:58 +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
Pahansith Gunathilake
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
Vigneshan
96b07648ca Update token introspection endpoint inside user handler 2022-11-23 16:56:38 +00:00
Vigneshan
1ac460a4fe Fix signature validation issue for jwt token requests 2022-11-23 15:14:24 +00:00
Vigneshan
65d18fd037 Fix invalid admin credentials issue in token endpoint 2022-11-23 09:01:25 +00:00
navodzoysa
a78da4a4a9 Fix build failure 2022-11-23 12:12:10 +05:30
Arshana
5e612ceaf2 Add capability to send a notification when device rename 2022-11-23 00:00:52 +05:30
Vigneshan
d28edf1b88 Modify password and client_credentials grant handling 2022-11-22 16:32:49 +00:00
Vigneshan
5693977b01 Update token api success response status code 2022-11-21 15:12:30 +00:00
Pahansith Gunathilake
1cf14c19f6 Merge branch 'master' into fix/key-mgt-api 2022-11-20 18:50:23 +00:00
Vigneshan
dd553a2326 Improve error handling for token endpoint 2022-11-17 20:47:42 +00:00
Amalka Subasinghe
ec7ebcc384 added device-extensions, logger, default-role-manager, stateengine (#8) 
Co-authored-by: Amalka Subasinghe <amalkasubasinghe@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/8
Co-authored-by: Amalka Subasinghe <amalka@entgra.io>
Co-committed-by: Amalka Subasinghe <amalka@entgra.io>
 2022-11-17 02:04:11 +00:00
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
Vigneshan
0d43e7d6aa Fix dcr and token endpoint related issues 2022-11-14 14:12:58 +00:00
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
Dharmakeerthi Lasantha
d1f41971dd Merge branch 'improvement_policy_ui' into 'master' 
Improve table component structure of the policy config

See merge request entgra/carbon-device-mgt!923
 2022-09-29 03:30:24 +00:00
inoshperera
7235f84c3a Fixes app management related swaggers 2022-09-28 16:20:48 +05:30
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
0fc27682df Test case fix and logs added 
Related to https://gitlab.com/entgra/product-iots/-/issues/1541
 2022-09-27 08:00:40 +05:30
inoshperera
e9cf04551a Fix ios enrolment error 
fixes https://gitlab.com/entgra/product-iots/-/issues/1541
 2022-09-23 06:57:52 +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
d21782160a Merge branch 'dev-1' into 'master' 
Fix validation of appname when a webclip is created

See merge request entgra/carbon-device-mgt!874
 2022-08-25 13:41:54 +00:00
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
Vigneshan
638c6b12c9 Fix cross-tenant api subscription issue 2022-07-23 17:13:11 +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
Vigneshan
ebc5f5de31 Implement multi-tenant api publishing 2022-07-15 11:10: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
Rushdi
9f642701ea fix merge conflicts 2022-05-30 17:33:07 +05:30
Rushdi
f4d0050270 fix removing permission and organizing the code 2022-05-30 15:58:09 +05:30
Rushdi
83651efcb5 Remove unwanted codes 2022-05-30 15:52:21 +05:30
Rushdi
35a5230ef7 Fix admin login to tracker 2022-05-30 15:52:10 +05:30
Rushdi
a521985e98 Update tracker get token api 2022-05-30 15:52:09 +05:30
Rushdi
6b3294bd60 Update tracker get token api 2022-05-30 15:49:32 +05:30
Rushdi
11fa624b39 Add tracker API endpoint to return user token 2022-05-30 15:48:40 +05:30
Rushdi
6ccddf3f4b Update remove permission 2022-05-30 15:48:40 +05:30
Rushdi
6ce4168d75 Update permissions 2022-05-30 15:48:30 +05:30
Rushdi
515e826711 Update with callable thread and add set/remove user permission on enroll/disenroll device 2022-05-30 15:48:29 +05:30
Rushdi
74adeda997 Assign device to user when enrolling a device 2022-05-30 15:45:45 +05:30
Rushdi
2ebc24985a Create user when enrolling device 2022-05-30 15:45:45 +05:30
Rushdi
bd164ea78f fix NullPointerException 2022-05-30 15:45:44 +05:30
Rushdi
5c14315b4a Add JSONException 2022-05-30 15:45:23 +05:30
Rushdi
44ac5c8a8f Fixed the bugs 2022-05-30 15:45:13 +05:30
Rushdi
d1f2bdb296 update the threadpool apporoach/ add traccar devices/groups for existing UEM devices/groups 2022-05-30 15:44:09 +05:30
Rushdi
c3dd560878 Update group add/update/delete and device enroll/disenroll with traccar 2022-05-30 15:43:58 +05:30
Rushdi
9f6eaedbc3 check if location publishing to traccar enable or disabled 2022-05-30 15:39:15 +05:30
Rushdi
53f4fd7ebc Add add/delete a group from traccar 2022-05-30 15:39:03 +05:30
Rushdi
1dd2e35f89 Update traccar cofiguration 2022-05-30 15:38:48 +05:30
Rushdi
2e5a9002da Update traccar configuration 2022-05-30 15:37:24 +05:30
Rushdi
c18b3b1c1f Update the code structure 2022-05-30 15:36:59 +05:30
Rushdi
4e3567202d Update with okhttclient pool and threading 2022-05-30 15:36:59 +05:30
Rushdi
8d99123ec1 Update with Traccar Dis-Enrolling a Device via UEM 2022-05-30 15:36:58 +05:30
Rushdi
c4d75234b0 Initiate traccar to locate the geo locations in the map 2022-05-30 15:36:58 +05:30
Mohamed Rashd
b8a0ffe7c0 Improve favicon/logo response content type handling 2022-05-26 04:16:57 +05:30
Mohamed Rashd
460675fcad Fix favicon/logo response content type 2022-05-26 03:35:57 +05:30
Mohamed Rashd
5677e1e3fe Better feedback message/log if favicon/logo white label images not found 2022-05-24 21:13:26 +05:30
Mohamed Rashd
ed9ec69509 Move metadata and whitelabel config classes to metadata.mgt package 2022-05-24 21:10:49 +05:30
Mohamed Rashd
1559af9660 Adress feedback 
Add missing licenses
 2022-05-24 20:59:21 +05:30
Mohamed Rashd
1d84adbb4f Add java doc comment 
Fix adding default white label on tenant create
Add whitelabel logo and favicon apis as non secured endpoints
Fix License
 2022-05-21 10:44:06 +05:30
Mohamed Rashd
7907a1c5ff Add tenant whitelabeling api 
Make whitelabel favion and logo api public
Refactor whitelabeling feature in separate classes
 2022-05-21 10:41:56 +05:30
builder
8636767cba [maven-release-plugin] prepare for next development iteration 2022-05-10 01:41:05 +05:30
builder
9af9bea2b6 [maven-release-plugin] prepare release v5.0.7 2022-05-10 01:41:01 +05:30
Pahansith Gunathilake
a7a567c971 Fix parse pom 2022-05-09 19:59:31 +00:00
Pahansith Gunathilake
7a250b9d11 Fix issue in parsing pom.xml in APIM keymgt module 2022-05-09 23:45:42 +05:30
Pahansith Gunathilake
d1754b465e Merge branch 'fix/permissions' into 'master' 
Fix identity server connect permission

See merge request entgra/carbon-device-mgt!887
 2022-05-09 04:36:44 +00:00
Pahansith Gunathilake
075b9be096 Merge branch 'fix/application/by/uuid/isFavourite' into 'master' 
Fix favorite application bean issue

See merge request entgra/carbon-device-mgt!888
 2022-05-09 04:36:30 +00:00
Pahansith Gunathilake
4d76be36de Merge branch 'user-store' into 'master' 
Add new API to fetch userstores

See merge request entgra/carbon-device-mgt!884
 2022-05-08 19:04:45 +00:00
navodzoysa
b62b4aebc3 Add new API to fetch userstores 2022-05-08 22:09:08 +05:30
Pahansith Gunathilake
b894d371fb Merge branch 'master' into 'master' 
Implement api keymgt extension

See merge request entgra/carbon-device-mgt!890
 2022-05-02 06:26:31 +00:00
Vigneshan
2e8d1fabf0 Implement api keymgt extension 2022-05-02 11:34:45 +05:30
Pahansith Gunathilake
47fb2c77f5 Merge branch 'billing-api-1226' into 'master' 
Adding the new billing API

See merge request entgra/carbon-device-mgt!848
 2022-05-02 06:04:00 +00:00
Mohamed Rashd
a98e1e4b24 Improve logging message 2022-04-29 17:53:42 +05:30
Mohamed Rashd
3b3c89849e Fix favourite flag being always false when getting application by uuid 2022-04-28 16:18:09 +05:30
builder
817dc57862 [maven-release-plugin] prepare for next development iteration 2022-04-26 06:12:00 +00:00
builder
7196d2daea [maven-release-plugin] prepare release v5.0.6 2022-04-26 06:11:55 +00:00
Mohamed Rashd
ab053807b3 Fix application managment test 2022-04-26 11:10:42 +05:30
Mohamed Rashd
75f825a713 Fix dbscript syntax 2022-04-25 16:01:44 +05:30
Pahansith Gunathilake
331ccf4710 Merge branch 'fix/wrong/method/name' into 'master' 
Fix using wrong method name

See merge request entgra/carbon-device-mgt!882
 2022-04-25 08:04:24 +00:00
Pahansith Gunathilake
da509f5c69 Merge branch 'policy-load' into 'master' 
Add new API to fetch UI policy list

See merge request entgra/carbon-device-mgt!881
 2022-04-25 08:04:13 +00:00
Pahansith Gunathilake
19872ea3b5 Merge branch 'windows-fixes' into 'master' 
Temp fix for windows enrollment permission url mismatch

See merge request entgra/carbon-device-mgt!877
 2022-04-25 08:03:46 +00:00
Pahansith Gunathilake
1f641966fe Merge branch 'fix-1290' into 'master' 
Fix API access issues under child tenant

See merge request entgra/carbon-device-mgt!879
 2022-04-25 03:54:00 +00:00
Mohamed Rashd
631851f7e1 Fix using wrong method name 2022-04-19 17:19:10 +05:30
navodzoysa
340be6ed65 Add new API to fetch UI policy list 2022-04-18 22:46:06 +05:30
Mohamed Rashd
c66fa5bd60 Fix application conf error message 2022-04-18 19:06:26 +05:30
Mohamed Rashd
9df320dd3b Resolve merge conflict 2022-04-18 14:30:12 +05:30
Mohamed Rashd
aa2fa45a5f Tempory merge conflict resolution 2022-04-16 00:28:05 +05:30
inoshperera
f233f3d916 Fix API access issues under child tenant 
fixes https://gitlab.com/entgra/product-iots/-/issues/1290
 2022-04-14 13:24:04 +05:30
Mohamed Rashd
41a0c9118a Add java doc comments 
Use try-with resource when using CloseableHttpClient
Refactor few variable and method names
 2022-04-12 18:02:45 +05:30
navodzoysa
cf0be2ad93 Temp fix for windows enrollment permission url mismatch 2022-04-12 08:28:06 +05:30
osh
f86617a264 Add the sql files 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-07 09:42:35 +05:30
Mohamed Rashd
daaeed52e2 Add and Change licence from WSO2 to Entgra 2022-04-06 11:08:33 +05:30
Mohamed Rashd
db1aab1f3a Add identity service provider config 2022-04-06 01:01:22 +05:30
Mohamed Rashd
c58f837585 Complete Identity Server create/delete/update APIs 2022-04-06 00:55:18 +05:30
osh
7ba8311c93 fix conflict 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-05 23:04:41 +05:30
osh
5ad9e3e6b4 Add billing data export api 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-04-05 22:59:23 +05:30
Gimhan-minion
aed8d6f277 Fix validation of appname when a webclip is created 2022-03-23 19:43:53 +05:30
builder
946a12b84d [maven-release-plugin] prepare for next development iteration 2022-03-22 12:54:48 +00:00
builder
f55ffbb19a [maven-release-plugin] prepare release v5.0.5 2022-03-22 12:54:43 +00:00
Mohamed Rashd
38f9b60970 Fix sql query that gets subscribed devices 2022-03-21 18:21:40 +05:30
builder
39216aa651 [maven-release-plugin] prepare for next development iteration 2022-03-18 03:48:22 +00:00
builder
8deff13edd [maven-release-plugin] prepare release v5.0.4 2022-03-18 03:48:17 +00:00
Pahansith Gunathilake
15b5aaa340 Merge branch 'feature1277' into 'master' 
Generate QR with access token for given user

See merge request entgra/carbon-device-mgt!867
 2022-03-18 03:39:05 +00:00
Mohamed Rashd
c0e5edded2 Add sql scripts to favourites table 
Fix error logging in DAO layer
 2022-03-17 23:39:31 +05:30
Pahansith Gunathilake
788eea4e26 Merge branch 'fix-group-search' into 'master' 
Fix syntax error in group search while uninstalling apps

See merge request entgra/carbon-device-mgt!869
 2022-03-16 08:17:33 +00:00
Pahansith Gunathilake
236d356a26 Merge branch 'pr/temp/feature/subscription/status/change' into 'master' 
API to change application subscription status

See merge request entgra/carbon-device-mgt!868
 2022-03-16 06:30:07 +00:00
Mohamed Rashd
59b2aa42b4 Fix duplicate devices in subscription log 2022-03-14 17:41:01 +05:30
Muhammad Rashad
65f5efb638 Add APIs to get favourite apps 2022-03-14 06:09:01 +00:00
Pahansith Gunathilake
c1cb8905fc Fix syntax error in group search while uninstalling apps 2022-03-12 01:06:30 +05:30
osh
a4b2a325b1 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-11 01:38:59 +05:30
osh
053a57c4f5 Add getting billing cost by domain change 
fixes https://gitlab.com/entgra/product-iots/-/issues/1226
 2022-03-11 01:38:48 +05:30
Mohamed Rashd
0dd9bb2937 Add operation status update wrapper api to store 2022-03-11 00:31:37 +05:30
inoshperera
51cd59f436 Generate QR with access token for given user 
fixes https://gitlab.com/entgra/product-iots/-/issues/1277
 2022-03-10 16:33:09 +05:30
Mohamed Rashd
3f60a0cdda Fix sql query columns 
Add createIdentityServer method to all DAOs
 2022-03-08 08:27:00 +05:30
Mohamed Rashd
3dd0690552 Add identity server config 
Add api to create identity server
Return List of identity servers withtout extra bean for response
 2022-03-07 21:58:43 +05:30
Pahansith Gunathilake
aa2234dcdd Merge branch 'fix-geofence' into 'master' 
Fix invalid DAO factory handling & invalid event revoke payload

See merge request entgra/carbon-device-mgt!865
 2022-03-07 07:14:08 +00:00
Pahansith Gunathilake
7a4cef26e4 Fix invalid DAO factory handling & invalid event revoke payload 2022-03-07 12:00:09 +05:30
osh
c135105889 fixes https://gitlab.com/entgra/carbon-device-mgt/-/merge_requests/848/commits 
Add re-enrollment device cost calculation
 2022-03-07 01:21:02 +05:30
osh
8872d1baeb Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-06 10:03:12 +05:30
builder
96e4aa8436 [maven-release-plugin] prepare for next development iteration 2022-03-05 04:37:48 +00:00
builder
739266feca [maven-release-plugin] prepare release v5.0.3 2022-03-05 04:37:42 +00:00
Pahansith Gunathilake
4ab20f3205 Merge branch 'dev' into 'master' 
Add query param to publish an app directly

See merge request entgra/carbon-device-mgt!847
 2022-03-05 04:31:25 +00:00
Pahansith Gunathilake
ac5e8547c0 Merge branch 'fix/grafana/translation' into 'master' 
Fix grafana translation not working properly

See merge request entgra/carbon-device-mgt!854
 2022-03-05 04:31:18 +00:00
Mohamed Rashd
b512ff0548 Fix grafana translation not working properly 2022-03-04 16:45:48 +05:30
Pahansith Gunathilake
27303cf12b Fix invalid DAO factory handling & invalid event revoke payload 2022-03-04 16:11:10 +05:30
Mohamed Rashd
6d7f082a6b Fix grafana translation not working properly 2022-03-03 12:05:16 +05:30
Pahansith Gunathilake
02e0129d25 Merge branch 'fix/grafana/api/context/path/constant' into 'master' 
Fix grafana api context path

See merge request entgra/carbon-device-mgt!844
 2022-03-03 05:33:16 +00:00
Pahansith Gunathilake
713757c3bd Merge branch 'fix/grafana/orgId/queryParam/constant' into 'master' 
Fix grafana orgId query param name Constant

See merge request entgra/carbon-device-mgt!846
 2022-03-03 05:32:59 +00:00
Pahansith Gunathilake
f0cd2d91a2 Merge branch 'feature/add-installed-version-to-subscription-details' into 'master' 
Add installed version for installation details view

See merge request entgra/carbon-device-mgt!842
 2022-03-03 05:30:29 +00:00
Pahansith Gunathilake
7ef698058a Merge branch 'fix-timestamp' into 'master' 
Fix invalid time showing in device list

See merge request entgra/carbon-device-mgt!861
 2022-03-03 04:49:46 +00:00
Pahansith Gunathilake
778bb3e987 Fix invalid time immediate after device enrollment 2022-03-03 01:01:08 +05:30
Gimhan-minion
1186c9e292 Add query param to publish an enterprise release directly 2022-03-02 20:49:02 +05:30
Gimhan-minion
8bdffc90c6 Add query param to publish an app directly 2022-03-02 20:49:02 +05:30
Mohamed Rashd
986828bc16 Fix application count query not containing AP_APP_RELEASE columns when filtering 
Fix inaccurate application count when an appliction has more than 1 release
 2022-03-02 19:22:47 +05:30
navodzoysa
b402d14910 Remove production scope when token is refreshed 2022-03-02 15:52:29 +05:30
osh
f611c45d3b Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-03-02 15:44:55 +05:30
osh
7b1b8ecffd Add last billed date 2022-03-02 15:44:41 +05:30
Pahansith Gunathilake
87808ec9df Merge branch 'certificate-removal-issue-fix' into 'master' 
Fix remove certificate API

See merge request entgra/carbon-device-mgt!855
 2022-03-02 06:14:03 +00:00
Pahansith Gunathilake
cb2e5e9c66 Fix test failure 2022-03-02 09:15:36 +05:30
Pahansith Gunathilake
35e0b9189e Add separate DAO factory for event management 2022-03-02 00:54:33 +00:00
Mohamed Rashd
097423b2b0 Improve api 2022-03-01 19:33:07 +05:30
Pahansith Gunathilake
12c48540d8 Fix device enrollment failure 2022-03-01 10:46:36 +05:30
Inosh Perara
294bf8ae90 Merge branch 'fix/post/api/not/non/repeatable/entity' into 'master' 
Fix post api failing when trying the with refresh token due to non repeatable http entity

See merge request entgra/carbon-device-mgt!850
 2022-03-01 05:03:07 +00:00
Chamindu Senanayake
5b5257301a Fix remove certificate API 2022-03-01 10:27:59 +05:30
osh
3658e8fad2 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into billing-api-1226 2022-02-27 08:50:22 +05:30
Mohamed Rashd
fb2ab0963d Remove unwanted new lines 2022-02-26 22:34:26 +05:30
Mohamed Rashd
9cdc438970 Change to base64 string for file uploads instead of using multipart form data 
Make release optional when creating new application
Fix screenshots not getting saved if duplicate screenshot file name found
Delete artifacts if errors while adding release to db
Improve service provider application related apis
Refactor code
 2022-02-26 22:25:57 +05:30
charitha
507a21a047 Fix incorrect response handling logic 2022-02-23 11:03:58 +05:30
Mohamed Rashd
866686c6ea Fix post api failing when trying the with refresh token due to non repeatable http entity 2022-02-22 16:50:51 +05:30
Mohamed Rashd
5e247c6e6b Add identity server service provider app integration 2022-02-21 13:47:48 +05:30
osh
ed256ad346 fixes https://gitlab.com/entgra/product-iots/-/issues/1226 
resole cofilict
 2022-02-17 14:06:43 +05:30
osh
d01aa2026d fixes https://gitlab.com/entgra/product-iots/-/issues/1226 
Adding the new billing API
 2022-02-17 13:58:15 +05:30
Mohamed Rashd
2c518aa2ac Fix grafana orgId query param name Constant 2022-02-07 13:21:47 +05:30
Don Kushan Saminda Wijeratne
1e0e54e818 Setting maintenance user when carbon context user is null + fixing the function which sets statuses of all devices belonging to a user 2022-02-02 09:04:29 +00:00
Mohamed Rashd
65ae8dd774 Fix grafana api context path 2022-01-31 23:48:24 +05:30
Chandima
c89db6787d Add installed version for installation details view 2022-01-26 16:53:49 +05:30
Mohamed Rashd
bb3f86defa Fix typo in grafana api permission 2022-01-26 12:09:12 +05:30
builder
06560d24d4 [maven-release-plugin] prepare for next development iteration 2022-01-24 08:29:39 +00:00
builder
2784633dd6 [maven-release-plugin] prepare release v5.0.2 2022-01-24 08:29:35 +00:00
Pahansith Gunathilake
9085e45e21 Update pom.xml 2022-01-24 07:57:47 +00:00
Pahansith Gunathilake
dcdff9827d Update pom.xml 2022-01-24 07:57:25 +00:00
Pahansith Gunathilake
c475a3d035 Update pom.xml 2022-01-24 07:57:06 +00:00
Pahansith Gunathilake
27b5283ff7 Update pom.xml 2022-01-24 07:56:23 +00:00
Pahansith Gunathilake
e17ca8a914 Update pom.xml 2022-01-24 07:56:02 +00:00
Muhammad Rashad
4e73b778e2 Move grafana to separate module 2022-01-24 07:19:31 +00:00
builder
1896199698 [maven-release-plugin] prepare for next development iteration 2022-01-24 04:04:22 +00:00
builder
a765f780f0 [maven-release-plugin] prepare release v5.0.1 2022-01-24 04:04:17 +00:00
Amalka Subasinghe
4ed28820c8 operation timeout feature 2022-01-24 03:56:25 +00:00
builder
ef558458a0 [maven-release-plugin] prepare for next development iteration 2022-01-18 03:25:27 +00:00
builder
8e191e75a6 [maven-release-plugin] prepare release v5.0.0 2022-01-18 03:25:22 +00:00
Pahansith Gunathilake
8b6a3ef77c Merge branch 'master' into 'master' 
adding device status history feature

See merge request entgra/carbon-device-mgt!836
 2022-01-18 03:18:30 +00:00
Don Kushan Saminda Wijeratne
7e7fa53b8f adding device status history feature 2022-01-18 03:18:29 +00:00
Pahansith Gunathilake
21e014d6a6 Merge branch 'api/pr/grafana/device-mgt' into 'master' 
Added grafana integration

See merge request entgra/carbon-device-mgt!829
 2022-01-18 03:11:09 +00:00
Muhammad Rashad
1f536c40e4 Added grafana integration 2022-01-18 03:11:08 +00:00
builder
2e9832caa6 [maven-release-plugin] prepare for next development iteration 2022-01-12 06:12:38 +00:00
builder
6b0c527bb2 [maven-release-plugin] prepare release v5.0.0 2022-01-12 06:12:32 +00:00
Rushdi
e54765e992 Updated the operation status 2022-01-05 13:30:42 +05:30
Rushdi
fd82162909 Added new operation status 2022-01-05 13:04:42 +05:30
Charitha Goonetilleke
78824205c1 Merge branch 'master' into 'master' 
Allow retrieving activities for multiple device ids

See merge request entgra/carbon-device-mgt!831
 2021-12-17 13:13:40 +00:00
shamalka
301a7e7009 Add additional attributes to policy UI beans 2021-12-16 01:09:07 +05:30
charitha
0284c955cf Allow retrieving activities for multiple device ids 2021-12-15 14:48:49 +05:30
builder
d7ccaa559b [maven-release-plugin] prepare for next development iteration 2021-12-04 17:57:16 +00:00
builder
907fb825ea [maven-release-plugin] prepare release v5.0.0 2021-12-04 17:57:11 +00:00
Pahansith Gunathilake
ee0a1007eb Merge branch 'french-translation' into 'master' 
Add access_token grant type

See merge request entgra/carbon-device-mgt!830
 2021-12-04 17:09:12 +00:00
Pahansith Gunathilake
69677b4982 Merge branch 'modify-activity-epnew' into 'master' 
Add time duration filtering to activities endpoint

See merge request entgra/carbon-device-mgt!828
 2021-12-04 17:08:27 +00:00
Pahansith Gunathilake
51cf354f4a Merge branch 'kernel-4.6.2' into 'master' 
removed unwanted todos

See merge request entgra/carbon-device-mgt!825
 2021-12-04 17:08:14 +00:00
Pahansith Gunathilake
91990141c5 Merge branch 'timestamp-fixes-1' into 'master' 
Make timestamps independent from host machine timezone

See merge request entgra/carbon-device-mgt!823
 2021-12-04 17:08:08 +00:00
Pahansith Gunathilake
b61c97d603 Make timestamps independent from host machine timezone 2021-12-04 17:08:08 +00:00
inoshperera
0bdd314cb8 Add access_token grant type 
fixes https://gitlab.com/entgra/product-iots/-/issues/1178
 2021-12-04 15:14:15 +05:30
Pahansith Gunathilake
9f2cedd09c Change time filtering DB column 2021-12-01 17:10:45 +05:30
Pahansith Gunathilake
a0856f7069 Add time duration filtering to activities EP 2021-12-01 17:03:38 +05:30
Amalka Subasinghe
fbc255b7a8 removed unwanted todos 2021-11-30 11:58:42 +05:30
Mohamed Rashd
fd0368b8b5 Change api that checks if an appName already exists, to accept the appName as query parameter instead of context-path 2021-11-29 15:26:35 +05:30
lasantha
4b64748448 Add app subscribing feature improvement 2021-11-26 15:23:26 +05:30
Pahansith Gunathilake
5da6c70502 Merge branch 'ios-500' into 'master' 
ios enrollment fixes

See merge request entgra/carbon-device-mgt!819
 2021-11-22 11:14:57 +00:00
Pahansith Gunathilake
26ef9bcf01 Merge branch 'subs-operation-status-fix' into 'master' 
Fix operation status issue in app subscription

See merge request entgra/carbon-device-mgt!818
 2021-11-22 11:14:26 +00:00
Pahansith Gunathilake
2026b9a6fa Merge branch 'feature/filter-apis' into 'master' 
Add API to retrieve filters for analytics

See merge request entgra/carbon-device-mgt!817
 2021-11-22 11:13:59 +00:00
Pahansith Gunathilake
76782a9bb7 Merge branch 'fix-1189' into 'master' 
Remove duplicate app subscriptions

See merge request entgra/carbon-device-mgt!820
 2021-11-22 07:51:53 +00:00
inoshperera
b6c41eabb9 Remove duplicate app subscriptions 
When there are multiple groups on the list, there is a possibility to create multiple subscriptions. The fix is to address this problem. Fixes https://gitlab.com/entgra/product-iots/-/issues/1189
 2021-11-22 12:28:39 +05:30
inoshperera
fbfd9ba911 ios enrollment fixes 
Fixes https://gitlab.com/entgra/product-iots/-/issues/1184
 2021-11-16 10:37:13 +05:30
Chamindu Senanayake
7776e19946 Fix operation status issue in app subscription 
Fixes https://gitlab.com/entgra/product-iots/-/issues/999
 2021-11-15 05:30:04 +05:30
navodzoysa
71e6ca3bd0 Add API to retrieve filters for analytics 2021-11-12 16:56:18 +05:30
charithag
6f008ea65f Allow users with CDM Admin permission to retrieve activities 2021-11-05 20:50:29 +05:30
charithag
3fea6f79c7 Add missing initiated by field in operation retrieval 2021-11-04 21:24:08 +05:30
Pahansith Gunathilake
731ae83bc4 Merge branch 'RemoteFix' into 'master' 
Fix remote session failing issue

See merge request entgra/carbon-device-mgt!811
 2021-10-29 04:22:02 +00:00
lasantha
4c921d54b1 Update APPM subscriptions when operation log updates 2021-10-25 14:55:33 +05:30
sandaru
4d0bf16a65 Fix remote session failing issue 2021-10-15 08:01:28 +05:30
builder
216e47b429 [maven-release-plugin] prepare for next development iteration 2021-10-05 15:14:34 +00:00
builder
5c2dc99b09 [maven-release-plugin] prepare release v5.0.0 2021-10-05 15:14:29 +00:00
Pahansith Gunathilake
9daa745001 Merge branch 'kernel-4.6.x' into 'kernel-4.6.x' 
Sync with master

See merge request entgra/carbon-device-mgt!807
 2021-10-03 15:49:57 +00:00
Pahansith Gunathilake
26fb28efd9 Merge branch 'k-46x-test-fix-2' into 'kernel-4.6.x' 
Fix test cases kernel-4.6.x

See merge request entgra/carbon-device-mgt!800
 2021-10-03 15:49:38 +00:00
Pahansith Gunathilake
f22fc7e460 Fix test cases kernel-4.6.x 2021-10-03 15:49:37 +00:00
Saad Sahibjan
b3a229a0e7 Update device property table in dm db when updating properties 
(cherry picked from commit 5f64b0b1ad)
 2021-10-03 20:52:03 +05:30
Saad Sahibjan
1434a27cde Add new device status ASSIGNED 
(cherry picked from commit 68405ed229)
 2021-10-03 20:51:58 +05:30
sandaru
eb05fb9a3f Fix web-clip install issue 
(cherry picked from commit ebe9842d9a)
 2021-10-03 20:51:54 +05:30
Saad Sahibjan
6393276503 Fix having UPPER in query of groups retrieval 
(cherry picked from commit 4681447ba9)
 2021-10-03 20:51:51 +05:30
Pahansith Gunathilake
06935fd5fb Merge branch 'kernel-4.6.2' into 'kernel-4.6.x' 
fixed issue in updating apis

See merge request entgra/carbon-device-mgt!806
 2021-10-01 05:45:43 +00:00
Amalka Subasinghe
7bb616075a fixed issue in updating apis 2021-10-01 11:03:40 +05:30
Pahansith Gunathilake
9bba7edde8 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x' 
updating existing shared scope not required

See merge request entgra/carbon-device-mgt!803
 2021-09-24 12:18:01 +00:00
Amalka Subasinghe
de963fa01b updating existing shared scope not required 2021-09-24 15:38:07 +05:30
Pahansith Gunathilake
a960f3b364 Merge branch 'kernel-4.6.2' into 'kernel-4.6.x' 
fixed gw, km, iot, apim urls

See merge request entgra/carbon-device-mgt!801
 2021-09-15 16:59:30 +00:00
Amalka Subasinghe
a031579b80 fixed gw, km, iot, apim urls 2021-09-15 15:12:10 +05:30
Pahansith
ee95c8aca1 Fix location update timestamp overwrite issue 2021-08-25 15:09:55 +05:30
Amalka Subasinghe
7dc5d7f45d X:Merge branch 'master' into kernel-4.6.2 2021-08-24 15:32:37 +05:30
Amalka Subasinghe
4203226aa5 fixed tenant enrol issue 2021-08-24 15:08:38 +05:30
Pahansith
d8999cd3a6 Fix error while adding app install to a device group 2021-08-24 13:06:37 +05:30
Amalka Subasinghe
eae469fbc5 tenant login issue fixed 2021-08-17 09:53:41 +05:30
Amalka Subasinghe
4503ab77c7 package name change - appmgt 2021-08-10 17:30:48 +05:30