Commit Graph

7429 Commits

Author SHA1 Message Date
MalshaPiumini
b2691996ab Added device filter using serial number. 2021-05-05 14:37:45 +05:30
Inosh Perara
a0ed490b0b Merge branch 'Dummy' into 'master'
Device filters in store portal

Closes product-iots#866

See merge request entgra/carbon-device-mgt!746
2021-05-04 04:26:41 +00:00
Inosh Perara
eb69e06fd6 Merge branch 'scope-handler' into 'master'
Improve the permission loading mechanism

See merge request entgra/carbon-device-mgt!765
2021-05-04 04:25:44 +00:00
Pahansith
429e76cfdc Add session scope handler 2021-05-04 08:39:20 +05:30
Pahansith
0060083499 Add DAO fix for app schedule subscription 2021-05-03 11:24:07 +05:30
Pahansith
4dee16dffb Fix schedule install DAO issue 2021-04-28 18:54:31 +05:30
Farheen99
86720b1a45 Add a query to get the applications sort according to latest timestamp order 2021-04-24 12:06:04 +05:30
Inosh Perara
a36d5b39f1 Merge branch 'app-subscription-fix-2' into 'master'
Fix schedule app installation not working issue

See merge request entgra/carbon-device-mgt!758
2021-04-23 15:58:43 +00:00
Pahansith
365b073e6a Fix app schedule installation issue in single node 2021-04-22 21:32:48 +05:30
vigneshan
10166069d3 Fix token refresh issue 2021-04-19 15:42:15 +05:30
Charitha Goonetilleke
99e5f9f876 Fix executing policy monitoring continuously 2021-04-10 16:18:06 +00:00
vigneshan
872299a617 Add login cache for sso and non-sso flow 2021-04-01 11:30:35 +05:30
Dharmakeerthi Lasantha
853ee700b8 Merge branch 'issue-db-query-changes' into 'master'
Handle execution of queries contain IN clause with empty array

Closes product-iots#885

See merge request entgra/carbon-device-mgt!748
2021-03-29 07:49:48 +00:00
Farheen Boosary
0f39b2f253 Handle execution of queries contain IN clause with empty array 2021-03-29 07:49:47 +00:00
Inosh Perara
c889897b9c Merge branch 'master' into 'master'
Add enterprise API tag to allowed tags in DCR

See merge request entgra/carbon-device-mgt!750
2021-03-29 04:44:54 +00:00
inoshperera
4116b7776b Add enterprise API tag to allowed tags 2021-03-27 16:21:06 +05:30
Pahansith
19206b13c4 Fix error in unmanaged app uninstall 2021-03-26 13:34:54 +05:30
inoshperera
25c2320956 Fix wrong zip codes from agents persisting 2021-03-24 19:08:39 +05:30
MalshaPiumini
dca6b53a67 Added new filter in subscription details page 2021-03-23 14:50:36 +05:30
MalshaPiumini
645fc43136 Added validations 2021-03-18 17:20:30 +05:30
MalshaPiumini
605168e770 Code modified 2021-03-17 18:37:14 +05:30
MalshaPiumini
c2940a4568 Device search in store subscription details page 2021-03-17 15:25:02 +05:30
MalshaPiumini
74c4f1004a Device search in store uninstall modal 2021-03-16 16:08:21 +05:30
inoshperera
24fad779de Add token expiry time to QR payload 2021-03-16 08:26:05 +05:30
Entgra Builder
feacd5029d [maven-release-plugin] prepare for next development iteration 2021-03-03 13:54:32 +00:00
Entgra Builder
09907233fc [maven-release-plugin] prepare release v4.1.15 2021-03-03 13:54:27 +00:00
tcdlpds@gmail.com
9f76c003a6 Fix app subscription adding issue for removed devices 2021-03-03 09:58:04 +05:30
tcdlpds@gmail.com
3bc6ca31b3 Improve application artifact downloading functionality 2021-03-02 14:13:15 +05:30
Dharmakeerthi Lasantha
8c50af1631 Merge branch 'master' into 'master'
Fix FCM and configuration fetching issues

