pahansith
/
product-iots
forked from community/product-iots
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed multi tenant login issue

Browse Source
application-manager-new
ayyoob 8 years ago
parent 7286c37533
commit 1b8d52e5e2
7 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File

2
modules/analytics/distribution/src/ues/designer.json
Unescape View File

@ -43,7 +43,7 @@
"password":"admin", "password":"admin",
"dynamicClientAppRegistrationServiceURL": "https://localhost:9443/dynamic-client-web/register", "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/dynamic-client-web/register",
"apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants", "apiManagerClientAppRegistrationServiceURL": "https://localhost:9443/api-application-registration/register/tenants",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-carbon urn:ietf:params:oauth:grant-type:jwt-bearer",
"tokenScope": "admin", "tokenScope": "admin",
"callbackUrl": "https://localhost:9445/portal", "callbackUrl": "https://localhost:9445/portal",
"saasApp":true "saasApp":true

9
modules/core/distribution/identity_config_change.xml
Unescape View File

@ -29,4 +29,13 @@
<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator</GrantTypeValidatorImplClass> <GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth2.grant.jwt.JWTGrantValidator</GrantTypeValidatorImplClass>
</SupportedGrantType>]]></value> </SupportedGrantType>]]></value>
</add> </add>
<add>
<after>//s:Server/s:OAuth/s:SupportedGrantTypes/s:SupportedGrantType[s:GrantTypeName='iwa:ntlm']</after>
<value>
<![CDATA[<SupportedGrantType>
<GrantTypeName>urn:ietf:params:oauth:grant-type:saml2-carbon</GrantTypeName>
<GrantTypeHandlerImplClass>org.wso2.carbon.device.mgt.oauth.extensions.handlers.grant.ExtendedSAML2BearerGrantHandler</GrantTypeHandlerImplClass>
<GrantTypeValidatorImplClass>org.wso2.carbon.identity.oauth.common.SAML2GrantValidator</GrantTypeValidatorImplClass>
</SupportedGrantType>]]></value>
</add>
</processor> </processor>

2
modules/core/distribution/src/repository/conf/identity/service-providers/API_STORE.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/devicemgt.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/conf/identity/service-providers/portal.xml
Unescape View File

@ -44,7 +44,7 @@
</AuthenticationStep> </AuthenticationStep>
</AuthenticationSteps> </AuthenticationSteps>
<UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername> <UseUserstoreDomainInUsername>true</UseUserstoreDomainInUsername>
<UseTenantDomainInUsername>false</UseTenantDomainInUsername> <UseTenantDomainInUsername>true</UseTenantDomainInUsername>
</LocalAndOutBoundAuthenticationConfig> </LocalAndOutBoundAuthenticationConfig>
<RequestPathAuthenticatorConfigs> <RequestPathAuthenticatorConfigs>
</RequestPathAuthenticatorConfigs> </RequestPathAuthenticatorConfigs>

2
modules/core/distribution/src/repository/jaggeryapps/portal/configs/designer.json
Unescape View File

@ -43,7 +43,7 @@
"password":"admin", "password":"admin",
"dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register", "dynamicClientAppRegistrationServiceURL": "https://localhost:9443/client-registration/v0.10/register",
"apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants", "apiManagerClientAppRegistrationServiceURL": "%https.host%/api-application-registration/register/tenants",
"grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer", "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-carbon urn:ietf:params:oauth:grant-type:jwt-bearer",
"tokenScope": "admin", "tokenScope": "admin",
"callbackUrl": "%https.host%/portal", "callbackUrl": "%https.host%/portal",
"saasApp":true "saasApp":true

6
pom.xml
Unescape View File

@ -1529,17 +1529,17 @@
<carbon.governance.version>4.7.0</carbon.governance.version> <carbon.governance.version>4.7.0</carbon.governance.version>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<carbon.device.mgt.version>2.0.7</carbon.device.mgt.version> <carbon.device.mgt.version>2.0.8-SNAPSHOT</carbon.device.mgt.version>
<carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range> <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
<!-- IOT Device Management --> <!-- IOT Device Management -->
<product.iot.version>3.0.0-SNAPSHOT</product.iot.version> <product.iot.version>3.0.0-SNAPSHOT</product.iot.version>
<!-- Carbon Device Management Plugins--> <!-- Carbon Device Management Plugins-->
<carbon.device.mgt.plugin.version>3.0.6</carbon.device.mgt.plugin.version> <carbon.device.mgt.plugin.version>3.0.7-SNAPSHOT</carbon.device.mgt.plugin.version>
<!-- API Management --> <!-- API Management -->
<carbon.api.mgt.version>6.1.35</carbon.api.mgt.version> <carbon.api.mgt.version>6.1.47</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range> <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Mediation --> <!-- Carbon Mediation -->

Write Preview
Loading…
Cancel
Save