Commit Graph

10367 Commits

Author SHA1 Message Date
Dharmakeerthi Lasantha
938190deca Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420 2023-07-31 11:40:04 +05:30
Lasantha Dharmakeerthi
0333082716 Sync with master branch 2023-07-31 06:09:15 +00:00
Dharmakeerthi Lasantha
8289db1af8 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into sync-master 2023-07-31 11:29:17 +05:30
builder
fabd3ebae8 [maven-release-plugin] prepare for next development iteration 2023-07-27 21:09:35 +05:30
builder
02458cc4fe [maven-release-plugin] prepare release v5.0.28 2023-07-27 21:09:27 +05:30
bfd260e6f9 Merge pull request 'Fix issues with retrieving visible roles' (#191) from prathabanKavin/device-mgt-core:visiblefix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/191
2023-07-27 11:51:19 +00:00
prathabanKavin
f091d26f9c Fix issues with retrieving visible roles 2023-07-27 16:39:08 +05:30
a8badb22c4 Merge pull request 'Fix for visible role issue' (#190) from prathabanKavin/device-mgt-core:visiblerolefix into master
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/190
2023-07-27 10:59:48 +00:00
prathabanKavin
20906122db Fix for visible role issue 2023-07-27 15:39:52 +05:30
1921b3e54d Add missing device identifier column to dbscripts (#189)
## Purpose
device identifier column is missing in dm_device_certificate table

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/189
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-07-27 05:13:56 +00:00
8011170379 Fix issue in tenant id not append to certificate subject (#188)
Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/188
2023-07-26 15:24:05 +00:00
Amalka Subasinghe
d021b43086 Merge pull request 'Fix test cases failing issue' (#183) from tcdlpds/device-mgt-core:sync-master into apim420
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/183
2023-07-26 07:54:57 +00:00
Lasantha Dharmakeerthi
b0d5fc29d5 Fix JWT token generation. 2023-07-26 03:13:56 +00:00
pasindu
7dfcb418f4 Fix jwt token generation 2023-07-26 08:35:23 +05:30
Dharmakeerthi Lasantha
fe58a16d17 sync with upstream apim420 2023-07-26 07:32:55 +05:30
Lasantha Dharmakeerthi
04b4142ece Merge pull request 'Revert "Fixes in JWT token generation and sync with upstream apim420 branch"' (#14) from revert into apim420
Reviewed-on: https://repository.entgra.net/tcdlpds/device-mgt-core/pulls/14
2023-07-26 02:01:41 +00:00
Dharmakeerthi Lasantha
8215186061 Revert "Fixes in JWT token generation and sync with upstream apim420 branch"
This reverts commit d567209c11, reversing
changes made to 437c0e642d.
2023-07-26 07:29:08 +05:30
Lasantha Dharmakeerthi
d567209c11 Fixes in JWT token generation and sync with upstream apim420 branch 2023-07-25 14:50:27 +00:00
pasindu
8ea4932019 Fixes in JWT token generation 2023-07-25 18:29:40 +05:30
Dharmakeerthi Lasantha
83780c6a0c Add improvements to APIM application creating logic 2023-07-25 18:29:34 +05:30
Dharmakeerthi Lasantha
8880ef99db Improve APIM application key generate method 2023-07-25 18:27:09 +05:30
Dharmakeerthi Lasantha
2125519aa6 Add todo Comments 2023-07-25 18:25:13 +05:30
Dharmakeerthi Lasantha
da4f3f1456 Add API integration 2023-07-25 18:18:42 +05:30
Dharmakeerthi Lasantha
52fd8c4b89 Add Application key generating logic 2023-07-25 18:05:16 +05:30
Dharmakeerthi Lasantha
29a8dd5fde Add API app registering refactored code 2023-07-25 18:05:14 +05:30
Dharmakeerthi Lasantha
958f4e43d6 Add Consumer REST API integration 2023-07-25 17:57:21 +05:30
Pasindu Rupasinghe
b7f077e639 Implement service for consumer rest APIs
Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>
2023-07-25 17:52:48 +05:30
Dharmakeerthi Lasantha
ac3e144437 Fix OSGI service unbinding issue 2023-07-25 17:33:02 +05:30
Dharmakeerthi Lasantha
f2243ebd0e Fix formatting issue 2023-07-25 17:33:02 +05:30
navodzoysa
f72166895f Fix class not found error in analytics component 2023-07-25 17:33:01 +05:30
prathabanKavin
8b967cee4c Add missing ios scopes in mdm-ui-config 2023-07-25 17:30:50 +05:30
Dharmakeerthi Lasantha
dc6bbdd282 Improve functionality and fix formatting issues 2023-07-25 17:30:47 +05:30
Dharmakeerthi Lasantha
ef2838414a Fix build failure 2023-07-25 17:29:15 +05:30
Dharmakeerthi Lasantha
087a9fe728 Fix dependency importing issue 2023-07-25 17:29:14 +05:30
Thilina Sandaruwan
b765c8ded3 Grouping Improvements (#169)
Purpose

After deleting a role, delete relevant records from DM_ROLE_GROUP_MAP table
Related tickets: https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/169
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-07-25 17:24:39 +05:30
rajitha
a1ae369fe5 Fix realm service unbinding issues 2023-07-25 17:19:22 +05:30
rajitha
3dc567fcfe Fix transaction initiating issue 2023-07-25 17:19:22 +05:30
ThilinaPremachandra
b682e77d34 fix: group assigned role issue 2023-07-25 17:19:21 +05:30
ThilinaPremachandra
0581151248 add: super-tenant admin check 2023-07-25 17:17:51 +05:30
ThilinaPremachandra
fde6de94bb fix: sub tenants grouping issue 2023-07-25 17:17:51 +05:30
5d9938d7be Add footer config template
## Purpose
* Fixes https://roadmap.entgra.net/issues/10180

## Description
* cdm-config.xml.j2, cdm-config.xml templates are updated from hardcoded values to retrieve values from deployment.toml
* server_name, server_version and current_year are added as variables

* **Usage:** change deployment.toml values when a new version released. This will update the footer

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

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/160
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>
2023-07-25 17:17:51 +05:30
navodzoysa
d90c5c459a Remove reserved_user when fetching users 2023-07-25 17:17:51 +05:30
Nishan Sangeeth
1844db87d8 Improve app visibility restricting functionality
Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>
2023-07-25 17:17:50 +05:30
nishan
50beae1bf8 Remove the user has role validation 2023-07-25 17:11:26 +05:30
nishan
da6f7158cf add api for get visible roles 2023-07-25 17:11:24 +05:30
Thilina Sandaruwan
0ce7cd954c HierarchicalGrouping (#153)
Goals
Complete hierarchical grouping task
https://roadmap.entgra.net/issues/9528 and https://roadmap.entgra.net/issues/9529

Approach
Fix the encountered issues

Co-authored-by: ThilinaPremachandra <thilina@entgra.io>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/153
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>
2023-07-25 17:09:26 +05:30
rajitha
729f1fd85f Update invite link 2023-07-25 17:09:26 +05:30
prathabanKavin
5a8bcf6711 Add device enrolment log for modifyenrolment 2023-07-25 17:09:26 +05:30
navodzoysa
f9b9f76a3c Fix skip app release error 2023-07-25 17:09:26 +05:30
e979130e55 Fix missing imports 2023-07-25 17:09:24 +05:30