See merge request entgra/carbon-device-mgt!742
2021-03-02 01:05:53 +00:00
inoshperera
28e0c88222 Fix FCM and configuration fetching issues 2021-02-27 10:02:19 +05:30
charitha
0435138fc9 Fix issue with updating status due to cache inconsistency 2021-02-26 14:57:16 +05:30
Entgra Builder
ddab435548 [maven-release-plugin] prepare for next development iteration 2021-02-23 16:02:44 +00:00
Entgra Builder
5b2c085a3e [maven-release-plugin] prepare release v4.1.14 2021-02-23 16:02:39 +00:00
Dharmakeerthi Lasantha
d4aaf3ce4b Merge branch 'sync_fix' into 'master'
Fix issue in enrollment object modification

See merge request entgra/carbon-device-mgt!741
2021-02-23 15:16:04 +00:00
inoshperera
bfd1f794de Fix issue in enrollment object modification 2021-02-23 19:34:21 +05:30
Entgra Builder
ca7ded79cb [maven-release-plugin] prepare for next development iteration 2021-02-23 02:24:25 +00:00
Entgra Builder
368bb74436 [maven-release-plugin] prepare release v4.1.13 2021-02-23 02:24:20 +00:00
Inosh Perara
ecca2b3f19 Merge branch 'sync_fix' into 'master'
Make FCM message priority high

See merge request entgra/carbon-device-mgt!740
2021-02-22 15:10:31 +00:00
inoshperera
f07df95f52 Make FCM message priority high 2021-02-22 19:30:25 +05:30
tcdlpds@gmail.com
2ccd137ec0 Upgrade product version in device-mgt UI 2021-02-22 18:53:42 +05:30
Dharmakeerthi Lasantha
cb3b07f35e Merge branch 'policy-ui' into 'master'
Remove unnecessary variable from card bean

See merge request entgra/carbon-device-mgt!736
2021-02-22 09:35:17 +00:00
Dharmakeerthi Lasantha
28f7bc78c0 Merge branch 'geofence-group-issue' into 'master'
Fix geofence update issue

See merge request entgra/carbon-device-mgt!737
2021-02-22 06:48:34 +00:00
Inosh Perara
77ce60dc2a Merge branch 'sync_fix' into 'master'
Increase FCM TTL

See merge request entgra/carbon-device-mgt!738
2021-02-22 06:36:10 +00:00
inoshperera
daac0b2891 Increase FCM TTL 2021-02-22 12:03:30 +05:30
Pahansith
e1afa53560 Fix geofence update issue 2021-02-22 11:21:24 +05:30
shamalka
9e3d126c08 Remove unnecessary variable from card bean 2021-02-22 10:53:50 +05:30
Entgra Builder
7463aa6e5a [maven-release-plugin] prepare for next development iteration 2021-02-22 02:16:58 +00:00
Entgra Builder
531672de8e [maven-release-plugin] prepare release v4.1.12 2021-02-22 02:16:53 +00:00
Shamalka Navod
ee5676d815 Improve policy UI bean classes 2021-02-22 01:43:35 +00:00
charithag
31dc6fc839 Fix NPE 2021-02-19 01:21:20 +05:30
Dharmakeerthi Lasantha
7e088ea747 Merge branch 'sync_fix' into 'master'
Fix cache not updating

See merge request entgra/carbon-device-mgt!734
2021-02-18 03:35:20 +00:00
inoshperera
4f88c2354c Fix cache not updating 2021-02-18 08:48:29 +05:30
Dharmakeerthi Lasantha
6f4e8a3688 Merge branch 'sync_fix' into 'master'
Fix for sycning status update in Android

See merge request entgra/carbon-device-mgt!733
2021-02-17 11:00:37 +00:00
inoshperera
8effa09a8f Fix for sycning status update in Android 2021-02-17 15:51:33 +05:30
Saad Sahibjan
617f8acba5 Merge branch 'master' into 'master'
Fix sms handler test break

