Skip to content

Commit 38be4b2

Browse files
ShakyaPrHabeebaMinhar
authored andcommitted
fix empty subscriber claim info on tenant users issue
1 parent 7146d88 commit 38be4b2

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

components/apimgt/org.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIProviderImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1745,7 +1745,7 @@ public Map<String, String> getSubscriberClaims(String subscriber) throws APIMana
17451745
tenantId = getTenantId(tenantDomain);
17461746
UserStoreManager userStoreManager = ServiceReferenceHolder.getInstance().getRealmService().
17471747
getTenantUserRealm(tenantId).getUserStoreManager();
1748-
if (userStoreManager.isExistingUser(subscriber)) {
1748+
if (userStoreManager.isExistingUser(MultitenantUtils.getTenantAwareUsername(subscriber))) {
17491749
subscriberClaims = APIUtil.getClaims(subscriber, tenantId, ClaimsRetriever.DEFAULT_DIALECT_URI);
17501750
APIManagerConfiguration configuration = getAPIManagerConfiguration();
17511751
configuredClaims = configuration.getFirstProperty(APIConstants.API_PUBLISHER_SUBSCRIBER_CLAIMS);

components/apimgt/org.wso2.carbon.apimgt.impl/src/test/java/org/wso2/carbon/apimgt/impl/APIProviderImplTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,6 +545,7 @@ public void testGetSubscriberClaims() throws APIManagementException, UserStoreEx
545545
PowerMockito.when(realmService.getTenantUserRealm(-1234)).thenReturn(userRealm);
546546
PowerMockito.when(userRealm.getUserStoreManager()).thenReturn(userStoreManager);
547547
PowerMockito.when(userStoreManager.isExistingUser("admin")).thenReturn(true);
548+
PowerMockito.when(MultitenantUtils.getTenantAwareUsername("admin")).thenReturn("admin");
548549

549550
SortedMap<String, String> claimValues = new TreeMap<String, String>();
550551
claimValues.put("claim1", "http://wso2.org/claim1");

0 commit comments

Comments
 (0)