VIC-1918: Tenant data in authorised context

virtualidentityag · Nov 1, 2022 · 8e1dac0 · 8e1dac0
1 parent 36c1d11
commit 8e1dac0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 12 deletions.
diff --git a/src/main/java/com/vi/tenantservice/api/facade/TenantServiceFacade.java b/src/main/java/com/vi/tenantservice/api/facade/TenantServiceFacade.java
@@ -93,7 +93,7 @@ public Optional<RestrictedTenantDTO> findTenantBySubdomain(String subdomain, Lon
 
     Optional<Long> tenant = authorisationService.resolveTenantFromRequest(tenantId);
     if (multitenancyWithSingleDomain && tenant.isPresent()) {
-      return getSingleDomainSpecificTenantData(tenantById, tenantId);
+      return getSingleDomainSpecificTenantData(tenantById, tenant.get());
     }
 
     return tenantById.isEmpty() ? Optional.empty()
@@ -103,16 +103,6 @@ public Optional<RestrictedTenantDTO> findTenantBySubdomain(String subdomain, Lon
   public Optional<RestrictedTenantDTO> getSingleDomainSpecificTenantData(
       Optional<TenantEntity> tenant, Long tenantId) {
 
-    if (tenantId == null) {
-      Optional<Long> accessTokenTenantId = authorisationService.findTenantIdInAccessToken();
-      if (accessTokenTenantId.isEmpty()) {
-        if (accessTokenTenantId.isEmpty()) {
-          throw new BadRequestException("tenantId not found in access token");
-        }
-      }
-      tenantId = accessTokenTenantId.get();
-    }
-
     Optional<TenantEntity> tenantFromAuthorisedContext = tenantService.findTenantById(tenantId);
     if (tenantFromAuthorisedContext.isEmpty()) {
       throw new BadRequestException("Tenant not found for id " + tenantId);

diff --git a/src/test/java/com/vi/tenantservice/api/facade/TenantServiceFacadeTest.java b/src/test/java/com/vi/tenantservice/api/facade/TenantServiceFacadeTest.java
@@ -215,7 +215,6 @@ void findTenantBySubdomain_Should_returnTenantAwareData_When_RequestIsTenantAwar
 
     when(tenantService.findTenantBySubdomain(subdomain)).thenReturn(defaultTenant);
     when(authorisationService.resolveTenantFromRequest(null)).thenReturn(Optional.of(2L));
-    when(authorisationService.findTenantIdInAccessToken()).thenReturn(Optional.of(2L));
     when(tenantService.findTenantById(2L)).thenReturn(accessTokenTenantData);
 
     Optional<RestrictedTenantDTO> tenantDTO = tenantServiceFacade.findTenantBySubdomain(subdomain, null);