See merge request entgra/carbon-device-mgt!732
2021-02-17 06:10:29 +00:00
Saad Sahibjan
143816c1e6 Fix sms handler test break 2021-02-17 11:20:02 +05:30
Charitha Goonetilleke
303ce1717e Merge branch 'master' into 'master'
SMS Mangement Feature

See merge request entgra/carbon-device-mgt!731
2021-02-17 04:16:30 +00:00
Saad Sahibjan
789ee553e6 Move email-sender component to tranport-mgt 2021-02-16 19:12:57 +05:30
Saad Sahibjan
0ad203e720 Add transport_management tag 2021-02-16 19:00:00 +05:30
Saad Sahibjan
2aa751de23 Change the structure from sms-mgt to sms-handler to have within transport-mgt 2021-02-16 18:58:00 +05:30
Saad Sahibjan
b3919ae4e9 Add sms_management tag to allowed tag list for application register 2021-02-15 22:12:34 +05:30
Saad Sahibjan
1f25e7af91 Implement SMS configuration API to update changes of the sms-config file 2021-02-15 22:11:05 +05:30
Saad Sahibjan
cb2221693e Add sample SMS Sender implementation 2021-02-15 22:09:30 +05:30
Saad Sahibjan
bbfb0584d0 Implement SMS sender factory to retrieve instance of SMS sender 2021-02-15 22:09:10 +05:30
Saad Sahibjan
8b98b7e9de Initialize sms-config.xml file during service activation 2021-02-15 22:08:41 +05:30
Saad Sahibjan
d4f5188f3d Implement SMS configuration file loading and initialization 2021-02-15 22:07:39 +05:30
Saad Sahibjan
97bb7ee87c Add SMS management common classes 2021-02-15 22:06:32 +05:30
tcdlpds@gmail.com
4ea3890a2e Upgrade server version in UI text info 2021-02-15 21:25:24 +05:30
shamalka
1faee050af Remove commented code lines 2021-02-12 22:58:36 +05:30
shamalka
72edb6c323 Accept multiple device status in store API 2021-02-12 22:56:31 +05:30
Entgra Builder
62919fa787 [maven-release-plugin] prepare for next development iteration 2021-02-11 08:09:07 +00:00
Entgra Builder
b98d787367 [maven-release-plugin] prepare release v4.1.11 2021-02-11 08:09:02 +00:00
Dharmakeerthi Lasantha
ce80f4efe0 Merge branch 'event-modify-branch-1' into 'master'
Code format of event task operation

See merge request entgra/carbon-device-mgt!728
2021-02-11 06:32:05 +00:00
Pahansith
4cc670a614 Format code 2021-02-11 10:54:57 +05:30
Inosh Perara
bcff3f46ad Merge branch 'master' into 'master'
Add bundle Id getting method for iOS public apps

See merge request entgra/carbon-device-mgt!727
2021-02-10 16:47:47 +00:00
tcdlpds@gmail.com
1c47ff56ab Add bundle Id getting method for iOS public apps 2021-02-10 22:00:42 +05:30
Charitha Goonetilleke
1e2afa6439 Merge branch 'event-modify-branch-1' into 'master'
Modify event creation task

See merge request entgra/carbon-device-mgt!725
2021-02-10 09:38:26 +00:00
Pahansith
9ef6cfc1e6 Move executor pool to the DeviceManagementDataHolder 2021-02-10 14:48:20 +05:30
tcdlpds@gmail.com
572e93a357 Fix server startup issues 2021-02-10 09:24:38 +05:30
Pahansith
2fa4a6167e Fix test failures 2021-02-10 01:37:00 +05:30
Pahansith
0cbcd747d5 Modify event operation creation 2021-02-10 01:12:13 +05:30
tcdlpds@gmail.com
175205b959 Fix build failure 2021-02-09 10:45:57 +05:30
tcdlpds@gmail.com
7b41e2cd0d Fix EULA loading issue for tenants
Fix registry loading issue when SSO has enabled. Because of that issue device type EULA displaying page is broken
2021-02-06 19:38:46 +05:30
tcdlpds@gmail.com
571d8afa11 Fix app updating issues when the payload contains same app name 2021-01-29 19:35:50 +05:30
tcdlpds@gmail.com
104bca0fb5 Add FULLY_MANAGED and DEDICATED_DEVICE ownership types 2021-01-29 19:34:58 +05:30
tcdlpds@gmail.com
51fface401 Append tenant domain when getting default access token 2021-01-27 15:05:38 +05:30
Dharmakeerthi Lasantha
6250921c6f Merge branch 'master' into 'master'
Improve interceptor source

