Merge pull request #182 from Thisara-Welmilla/improve-tenant-qualifie…

…d-URL Improve tenant resolving with tenant qualified URL enabled
wso2 · Oct 16, 2023 · 60721bd · 60721bd
2 parents 638897a + 2aa6620
commit 60721bd
Show file tree

Hide file tree

Showing 14 changed files with 30 additions and 30 deletions.
diff --git a/...n/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java b/...n/java/org/wso2/carbon/identity/rest/api/user/application/v1/core/ApplicationService.java
@@ -33,6 +33,7 @@
 import org.wso2.carbon.identity.core.model.ExpressionNode;
 import org.wso2.carbon.identity.core.model.FilterTreeBuilder;
 import org.wso2.carbon.identity.core.model.Node;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.application.v1.core.function.ApplicationBasicInfoToApiModel;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.ApplicationListResponse;
 import org.wso2.carbon.identity.rest.api.user.application.v1.model.ApplicationResponse;
@@ -71,7 +72,7 @@ public ApplicationResponse getApplication(String applicationId) {
 
  try {
 
- String tenantDomain = ContextLoader.getTenantDomainFromContext();
+ String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
  ApplicationBasicInfo applicationBasicInfo = ApplicationServiceHolder.getDiscoverableApplicationManager()
  .getDiscoverableApplicationBasicInfoByResourceId(applicationId, tenantDomain);
  if (applicationBasicInfo == null) {
@@ -104,7 +105,7 @@ public ApplicationListResponse getApplications(String attributes, Integer limit,
 
  handleNotImplementedCapabilities(attributes, sortOrder, sortBy);
 
- String tenantDomain = ContextLoader.getTenantDomainFromContext();
+ String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
  String filterFormatted = buildFilter(filter);
  try {
  List<ApplicationBasicInfo> applicationBasicInfos = ApplicationServiceHolder

diff --git a/...ain/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/MeApiServiceImpl.java b/...ain/java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/MeApiServiceImpl.java
@@ -2,9 +2,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.association.v1.MeApiService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.core.UserAssociationService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.dto.AssociationUserRequestDTO;
@@ -86,7 +86,7 @@ private String getFullyQualifiedUsernameFromContext() {
  private String getFullyQualifiedUserName(String userId) {
 
  User user = new UniqueIdToUser().apply(UserAssociationServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
  return user.toFullQualifiedUsername();
  }
 

diff --git a/...java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/UserIdApiServiceImpl.java b/...java/org/wso2/carbon/identity/rest/api/user/association/v1/impl/UserIdApiServiceImpl.java
@@ -1,9 +1,9 @@
 package org.wso2.carbon.identity.rest.api.user.association.v1.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.association.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.core.UserAssociationService;
 import org.wso2.carbon.identity.rest.api.user.association.v1.util.UserAssociationServiceHolder;
@@ -34,7 +34,7 @@ public Response userIdAssociationsGet(String userId) {
  private String getUser(String userId) {
 
  User user = new UniqueIdToUser().apply(UserAssociationServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
  return user.toFullQualifiedUsername();
  }
 

diff --git a/.../org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/UserIdApiServiceImpl.java b/.../org/wso2/carbon/identity/rest/api/user/authorized/apps/v1/impl/UserIdApiServiceImpl.java
@@ -18,9 +18,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.core.AuthorizedAppsService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v1.dto.AuthorizedAppDTO;
@@ -74,6 +74,6 @@ public Response listUserAuthorizedAppsByAppId(String userId, String applicationI
 
  private User getUser(String userId) {
 
- return new UniqueIdToUser().apply(realmService, userId, ContextLoader.getTenantDomainFromContext());
+ return new UniqueIdToUser().apply(realmService, userId, IdentityTenantUtil.resolveTenantDomain());
  }
 }
diff --git a/...org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/core/AuthorizedAppsService.java b/...org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/core/AuthorizedAppsService.java
@@ -23,7 +23,6 @@
 import org.apache.commons.logging.LogFactory;
 
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.common.function.UserToUniqueId;
@@ -234,7 +233,7 @@ public List<AuthorizedAppDTO> listUserAuthorizedApps(User user) {
  */
  public void deleteIssuedTokensByAppId(String applicationId) {
 
- String tenantDomain = ContextLoader.getTenantDomainFromContext();
+ String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
  ServiceProvider application = getServiceProvider(applicationId, tenantDomain);
 
  // Extract the inbound authentication request config for the given inbound type.

diff --git a/.../org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/UserIdApiServiceImpl.java b/.../org/wso2/carbon/identity/rest/api/user/authorized/apps/v2/impl/UserIdApiServiceImpl.java
@@ -18,9 +18,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.core.AuthorizedAppsService;
 import org.wso2.carbon.identity.rest.api.user.authorized.apps.v2.dto.AuthorizedAppDTO;
@@ -75,6 +75,6 @@ public Response listUserAuthorizedAppsByAppId(String userId, String applicationI
 
  private User getUser(String userId) {
 
- return new UniqueIdToUser().apply(realmService, userId, ContextLoader.getTenantDomainFromContext());
+ return new UniqueIdToUser().apply(realmService, userId, IdentityTenantUtil.resolveTenantDomain());
  }
 }
diff --git a/...n/java/org/wso2/carbon/identity/rest/api/user/challenge/v1/core/UserChallengeService.java b/...n/java/org/wso2/carbon/identity/rest/api/user/challenge/v1/core/UserChallengeService.java
@@ -21,10 +21,10 @@
 import org.wso2.carbon.identity.api.user.challenge.common.ChallengeQuestionServiceHolder;
 import org.wso2.carbon.identity.api.user.challenge.common.Constant;
 import org.wso2.carbon.identity.api.user.common.Constants;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryClientException;
 import org.wso2.carbon.identity.recovery.IdentityRecoveryException;
 import org.wso2.carbon.identity.recovery.model.ChallengeQuestion;
@@ -65,7 +65,7 @@ public List<ChallengeSetDTO> getChallengesForUser(User user, Integer offset, Int
 
  try {
  return buildChallengesDTO(ChallengeQuestionServiceHolder.getChallengeQuestionManager()
- .getAllChallengeQuestionsForUser(ContextLoader.getTenantDomainFromContext(), user), offset, limit);
+ .getAllChallengeQuestionsForUser(IdentityTenantUtil.resolveTenantDomain(), user), offset, limit);
  } catch (IdentityRecoveryException e) {
  throw handleIdentityRecoveryException(e,
  Constant.ErrorMessage.ERROR_CODE_ERROR_RETRIEVING_CHALLENGES_FOR_USER);

diff --git a/...n/java/org/wso2/carbon/identity/rest/api/user/challenge/v1/impl/UserIdApiServiceImpl.java b/...n/java/org/wso2/carbon/identity/rest/api/user/challenge/v1/impl/UserIdApiServiceImpl.java
@@ -20,9 +20,9 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.identity.api.user.challenge.common.ChallengeQuestionServiceHolder;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.function.UniqueIdToUser;
 import org.wso2.carbon.identity.application.common.model.User;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.challenge.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.challenge.v1.core.UserChallengeService;
 import org.wso2.carbon.identity.rest.api.user.challenge.v1.dto.ChallengeAnswerDTO;
@@ -108,6 +108,6 @@ private URI getUserChallengeAnswersLocation(String userId) {
  private User getUser(String userId) {
 
  return new UniqueIdToUser().apply(ChallengeQuestionServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
  }
 }
diff --git a/...api.user.common/src/main/java/org/wso2/carbon/identity/api/user/common/ContextLoader.java b/...api.user.common/src/main/java/org/wso2/carbon/identity/api/user/common/ContextLoader.java
@@ -79,7 +79,7 @@ public static String getUsernameFromContext() {
  */
  public static User getUserFromContext() {
 
- return getUser(getTenantDomainFromContext(), getUsernameFromContext());
+ return getUser(IdentityTenantUtil.resolveTenantDomain(), getUsernameFromContext());
  }
 
 
@@ -166,7 +166,8 @@ public static org.wso2.carbon.identity.application.common.model.User getUser(org
  public static URI buildURI(String endpoint) {
 
  String tenantQualifiedRelativePath =
- String.format(TENANT_CONTEXT_PATH_COMPONENT, getTenantDomainFromContext()) + USER_API_PATH_COMPONENT;
+ String.format(TENANT_CONTEXT_PATH_COMPONENT, IdentityTenantUtil.resolveTenantDomain()) +
+ USER_API_PATH_COMPONENT;
  String url = tenantQualifiedRelativePath + endpoint;
  return URI.create(url);
  }
@@ -228,7 +229,7 @@ private static String getContext(String endpoint) {
  if (IdentityTenantUtil.isTenantQualifiedUrlsEnabled()) {
  context = USER_API_PATH_COMPONENT + endpoint;
  } else {
- context = String.format(TENANT_CONTEXT_PATH_COMPONENT, getTenantDomainFromContext()) +
+ context = String.format(TENANT_CONTEXT_PATH_COMPONENT, IdentityTenantUtil.resolveTenantDomain()) +
  USER_API_PATH_COMPONENT + endpoint;
  }
  return context;

diff --git a/.../java/org/wso2/carbon/identity/rest/api/user/idv/v1/core/IdentityVerificationService.java b/.../java/org/wso2/carbon/identity/rest/api/user/idv/v1/core/IdentityVerificationService.java
@@ -27,7 +27,6 @@
 import org.wso2.carbon.extension.identity.verification.mgt.model.IdVProperty;
 import org.wso2.carbon.extension.identity.verification.mgt.model.IdentityVerifierData;
 import org.wso2.carbon.extension.identity.verification.mgt.utils.IdentityVerificationConstants;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.error.APIError;
 import org.wso2.carbon.identity.api.user.common.error.ErrorResponse;
 import org.wso2.carbon.identity.api.user.idv.common.Constants;
@@ -415,7 +414,7 @@ private String includeData(Constants.ErrorMessage error, String data) {
 
  private int getTenantId() {
 
- String tenantDomain = ContextLoader.getTenantDomainFromContext();
+ String tenantDomain = IdentityTenantUtil.resolveTenantDomain();
  if (StringUtils.isBlank(tenantDomain)) {
  throw handleException(
  Response.Status.INTERNAL_SERVER_ERROR,

diff --git a/...r.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/core/MFAService.java b/...r.mfa.v1/src/main/java/org/wso2/carbon/identity/rest/api/user/mfa/v1/core/MFAService.java
@@ -148,7 +148,7 @@ private String getUserName() {
 
  private String getTenantDomain() {
 
- return ContextLoader.getTenantDomainFromContext();
+ return IdentityTenantUtil.resolveTenantDomain();
  }
 
  /**

diff --git a/...n/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java b/...n/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/SessionsApiServiceImpl.java
@@ -17,7 +17,7 @@
 package org.wso2.carbon.identity.rest.api.user.session.v1.impl;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.session.v1.SessionsApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SearchResponseDTO;
@@ -35,7 +35,7 @@ public class SessionsApiServiceImpl extends SessionsApiService {
  @Override
  public Response getSessions(String filter, Integer limit, Long since, Long until) {
 
- SearchResponseDTO responseDTO = sessionManagementService.getSessions(ContextLoader.getTenantDomainFromContext(),
+ SearchResponseDTO responseDTO = sessionManagementService.getSessions(IdentityTenantUtil.resolveTenantDomain(),
  filter, limit, since, until);
 
  return Response.ok().entity(responseDTO).build();

diff --git a/...ain/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java b/...ain/java/org/wso2/carbon/identity/rest/api/user/session/v1/impl/UserIdApiServiceImpl.java
@@ -23,9 +23,9 @@
 import org.apache.commons.logging.LogFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.wso2.carbon.context.CarbonContext;
-import org.wso2.carbon.identity.api.user.common.ContextLoader;
 import org.wso2.carbon.identity.api.user.common.Util;
 import org.wso2.carbon.identity.api.user.session.common.util.SessionManagementServiceHolder;
+import org.wso2.carbon.identity.core.util.IdentityTenantUtil;
 import org.wso2.carbon.identity.rest.api.user.session.v1.UserIdApiService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.core.SessionManagementService;
 import org.wso2.carbon.identity.rest.api.user.session.v1.dto.SessionDTO;
@@ -52,7 +52,7 @@ public class UserIdApiServiceImpl extends UserIdApiService {
  public Response getSessionBySessionId(String userId, String sessionId) {
 
  Util.validateUserId(SessionManagementServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
 
  Optional<SessionDTO> session = sessionManagementService.getSessionBySessionId(userId, sessionId);
  if (session.isPresent()) {
@@ -66,7 +66,7 @@ public Response getSessionBySessionId(String userId, String sessionId) {
  public Response getSessionsByUserId(String userId, Integer limit, Integer offset, String filter, String sort) {
 
  Util.validateUserId(SessionManagementServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
 
  SessionsDTO sessionsOfUser = sessionManagementService.getSessionsByUserId(userId, limit, offset, filter, sort);
  if (sessionsOfUser == null || sessionsOfUser.getSessions().isEmpty()) {
@@ -80,7 +80,7 @@ public Response getSessionsByUserId(String userId, Integer limit, Integer offset
  public Response terminateSessionBySessionId(String userId, String sessionId) {
 
  Util.validateUserId(SessionManagementServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
  sessionManagementService.terminateSessionBySessionId(userId, sessionId);
  return Response.noContent().build();
  }
@@ -112,7 +112,7 @@ public Response terminateSessionsByUserId(String userId) {
  }
 
  Util.validateUserId(SessionManagementServiceHolder.getRealmService(), userId,
- ContextLoader.getTenantDomainFromContext());
+ IdentityTenantUtil.resolveTenantDomain());
  sessionManagementService.terminateSessionsByUserId(userId);
  return Response.noContent().build();
  } catch (UserStoreException e) {

diff --git a/pom.xml b/pom.xml
@@ -422,7 +422,7 @@
  <org.apache.felix.annotations.version>1.2.4</org.apache.felix.annotations.version>
  <carbon.kernel.version>4.9.0</carbon.kernel.version>
  <identity.governance.version>1.8.73</identity.governance.version>
- <carbon.identity.framework.version>5.25.90</carbon.identity.framework.version>
+ <carbon.identity.framework.version>5.25.380</carbon.identity.framework.version>
  <carbon.identity.account.association.version>5.3.7</carbon.identity.account.association.version>
  <maven.findbugsplugin.version>3.0.5</maven.findbugsplugin.version>
  <carbon.business-process.version>4.5.2</carbon.business-process.version>