KeyManager Restriction in KeyType call

wso2 · Oct 20, 2023 · f8d34ac · f8d34ac
1 parent 879bd66
commit f8d34ac
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/...c/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApplicationsApiServiceImpl.java b/...c/main/java/org/wso2/carbon/apimgt/rest/api/store/v1/impl/ApplicationsApiServiceImpl.java
@@ -1026,11 +1026,12 @@ public Response applicationsApplicationIdKeysKeyTypePut(String applicationId, St
         String username = RestApiCommonUtil.getLoggedInUsername();
         try {
             APIConsumer apiConsumer = APIManagerFactory.getInstance().getAPIConsumer(username);
-            Application application = apiConsumer.getApplicationByUUID(applicationId);
-            if (!(apiConsumer.isKeyManagerAllowedForUser(body.getKeyManager(), username))) {
+            if (!(apiConsumer.isKeyManagerByNameAllowedForUser(body.getKeyManager(),
+                    MultitenantUtils.getTenantDomain(username), username))) {
                 throw new APIManagementException("Key Manager is permission restricted",
                         ExceptionCodes.KEY_MANAGER_RESTRICTED_FOR_USER);
             }
+            Application application = apiConsumer.getApplicationByUUID(applicationId);
             if (application != null) {
                 if (RestAPIStoreUtils.isUserOwnerOfApplication(application)) {
                     String grantTypes = StringUtils.join(body.getSupportedGrantTypes(), ',');