shamalka1
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

few changes after testing multi tenancy

Browse Source
revert-70aa11f8
ayyoob 8 years ago
parent de47812d6d
commit 38f61adf94
9 changed files with 26 additions and 32 deletions
Show Stats Download Patch File Download Diff File

1
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/internal/APIApplicationManagerExtensionServiceComponent.java
Unescape View File

@ -49,6 +49,7 @@ import org.wso2.carbon.user.core.service.RealmService;
* policy="dynamic"
* bind="setRealmService"
* unbind="unsetRealmService"
* @scr.reference name="integration.client.service"
* interface="org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService"
* cardinality="1..1"
* policy="dynamic"

1
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
Unescape View File

@ -55,7 +55,6 @@
feign.codec,
feign.auth,
feign.gson,
javax.ws.rs,
javax.xml.bind,
javax.xml.bind.annotation,
javax.xml.parsers;resolution:=optional,

38
components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
Unescape View File

@ -87,27 +87,27 @@
org.apache.commons.logging,
org.osgi.service.component,
org.wso2.carbon.device.mgt.oauth.extensions.*,
org.wso2.carbon.identity.application.common.model,
org.wso2.carbon.identity.oauth.callback,
org.wso2.carbon.identity.oauth2,
org.wso2.carbon.identity.oauth2.model,
org.wso2.carbon.identity.oauth2.validators,
org.wso2.carbon.identity.application.common.model;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth.callback;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.model;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.validators;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.user.api,
org.wso2.carbon.user.core.service,
org.wso2.carbon.user.core.tenant,
org.json.simple,
javax.cache,
org.wso2.carbon.identity.core.util,
org.wso2.carbon.identity.oauth2.dto,
org.wso2.carbon.identity.oauth2.token,
org.wso2.carbon.identity.core.util;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.dto;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.token;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.utils,
org.wso2.carbon.context,
org.wso2.carbon.identity.oauth.cache,
org.wso2.carbon.identity.oauth.config,
org.wso2.carbon.identity.oauth2.dao,
org.wso2.carbon.identity.oauth.cache;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth.config;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.dao;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.utils.multitenancy,
org.apache.commons.codec.binary;version="${commons-codec.wso2.osgi.version.range}",
org.wso2.carbon.identity.application.authentication.framework.model,
org.wso2.carbon.identity.application.authentication.framework.model;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.base,
org.apache.commons.collections,
org.apache.commons.lang,
@ -116,15 +116,15 @@
org.opensaml.security,
org.opensaml.xml.*,
org.w3c.dom,
org.wso2.carbon.identity.application.common.util,
org.wso2.carbon.identity.base,
org.wso2.carbon.identity.oauth2.token.handlers.grant.*,
org.wso2.carbon.identity.oauth2.util,
org.wso2.carbon.idp.mgt,
org.wso2.carbon.identity.application.common.util;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.base;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.token.handlers.grant.*;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.identity.oauth2.util;version="${carbon.identity.framework.version.range}",
org.wso2.carbon.idp.mgt;version="${carbon.identity.framework.version.range}",
org.opensaml.common.xml,
org.wso2.carbon.identity.oauth.common,
org.wso2.carbon.identity.oauth.common;version="${carbon.identity.framework.version.range}",
org.opensaml,
org.wso2.carbon.apimgt.keymgt.issuers
org.wso2.carbon.apimgt.keymgt.*;version="${carbon.api.mgt.version.range}"
</Import-Package>
</instructions>
</configuration>

4
components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/src/main/java/org/wso2/carbon/device/mgt/oauth/extensions/handlers/grant/ExtendedSAML2BearerGrantHandler.java
Unescape View File

@ -38,7 +38,7 @@ import org.opensaml.xml.security.x509.X509Credential;
import org.opensaml.xml.signature.SignatureValidator;
import org.opensaml.xml.validation.ValidationException;
import org.w3c.dom.NodeList;
import org.wso2.carbon.apimgt.keymgt.issuers.ScopesIssuingHandler;
import org.wso2.carbon.apimgt.keymgt.ScopesIssuer;
import org.wso2.carbon.base.MultitenantConstants;
import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticatedUser;
import org.wso2.carbon.identity.application.common.model.FederatedAuthenticatorConfig;
@ -101,7 +101,7 @@ public class ExtendedSAML2BearerGrantHandler extends AbstractAuthorizationGrantH
@Override
public boolean validateScope(OAuthTokenReqMessageContext tokReqMsgCtx) {
return ScopesIssuingHandler.getInstance().setScopes(tokReqMsgCtx);
return ScopesIssuer.getInstance().setScopes(tokReqMsgCtx);
}
/**

2
components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/main/java/org/wso2/carbon/webapp/authenticator/framework/authenticator/BasicAuthAuthenticator.java
Unescape View File

@ -73,7 +73,7 @@ public class BasicAuthAuthenticator implements WebappAuthenticator {
boolean authenticated = userStore.authenticate(username, credentials.getPassword());
if (authenticated) {
authenticationInfo.setStatus(Status.CONTINUE);
authenticationInfo.setUsername(credentials.getUsername());
authenticationInfo.setUsername(username);
authenticationInfo.setTenantDomain(Utils.getTenantDomain(tenantId));
authenticationInfo.setTenantId(tenantId);
} else {

4
features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml
Unescape View File

@ -102,10 +102,6 @@
org.wso2.carbon.devicemgt:org.wso2.carbon.apimgt.integration.client:${project.version}
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.version}
</importFeatureDef>
</importFeatures>
</configuration>
</execution>
</executions>

4
features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml
Unescape View File

@ -106,10 +106,6 @@
net.minidev:json-smart:${json.smart.version}
</bundleDef>
</bundles>
<importFeatures>
<importFeatureDef>org.wso2.carbon.core.server:${carbon.kernel.449.version}
</importFeatureDef>
</importFeatures>
</configuration>
</execution>
</executions>

1
features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/src/main/resources/conf/webapp-authenticator-config.xml
Unescape View File

@ -21,6 +21,7 @@
<ClassName>org.wso2.carbon.webapp.authenticator.framework.authenticator.JWTAuthenticator</ClassName>
<Parameters>
<!--Issuers list and corresponding cert alias-->
<Parameter Name="default">wso2carbon</Parameter>
<Parameter Name="wso2.org/products/am">wso2carbon</Parameter>
<Parameter Name="wso2.org/products/iot">wso2carbon</Parameter>
<Parameter Name="wso2.org/products/analytics">wso2carbon</Parameter>

3
pom.xml
Unescape View File

@ -1766,6 +1766,7 @@
<!-- Carbon Identity -->
<carbon.identity.framework.version>5.7.0</carbon.identity.framework.version>
<carbon.identity.framework.version.range>[5.0.0, 6.0.0)</carbon.identity.framework.version.range>
<identity.inbound.auth.oauth.version>5.3.1</identity.inbound.auth.oauth.version>
<identity.inbound.auth.saml.version>5.3.0</identity.inbound.auth.saml.version>
@ -1797,7 +1798,7 @@
<commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range>
<!-- Carbon API Management -->
<carbon.api.mgt.version>6.1.35</carbon.api.mgt.version>
<carbon.api.mgt.version>6.1.60</carbon.api.mgt.version>
<carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
<!-- Carbon Analytics Commons -->

Write Preview
Loading…
Cancel
Save