community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Requested Modifications

Browse Source
This commit is contained in:
Kamidu Sachith 2015-10-12 18:11:44 +05:30
parent d932522d37
commit 743f394fb9
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/identity-extensions/backend-oauth-authenticator/src/main/java/org/wso2/carbon/identity/authenticator/backend/oauth/validator/impl/ExternalOAuthValidator.java
View File

@ -58,27 +58,27 @@ public class ExternalOAuthValidator implements OAuth2TokenValidator{
accessToken.setTokenType(OauthAuthenticatorConstants.BEARER_TOKEN_TYPE);
accessToken.setIdentifier(token);
validationRequest.setAccessToken(accessToken);
OAuth2TokenValidationServiceStub validationService =
OAuth2TokenValidationServiceStub tokenValidationService =
new OAuth2TokenValidationServiceStub(hostURL);
ServiceClient client = validationService._getServiceClient();
ServiceClient client = tokenValidationService._getServiceClient();
Options options = client.getOptions();
List<Header> list = new ArrayList<>();
List<Header> headerList = new ArrayList<>();
Header header = new Header();
header.setName(HTTPConstants.HEADER_AUTHORIZATION);
header.setValue(OauthAuthenticatorConstants.AUTHORIZATION_HEADER_PREFIX_BEARER+ " " + token);
list.add(header);
options.setProperty(org.apache.axis2.transport.http.HTTPConstants.HTTP_HEADERS, list);
headerList.add(header);
options.setProperty(org.apache.axis2.transport.http.HTTPConstants.HTTP_HEADERS, headerList);
client.setOptions(options);
OAuth2ClientApplicationDTO respond =
validationService.findOAuthConsumerIfTokenIsValid(validationRequest);
boolean isValid = respond.getAccessTokenValidationResponse().getValid();
OAuth2ClientApplicationDTO clientApplicationDTO =
tokenValidationService.findOAuthConsumerIfTokenIsValid(validationRequest);
boolean isValid = clientApplicationDTO.getAccessTokenValidationResponse().getValid();
String userName = null;
String tenantDomain = null;
if(isValid){
userName = MultitenantUtils.getTenantAwareUsername(
respond.getAccessTokenValidationResponse().getAuthorizedUser());
clientApplicationDTO.getAccessTokenValidationResponse().getAuthorizedUser());
tenantDomain =
MultitenantUtils.getTenantDomain(respond.getAccessTokenValidationResponse().getAuthorizedUser());
MultitenantUtils.getTenantDomain(clientApplicationDTO.getAccessTokenValidationResponse().getAuthorizedUser());
}
return new OAuthValidationResponse(userName,tenantDomain,isValid);
}

8
components/identity-extensions/backend-oauth-authenticator/src/main/java/org/wso2/carbon/identity/authenticator/backend/oauth/validator/impl/LocalOAuthValidator.java
View File

@ -44,16 +44,16 @@ public class LocalOAuthValidator implements OAuth2TokenValidator {
accessToken.setIdentifier(token);
validationRequest.setAccessToken(accessToken);
OAuth2TokenValidationService validationService = new OAuth2TokenValidationService();
OAuth2ClientApplicationDTO respond = validationService.
OAuth2ClientApplicationDTO clientApplicationDTO = validationService.
findOAuthConsumerIfTokenIsValid(validationRequest);
boolean isValid = respond.getAccessTokenValidationResponse().isValid();
boolean isValid = clientApplicationDTO.getAccessTokenValidationResponse().isValid();
String userName = null;
String tenantDomain = null;
if(isValid){
userName = MultitenantUtils.getTenantAwareUsername(
respond.getAccessTokenValidationResponse().getAuthorizedUser());
clientApplicationDTO.getAccessTokenValidationResponse().getAuthorizedUser());
tenantDomain =
MultitenantUtils.getTenantDomain(respond.getAccessTokenValidationResponse().getAuthorizedUser());
MultitenantUtils.getTenantDomain(clientApplicationDTO.getAccessTokenValidationResponse().getAuthorizedUser());
}
return new OAuthValidationResponse(userName,tenantDomain,isValid);
}