synced-apim420

073762c9db updated versions for apim 420 and jdk 17

b5012d9681 Merge pull request 'Update copyright' (#127 ) from tcdlpds/device-mgt-core:apim420 into apim420

Reviewed-on: #127

6e0fe2e26e Integrate with APIM dev-portal APIs

c3d23c3cfa Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into apim420

c98237dc6f Implement service for consumer rest APIs

Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>

22f4da908f Add Consumer REST API integration

2d37dcb340 Add API app registering refactored code

1bb571acde fixing dependency issues when installing on apim420

3470c58705 updated apim420

541e517b46 updated from master branch

c46a459e6d Add Application key generating logic

a513c13037 Improvements in consumer rest apis

a8d45ee41a Create methods for consumer api app creation and get details of app

45d98d5e49 Improve get all api method to accept header params

c53c8f3d63 minor fix

f587e2a38f Improvements in consumer rest APIS

6bf6adf2b5 Add API integration

0e62245064 modify generateAndRetrieveApplicationKeys method

bbcadf19d0 Modify generateAndRetrieveApplicationKeys method

d251253948 Improve application key generating functionality

94e1df617a Get apiApplication registration to single method and fix generateApplicationKeys

49fafb3b37 Get API Application registration to single method and fix generateApplicationKeys method

189a572d31 Improve functionality

c227969a61 Improve the functionality

f741df7c4b Add ToDos

0927dfc835 sync with upstream

a09d72c33c Add todo Comments

46ee81e78d updated from master

3b8405e72e Fix version issues in REST APIs

7a6f6b8672 Fix version issues in REST APIs

af17e4fa8e Improve APIM application key generate method

840ba3755a Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420

730f3aaa07 Improve API publishing functionality

7826e5c285 Fix key generation method

ad537f3461 Fix application key generation method

1edaa8a2a5 Improve API key generating method

253157ba1a Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420

d40dccc240 Add improvements to token generation for devices

7dfcc0e33c Get token separately for REST calls

Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>

43ef801ac3 Improvements in consumer rest apis

82b7513c01 Improvements in consumer rest APIs

bfaeb1778f Add JWT support

da1485d04f Fix getApplication method with Rest api calls

438f06ef45 Fix getApplication method with Rest api calls

cb2fb990e7 Get ApiApplicationInfo and access token into single object

Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>

342e201c4c Add improvements to APIM application creating logic

c455bfe187 Fix consumer REST calls

ab681eb915 Fix consumer REST calls

1e9b38440b Improve subscription filtering logic

e7062b37b2 Fix Cron Expression defining issue

bfc38eeff0 Merge pull request 'Fix Cron Expression defining issue' (#157 ) from tcdlpds/device-mgt-core:cron-fix into apim420

Reviewed-on: #157

35ee44f799 Remove Capp Deploying service

86c114f52f Merge pull request 'Remove Capp Deploying service' (#159 ) from tcdlpds/device-mgt-core:cron-fix into apim420

Reviewed-on: #159

1c3cd7cd2f fixed webapp deploying failure

2ff6e2e529 updated jackson-databind version

204b5d956b fixed unit tests of application-mgt

437c0e642d Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420

9f19c1d1c1 fixed unit tests in analytics-mgt

1c4ee6cacc fixed mockito dependency issue

b08f3fcc49 fixed unit tests

9759520157 fixed unit tests

78f9f746d8 fixed unit tests

9352382406 fixed unit tests

edcf235ff8 fixed unit tests

b7c0a8fb9b fixed unit tests

013df183cd operation template related unit test fixes

2e5579fdc2 fixed operation template unit tests

816ade11e6 Sync with master

11efc83b06 Fix dependency importing issue

78aee58c1a Fix build failure

3bf6f7dd75 Improve functionality and fix formatting issues

fe4011cc7e Sync with master

a66d6389f9 Fix formatting issue

b249b2435f Merge pull request 'Sync with the master branch' (#172 ) from tcdlpds/device-mgt-core:sync-master into apim420

Reviewed-on: #172

2cfa73206d Fix OSGI service unbinding issue

95413f96de Merge pull request 'Fix OSGI service unbinding issue' (#177 ) from tcdlpds/device-mgt-core:sync-master into apim420

Reviewed-on: #177

1d94fb7de1 Fix test case failing

bfe9746d70 Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420

5098c652ca Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into sync-master

349bb0a3dc Fix test case failure

74041070f9 Fix class def not found issue

5b6b11dc8c fixed unit tests of application-mgt

defb0aed04 fixed unit tests in analytics-mgt

c855b707e7 fixed mockito dependency issue

bc66555a04 fixed unit tests

da8fa5b895 fixed unit tests

c286fec27b fixed unit tests

ce37fdb4be fixed unit tests

f63a6ee65b fixed unit tests

be6db5c5d5 fixed unit tests

80b42315d7 operation template related unit test fixes

5b85778d27 fixed operation template unit tests

effc35d52d Update admin credentials in webapp-auth-config template

74e06047f1 Fix class def not found in grafana component

7ad3a0e21b Add custom loggers (#136 )

* Fixes https://roadmap.entgra.net/issues/10117

* Added custom logs for below cases:
1. Device connectivity events
2. Policy payload change events
3. Device enrollment history events
4. App install events

**1. Device connectivity logs** - logs for newly added operations and calls for pending operations

Pattern :
{DateTime} {LogLevel} - {ActionTag} {OperationCode} {DeviceId} {DeviceType} {TenantDomain} {TenantId} {UserName} - log_message

```
[2023-06-15 00:12:09,093]  INFO - [ADD_OPERATION] [DEVICE_LOCATION] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:12:10,344]  INFO - [PENDING_OPERATION] [DEVICE_LOCATION] [675c60a9d31492d6] [android] [carbon.super] [-1234] [admin]- Device Connected
[2023-06-15 00:13:49,755]  INFO - [ADD_OPERATION] [DEVICE_LOCK] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:13:56,513]  INFO - [ADD_OPERATION] [DEVICE_MUTE] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:14:23,839]  INFO - [PENDING_OPERATION] [DEVICE_MUTE]
[2023-06-15 00:15:12,549]  INFO - [ADD_OPERATION] [INSTALL_APPLICATION] [97] [android] [carbon.super] [-1234] [admin]- Operation added
[2023-06-15 00:15:29,703]  INFO - [PENDING_OPERATION] [INSTALL_APPLICATION] [675c60a9d31492d6] [android] [carbon.super] [-1234] [admin]- Device Connected
```
**2. Policy payload change events** - logs for creating policy, updating policy, deleting policy, change policy priorities and apply changes to device logs

Pattern :
{DateTime} {LogLevel} - {ActionTag} {PolicyName} {TenantDomain} {TenantId} {Payload} {UserName} - log_message

```
[2023-06-15 00:15:53,264]  INFO - [UPDATE_POLICY] [passcodeios] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":33,"priorityId":1,"profile":{"profileId":33,"profileName":"passcodeios","tenantId":0,"deviceType":"ios","updatedDate":"Jun 15, 2023 12:15:53 AM","profileFeaturesList":[{"id":33,"featureCode":"PASSCODE_POLICY","profileId":0,"deviceType":"ios","content":"{\"forcePIN\":true,\"allowSimple\":true,\"requireAlphanumeric\":true,\"minLength\":7.0,\"minComplexChars\":4.0,\"pinHistory\":\"\"}","correctiveActions":[]}]},"policyName":"passcodeios","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":false,"description":"test","compliance":"enforce","tenantId":-1234,"profileId":33,"policyType":"GENERAL"}] [admin] - Policy updated
[2023-06-15 00:34:38,980]  INFO - [ADD_POLICY] [application management policy] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":65,"priorityId":0,"profile":{"profileId":65,"profileName":"application management policy","tenantId":0,"deviceType":"windows","createdDate":"Jun 15, 2023 12:34:38 AM","updatedDate":"Jun 15, 2023 12:34:38 AM","profileFeaturesList":[{"id":65,"featureCode":"ALLOW_ALL_TRUSTED_APPS","profileId":0,"deviceType":"windows","content":"{\"enabled\":true}","correctiveActions":[]},{"id":73,"featureCode":"RESTRICT_APP_TO_SYSTEM_VOLUME","profileId":0,"deviceType":"windows","content":"{\"enabled\":false}","correctiveActions":[]}]},"policyName":"application management policy","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":false,"description":"test","compliance":"enforce","tenantId":-1234,"profileId":0,"policyType":"GENERAL"}] [admin] - Policy created
[2023-06-15 00:35:05,420]  INFO - [DELETE_POLICY] [passcodeios] [carbon.super] [-1234] [{"policyPayloadVersion":"2.0","id":33,"priorityId":1,"profile":{"profileId":33,"profileName":"passcodeios","tenantId":-1234,"deviceType":"ios","createdDate":"Jun 13, 2023 10:24:30 PM","updatedDate":"Jun 15, 2023 12:15:53 AM","profileFeaturesList":[{"id":33,"featureCode":"PASSCODE_POLICY","profileId":33,"deviceType":"ios","content":"{\"forcePIN\":true,\"allowSimple\":true,\"requireAlphanumeric\":true,\"minLength\":7.0,\"minComplexChars\":4.0,\"pinHistory\":\"\"}","correctiveActions":[]}]},"policyName":"passcodeios","generic":false,"roles":["ANY"],"devices":[],"users":[],"active":false,"updated":true,"description":"test","compliance":"enforce","policyCriterias":[],"tenantId":-1234,"profileId":33,"deviceGroups":[],"policyType":"GENERAL"}] [admin] - Policy deleted
[2023-06-15 00:35:12,768]  INFO - [UPDATE_POLICY_PRIORITIES] [] [carbon.super] [-1234] [[{"id":65,"priorityId":1,"generic":false,"active":false,"updated":false,"tenantId":0,"profileId":0},{"id":34,"priorityId":2,"generic":false,"active":false,"updated":false,"tenantId":0,"profileId":0}]] [admin] - Policy priorities updated
[2023-06-15 00:35:25,395]  INFO - [PUBLISH_CHANGES] [] [carbon.super] [-1234] [] [admin] - Apply changes to device
```
**3. Device enrollment history events** - logs for device enrollment and dis-enrollment

Pattern :
{DateTime} {LogLevel} - {DeviceId} {DeviceType} {Owner} {Ownership} {TenantId} {TenantDomain} {UserName} - log_message

```
[2023-06-15 00:12:09,078]  INFO - [97] [android] [admin] [BYOD] [-1234] [carbon.super] [admin] - Device enrolled successfully
[2023-06-15 00:47:36,278]  INFO - [97] [android] [admin] [BYOD] [-1234] [carbon.super] [admin] - Device disenrolled successfully
```

**4. App install events** - logs for app installation and uninstallation

Pattern :
{DateTime} {LogLevel} - {AppId} {AppName} {AppType} {SubType} {Action} {Device} {TenantId} {TenantDomain} {UserName} - log_message

```
[2023-06-15 00:15:12,550]  INFO - [1] [Calculator] [PUBLIC] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - App install triggered
[2023-06-15 00:46:24,454]  INFO - [2] [Sololearn] [ENTERPRISE] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - App install triggered
[2023-06-15 00:46:40,498]  INFO - [3] [Engineering] [WEB_CLIP] [DEVICE] [install] [deviceId {id='675c60a9d31492d6', type='android'}] [-1234] [carbon.super] [admin] - Web app install triggered
```

* proprietary/product-uem#6

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Reviewed-on: #136
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>

ce4276c93a pom.xml updated by pull

88356c57aa Add hierarchical grouping feature

32e5456f21 fixes line issues

d842fc4085 remove unnecessary imports, fixes line issues

13545f1c7c remove unnecessary code lines

cd9d127a5e remove unnecessary variable, change error msg

7d05446a38 add error log

4a239887cb add try with resources

ae13169377 add rollback

4c1963a32b [maven-release-plugin] prepare release v5.0.26

48801a3b8e [maven-release-plugin] prepare for next development iteration

566942694c Remove apim_reserved_user when fetching users

c6cc0f9a67 Fix incorrect clear app scope

cfe7e520ab iOS user enrollment support

Fixes https://roadmap.entgra.net/issues/10149

8b928a4aca Remove unwanted check in billing logic

Co-authored-by: Oshani Silva <oshani@entgra.io>
Co-committed-by: Oshani Silva <oshani@entgra.io>

19048ef341 Add SCEP support

fixes https://roadmap.entgra.net/issues/10042

1e252dd67f Fix issue with Nginx not recognizing the SCEP client certificate (#105 )

Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: #105
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Co-committed-by: Pahansith Gunathilake <pahansith@entgra.io>

a603a69f3e OTP for enrollment with Mutual TLS

Fixes https://roadmap.entgra.net/issues/10093

84563078d3 Add tenant based storing and loading SCEP certificates

9a55a83af4 Add OTP based remote session implementation

2dd804f1a8 Add the logic to save device id to certificate DB

partialy fixes https://roadmap.entgra.net/issues/10145

6299d0fd83 Add otp token

469c4988c5 Remove unnecessary logs

e979130e55 Fix missing imports

f9b9f76a3c Fix skip app release error

5a8bcf6711 Add device enrolment log for modifyenrolment

729f1fd85f Update invite link

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: #153
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>

da6f7158cf add api for get visible roles

50beae1bf8 Remove the user has role validation

1844db87d8 Improve app visibility restricting functionality

Co-authored-by: Nishan Sangeeth <nishan@entgra.io>
Co-committed-by: Nishan Sangeeth <nishan@entgra.io>

d90c5c459a Remove reserved_user when fetching users

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
* proprietary/product-uem#15

Co-authored-by: prathabanKavin <kavinprathaban025@gmail.com>
Reviewed-on: #160
Co-authored-by: Kavin Prathaban <kavin@entgra.io>
Co-committed-by: Kavin Prathaban <kavin@entgra.io>

fde6de94bb fix: sub tenants grouping issue

0581151248 add: super-tenant admin check

b682e77d34 fix: group assigned role issue

3dc567fcfe Fix transaction initiating issue

a1ae369fe5 Fix realm service unbinding issues

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: #169
Co-authored-by: Thilina Sandaruwan <thilina@entgra.io>
Co-committed-by: Thilina Sandaruwan <thilina@entgra.io>

087a9fe728 Fix dependency importing issue

ef2838414a Fix build failure

dc6bbdd282 Improve functionality and fix formatting issues

8b967cee4c Add missing ios scopes in mdm-ui-config

f72166895f Fix class not found error in analytics component

f2243ebd0e Fix formatting issue

ac3e144437 Fix OSGI service unbinding issue

b7f077e639 Implement service for consumer rest APIs

Co-authored-by: Pasindu Rupasinghe <pasindu@entgra.io>
Co-committed-by: Pasindu Rupasinghe <pasindu@entgra.io>

958f4e43d6 Add Consumer REST API integration

29a8dd5fde Add API app registering refactored code

52fd8c4b89 Add Application key generating logic

da4f3f1456 Add API integration

2125519aa6 Add todo Comments

8880ef99db Improve APIM application key generate method

83780c6a0c Add improvements to APIM application creating logic

8ea4932019 Fixes in JWT token generation

d567209c11 Fixes in JWT token generation and sync with upstream apim420 branch

8215186061 Revert "Fixes in JWT token generation and sync with upstream apim420 branch"

This reverts commit d567209c11, reversing
changes made to 437c0e642d.

04b4142ece Merge pull request 'Revert "Fixes in JWT token generation and sync with upstream apim420 branch"' (#14 ) from revert into apim420

Reviewed-on: tcdlpds/device-mgt-core#14

fe58a16d17 sync with upstream apim420

7dfcb418f4 Fix jwt token generation

b0d5fc29d5 Fix JWT token generation.

d021b43086 Merge pull request 'Fix test cases failing issue' (#183 ) from tcdlpds/device-mgt-core:sync-master into apim420

Reviewed-on: #183

2d296a3453 Implement map application keys using dcr response

b0f1964760 Implement map application keys using dcr response

8289db1af8 Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into sync-master

0333082716 Sync with master branch

938190deca Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420

046c1faf77 Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420

a17c5c27ab Fix test case failure

f117e40fc9 Fix SSO related issues

da1f9d2437 Fix admin user details getting issue

7e65d9f980 Fix access token validating issue

907d4b0316 Implement method for updateGrantType rest call

870603ee16 Implement method for updateGrantType rest call

5848d68c63 Add app updating intial changes

43ef843db5 Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420

bb879f52ce Fix grant type update method

b3a0d8e931 Fix grant type update method

317af213be Merge branch 'apim420' of https://repository.entgra.net/tcdlpds/device-mgt-core into apim420

088642e7ce Improve API app registration

500fa0df98 Add improvements to app registering logic

ac0ba00707 Remove unnecessary sources

cc6bbf1435 Improvements in App registration

6b2d77f33e Improvements in App registration flow

144170c4c9 Fix sso loging app creation payload

e128a2479f Clear unused method

518bc7271a Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420

a46ab4c355 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420

383eed95e8 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into sync-master

26a2950f85 Fix webapp publisher issues

c7494bcd81 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420

bfae0e0de8 Sync apim420 branch with master branch

Reviewed-on: #261

0dd57b8dd5 Fix sso login app creation payload and remove unused methods

66bc7e88bd Sync with upstream

7376ff0476 Merge pull request 'Sync with upstream apim420' (#21 ) from sync-upstream into apim420

Reviewed-on: tcdlpds/device-mgt-core#21

52b2cccf9f Upgrade apache http client version

1bc89dd3e4 Fix conflicts

fb859f046d Add upstream changes

d4f9472e48 Fix build failure

2d9352a788 Upgrade with latest http client

717667126c revert 52b2cccf9f

revert Upgrade apache http client version

db3555f59e Upgrade

66eac3c744 Fix compilation issues in user handler

8c841dfc2e Fix login handler

7007558623 Fix OTP request handler

8bf027f2b3 Fix invoker handler

56033e2e3a Fix build failure

1013831507 Add APIM devportal API integration

122f3f16f1 Sync with master

54ca87c9db Need to fix http client update

cac6982d6b Sync with master

b8e8450108 Http update fixes

9a84a15368 Http Client update bug fixes.

6a12911487 Sync with master

c48944b20a Resolve conflicts when syncing with master

aba133503d Sync with master branch

1d0a087734 Fix JITEnrollmentCallbackHandler bugs after httpclient update

5ad0734b7b Fix import issue in webapp publisher

55d9a735f8 Fix JITEnrollmentCallbackHandler bugs after httpclient update

cc21c661ae Fix UI issue from interceptor side

c55508c35d Fix UI issue from interceptor side

e2f2237b2d Fix log class loading issue

51199fbb70 Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-core into apim420

94905d020d Fix custom log printing issue

00d79ae6d9 Fix custom log printing issue

86f78f0a86 Fix Role Management Service loger issues

ce18849691 Fix Role Management Service logger issues

f7f0a4a2a4 Fix user scopes payload issue

d57c0a2ab1 Fix user scopes payload issue

67975ea5f8 Merge branch 'master' of ssh://repository.entgra.net:222/community/device-mgt-core into apim420

d938195373 Fix osgi reference addings in Service components

1a9782c3f3 Fix dependency issues

14554ba161 Fix sql issues

e67dcd5ca2 Sync with master

6022d12a96 Sync apim420 branch with master

47bc27a36d Minor fixes in application registration flow

2ecfc5c274 Add minor fixes in application registration flow

de1de88e4a Sync with master

4b39d46bc2 Sync with master

b6c4cb66f5 Improve logger dependencies

fdf5c62204 Fix scope issue with code grant type

f8d2ffe5f8 Fix API invoking issue via invoker

6b79abeaeb Fix Osgi issues

8a74de0235 Fix OSGI issues

3fea1ae32c Restore osgi.framework version

3765528843 Restore osgi.framework version

58989472c9 Fix import issues in certificate management core

1c514d4edf Fix import issues in certificate management core

e67630feeb Upgrade wso2 tomcat version

4e4ff9c960 Improve dependencies

202b9b7016 Upgrade versions of dependencies

f03cae09fe Sync with master branch

635da5c18a Sync with master branch

d1661e3f6d Sync with master

177b8cc831 Sync with master

synced-apim420 #383

Purpose