See merge request entgra/carbon-device-mgt!721
2021-01-25 09:41:25 +00:00
tcdlpds@gmail.com
d485faad91 Improve interceptor source 2021-01-25 15:10:31 +05:30
Dharmakeerthi Lasantha
0d397b5108 Merge branch 'master' into 'master'
Improve default-token servlet response

See merge request entgra/carbon-device-mgt!720
2021-01-25 07:47:25 +00:00
tcdlpds@gmail.com
89613a3b3d Improve default-token servlet response 2021-01-25 13:05:20 +05:30
Pahansith
a7e6b64f70 Fix review issues and format code 2021-01-20 18:05:23 +05:30
tcdlpds@gmail.com
7333329e78 Add access token retrieving service 2021-01-19 11:25:42 +05:30
charitha
ad4d7a453f Fix NPE occur when updating device with null status 2021-01-18 22:16:52 +05:30
tcdlpds@gmail.com
b4d7497022 Modify DeviceTypeCommonService 2021-01-16 20:57:59 +05:30
inoshperera
b481150ee9 Fix iOS app download path 2021-01-16 08:53:12 +05:30
vigneshan
52407ba312 Improve sso ui-request-interceptor to update application as SaaS app 2021-01-13 10:28:07 +05:30
charitha
864bbcdc83 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt 2021-01-11 09:15:04 +05:30
charitha
2bdaf4186b Add Activity ID for repeated operation 2021-01-11 09:13:54 +05:30
Malsha Piumini
89298f933e Uninstall applications via Apps Tab - (For Android devices only) 2021-01-06 19:07:09 +00:00
vigneshan
256d6c334f Fix SLO issue 2021-01-04 12:13:54 +05:30
charitha
9a2792dd31 Fix issue in not updating operation response for non-removed devices 2020-12-21 13:25:32 +05:30
Pahansith
baeb34e1da Fix review issues and format code 2020-12-18 20:37:04 +05:30
Pahansith
a36733d224 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-12-16 23:00:04 +05:30
Dharmakeerthi Lasantha
27a6c45f57 Merge branch 'config-param-modify' into 'master'
Add windows agent token generation parameters to config API

See merge request entgra/carbon-device-mgt!711
2020-12-16 17:06:48 +00:00
Pahansith
931fb8ef54 Add windows agent token generation parameters to config API 2020-12-16 21:16:38 +05:30
Vigneshan
929a94dc73 Add jwt bearer grant type for sso service providers 2020-12-16 11:55:37 +05:30
Pahansith
987f8edd61 Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into upstream-master 2020-12-16 00:02:37 +05:30
tcdlpds@gmail.com
52761c673d Remove APPM store and publisher UIs from device-mgt core 2020-12-12 09:20:31 +05:30
charitha
4943635a61 Fetch enrollment Id if it is not already in the device 2020-12-12 03:01:56 +05:30
charitha
55c3f93deb Update license to entgra 2020-12-11 20:47:45 +05:30
charitha
a9cb2ae84d Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt
 Conflicts:
	components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/ActivityProviderServiceImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/GenericOperationDAOImpl.java
	components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java
2020-12-11 17:26:53 +05:30
Pahansith
bc85a89cf9 Change event task to implement ntask interface 2020-12-11 04:16:23 +05:30
tcdlpds@gmail.com
087b826d29 Improve information logging 2020-12-09 16:57:15 +05:30
Shamalka Navod
eccb39d6f4 Improve metadata API 2020-12-07 20:15:18 +00:00
Inosh Perara
5297dfa73d Merge branch 'lasantha' into 'master'
Adding heart beat management functionality for dynamic task distribution

