From 2bd2c836502f614fd4477eb23da34e9c9a872bbc Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe Date: Tue, 17 Aug 2021 10:10:44 +0530 Subject: [PATCH] fixed tenant login issue --- .../emm-community/src/conf/deployment.toml | 13 +++---------- iot-core/src/core/conf/deployment.toml | 17 +++++------------ 2 files changed, 8 insertions(+), 22 deletions(-) diff --git a/distribution/emm-community/src/conf/deployment.toml b/distribution/emm-community/src/conf/deployment.toml index 8473704..49aa8d0 100644 --- a/distribution/emm-community/src/conf/deployment.toml +++ b/distribution/emm-community/src/conf/deployment.toml @@ -277,21 +277,11 @@ permissions="/permission/admin/manage/identity/applicationmgt/create" scopes="internal_application_mgt_create" # ----------------Required for IOT/EMM----------------------- -[[resource.access_control]] -context="(.*)/api/device-mgt/v1.0/(.*)" -secure="true" -http_method="all" - [[resource.access_control]] context="(.*)/api-application-registration/(.*)" secure="true" http_method="all" -[[resource.access_control]] -context="(.*)/api/application-mgt-publisher/v1.0/(.*)" -secure="true" -http_method="all" - [apim.sync_runtime_artifacts.gateway.skip_list] apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml"] sequences = ["_api_registration_fault_.xml"] @@ -309,3 +299,6 @@ grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.Extend name="access_token" grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler" grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator" + +[oauth.token_renewal] +renew_refresh_token=false diff --git a/iot-core/src/core/conf/deployment.toml b/iot-core/src/core/conf/deployment.toml index 4b63f91..dbc9fe3 100644 --- a/iot-core/src/core/conf/deployment.toml +++ b/iot-core/src/core/conf/deployment.toml @@ -277,23 +277,13 @@ permissions="/permission/admin/manage/identity/applicationmgt/create" scopes="internal_application_mgt_create" # ----------------Required for IOT/EMM----------------------- -[[resource.access_control]] -context="(.*)/api/device-mgt/v1.0/(.*)" -secure="true" -http_method="all" - [[resource.access_control]] context="(.*)/api-application-registration/(.*)" secure="true" http_method="all" -[[resource.access_control]] -context="(.*)/api/application-mgt-publisher/v1.0/(.*)" -secure="true" -http_method="all" - [apim.sync_runtime_artifacts.gateway.skip_list] -apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml"] +apis = ["_TokenAPI_.xml", "_API_Application_Registration_.xml", "health-check.xml", "admin--Android-Mutual-SSL-Configuration-Management.xml", "admin--Android-Mutual-SSL-Device-Management.xml", "admin--Android-Mutual-SSL-Event-Receiver.xml", "admin--IOS-Enrollment.xml", "admin--IOS-Enrollment-Authenticate-Agent.xml", "admin--IOS-Enrollment-Profile.xml", "admin--IOS-Enrollment-Profile-DEP.xml", "admin--IOS-Enrollment-Scep.xml", "admin--Windows_8.1_Device_Management_Service.xml", "admin--Windows_8.1_Device_Management_Service_v1.0.0.xml", "admin--Windows_8.1_Enrollment_Service.xml", "admin--Windows_8.1_Enrollment_Service_v1.0.0.xml", "admin--Windows_10_Device_management.xml", "admin--Windows_10_Device_management_v1.0.0.xml", "admin--Windows_10_Enrollment_Service.xml", "admin--Windows_10_Enrollment_Service_v1.0.0.xml", "admin--Windows_Discovery_Service.xml", "admin--Windows_Discovery_Service_v1.0.0.xml", "admin--Windows_Enrollment_policy_Service.xml", "admin--Windows_Enrollment_policy_Service_v1.0.0.xml"] sequences = ["_api_registration_fault_.xml"] [transport.https.properties] @@ -308,4 +298,7 @@ grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.Extend [[oauth.custom_grant_type]] name="access_token" grant_handler="org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.AccessTokenGrantHandler" -grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator" \ No newline at end of file +grant_validator="org.wso2.carbon.device.mgt.oauth.extensions.validators.AccessTokenGrantValidator" + +[oauth.token_renewal] +renew_refresh_token=false