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

Merge pull request 'Fix invalid admin credentials issue in token endpoint' (#16) from vigneshan/device-mgt-core:fix/key-mgt-api into master

Browse Source 
Reviewed-on: https://repository.entgra.net/community/device-mgt-core/pulls/16
This commit is contained in:
Pahansith Gunathilake 2022-11-23 09:30:23 +00:00
commit 002dc090ea
3 changed files with 1 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.api/src/main/java/org/wso2/carbon/apimgt/keymgt/extension/api/KeyManagerService.java
View File

@ -40,8 +40,6 @@ public interface KeyManagerService {
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Path("/token")
Response generateAccessToken(@HeaderParam("Authorization") String basicAuthHeader,
@FormParam("client_id") String clientId,
@FormParam("client_secret") String clientSecret,
@FormParam("refresh_token") String refreshToken,
@FormParam("scope") String scope,
@FormParam("grant_type") String grantType,

2
components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.api/src/main/java/org/wso2/carbon/apimgt/keymgt/extension/api/KeyManagerServiceImpl.java
View File

@ -63,8 +63,6 @@ public class KeyManagerServiceImpl implements KeyManagerService {
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Path("/token")
public Response generateAccessToken(@HeaderParam("Authorization") String basicAuthHeader,
@FormParam("client_id") String clientId,
@FormParam("client_secret") String clientSecret,
@FormParam("refresh_token") String refreshToken,
@FormParam("scope") String scope,
@FormParam("grant_type") String grantType,

23
components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension/src/main/java/org/wso2/carbon/apimgt/keymgt/extension/service/KeyMgtServiceImpl.java
View File

@ -160,26 +160,6 @@ public class KeyMgtServiceImpl implements KeyMgtService {
String tenantDomain = MultitenantUtils.getTenantDomain(application.getOwner());
// String username, password;
// if (KeyMgtConstants.SUPER_TENANT.equals(tenantDomain)) {
// kmConfig = getKeyManagerConfig();
// username = kmConfig.getAdminUsername();
// password = kmConfig.getAdminPassword();
// } else {
// try {
// username = getRealmService()
// .getTenantUserRealm(-1234).getRealmConfiguration()
// .getRealmProperty("reserved_tenant_user_username") + "@" + tenantDomain;
// password = getRealmService()
// .getTenantUserRealm(-1234).getRealmConfiguration()
// .getRealmProperty("reserved_tenant_user_password");
// } catch (UserStoreException e) {
// msg = "Error while loading user realm configuration";
// log.error(msg);
// throw new KeyMgtException(msg);
// }
// }
RequestBody appTokenPayload;
switch (tokenRequest.getGrantType()) {
case "client_credentials":
@ -197,8 +177,7 @@ public class KeyMgtServiceImpl implements KeyMgtService {
case "refresh_token":
appTokenPayload = new FormBody.Builder()
.add("grant_type", "refresh_token")
.add("refresh_token", tokenRequest.getRefreshToken())
.add("scope", tokenRequest.getScope()).build();
.add("refresh_token", tokenRequest.getRefreshToken()).build();
break;
case "urn:ietf:params:oauth:grant-type:jwt-bearer":
appTokenPayload = new FormBody.Builder()