See merge request entgra/carbon-device-mgt!695
2020-12-07 09:24:20 +00:00
Ace
ceab2566ac Addressing review comments 2020-12-07 13:27:57 +05:30
Ace
5531bc0140 Addressing review comments 2020-12-07 13:19:46 +05:30
Ace
4df57ede61 incoorporating review comments 2020-12-07 13:09:14 +05:30
Dharmakeerthi Lasantha
d9386901d4 Merge branch 'corrective-policy' into 'master'
Implement OIDC Based SSO For All React Applications

Closes product-iots#656

See merge request entgra/carbon-device-mgt!680
2020-12-04 05:30:10 +00:00
Vigneshan
44c7affb49 Improve publisher ui to support sso 2020-12-04 10:07:08 +05:30
Vigneshan
6ee1d31a0e Improve store ui to support sso 2020-12-04 10:06:54 +05:30
Vigneshan
0917d3bf7f Improve consent management page to process oidc requests 2020-12-04 10:06:28 +05:30
Vigneshan
f31befb342 Implement oidc based sso among all web apps 2020-12-04 10:06:00 +05:30
Ace
bac6e3ba67 merging with upstream 2020-12-04 07:45:10 +05:30
Ace
cfe206b32c correcting task random candidate election logic 2020-12-04 07:26:29 +05:30
Ace
7734dbd654 Fixing issue with candidate election 2020-12-04 04:43:00 +05:30
Ace
c6db9eeecc adding randomly assigned task functionality and other improvements 2020-12-03 21:09:50 +05:30
Pahansith Gunathilake
caba7fc673 Add missing error logs to OperationManagerImpl 2020-11-30 15:51:52 +00:00
Pahansith
0e4a02635d Add method comments and format code 2020-11-30 16:15:23 +05:30
Pahansith
e5dd609dc2 Add method comments and format code 2020-11-30 15:41:51 +05:30
charitha
911bd62a44 Fix not adhering 'initiated by' 2020-11-29 10:47:06 +05:30
charitha
31a6497950 Fix enrollment modification issues 2020-11-29 10:47:06 +05:30
charitha
d75f48166e Provide response based on headers 2020-11-29 10:47:06 +05:30
charitha
10d114ba1e Improve activity retrieval logic 2020-11-29 10:47:05 +05:30
Ace
9d39197844 Adding improvements to dynamic task allocation 2020-11-26 19:16:49 +05:30
Pahansith
a3629d5932 Add group data into geofence response, Format code 2020-11-21 12:24:55 +05:30
Pahansith
8c80185610 Add doc comments and format code 2020-11-21 12:22:53 +05:30
Pahansith
d9d0ba5d90 Add event delete API 2020-11-21 12:22:53 +05:30
Pahansith
fed779302a Fix issues in Event DAO and improvements for the operation task 2020-11-21 12:22:53 +05:30
Pahansith
f073ee9276 Add H2 DAO for event configuration 2020-11-21 12:22:53 +05:30
Pahansith
75b619d5f9 Add event configuration operation creation tasks 2020-11-21 12:22:53 +05:30
Pahansith
efe116d87e Modify geofence get API 2020-11-21 12:22:53 +05:30
Pahansith
af85ca47e0 Change Geo fence edit API - Attach Events 2020-11-21 12:22:53 +05:30
Pahansith
bd8cf5237d Change Geo fence create API - Attach Event creation 2020-11-21 12:22:53 +05:30
Ace
b1d95af5b0 remvoing restriction that prevents activity count to be returned when if-modified-since header is present 2020-11-20 23:37:48 +05:30
Ace
ada570f0a0 fixing NPE when processing operations 2020-11-20 16:11:43 +05:30
tcdlpds@gmail.com
fc0fa92826 Fix incorrect device operation count returning issue 2020-11-20 07:17:47 +05:30
Ace
7cd1baf1af Adding missing license headers 2020-11-20 05:52:38 +05:30
Ace
e7b97d78c7 Imrpoving task implementation 2020-11-20 05:48:54 +05:30
Kaveesha
f99bbe36de Improve Input class in policy ui Configuration 2020-11-19 17:28:39 +05:30