feat:

Add multitenancy.enabled property to application-testing.properties
Adapt CreateAdminService
Add tests for multitenancy.enabled=true

src/main/java/de/caritas/cob/userservice/api/admin/service/admin/create/CreateAdminService.java

@@ -60,16 +60,20 @@ List<UserRole> getDefaultRoles(Admin.AdminType adminType) {
 
   private void setTenantId(CreateAdminDTO createAdminDTO) {
     if (multiTenancyEnabled) {
-      if (authenticatedUser.isTenantSuperAdmin()) {
-        notNull(createAdminDTO.getTenantId());
-      } else {
-        createAdminDTO.setTenantId(TenantContext.getCurrentTenant().intValue());
-      }
+      setTenantIdForMultiTenancy(createAdminDTO);
     } else {
       createAdminDTO.setTenantId(null);
     }
   }
 
+  private void setTenantIdForMultiTenancy(CreateAdminDTO createAdminDTO) {
+    if (authenticatedUser.isTenantSuperAdmin()) {
+      notNull(createAdminDTO.getTenantId());
+    } else {
+      createAdminDTO.setTenantId(TenantContext.getCurrentTenant().intValue());
+    }
+  }
+
   private ArrayList<UserRole> getUserRolesForTenantAdmin() {
     if (multitenancyWithSingleDomain) {
       return Lists.newArrayList(

src/main/resources/application-testing.properties

@@ -71,3 +71,5 @@ appointments.delete-job-enabled=true
 
 feature.topics.enabled=false
 agency.service.api.url=${app.base.url}/service
+
+multitenancy.enabled=false

src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserAdminControllerE2EIT.java

@@ -9,6 +9,7 @@
 import static org.hamcrest.Matchers.hasSize;
 import static org.hamcrest.Matchers.is;
 import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
@@ -188,7 +189,6 @@ private String givenNewConsultantIsCreated() throws Exception {
     // given
     CreateConsultantDTO createAdminDTO = new EasyRandom().nextObject(CreateConsultantDTO.class);
     createAdminDTO.setEmail("[email protected]");
-
     // when
     MvcResult mvcResult =
         this.mockMvc
@@ -219,6 +219,7 @@ private String givenNewAgencyAdminIsCreated() throws Exception {
     // given
     CreateAdminDTO createAdminDTO = new EasyRandom().nextObject(CreateAdminDTO.class);
     createAdminDTO.setEmail("[email protected]");
+    createAdminDTO.setTenantId(95);
 
     // when
 
@@ -235,6 +236,7 @@ private String givenNewAgencyAdminIsCreated() throws Exception {
             .andExpect(jsonPath("_embedded.username", notNullValue()))
             .andExpect(jsonPath("_embedded.lastname", notNullValue()))
             .andExpect(jsonPath("_embedded.email", is("[email protected]")))
+            .andExpect(jsonPath("_embedded.tenantId", is("null")))
             .andReturn();
     String content = mvcResult.getResponse().getContentAsString();
     return JsonPath.read(content, "_embedded.id");

src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserAdminControllerMultiTenancyTrueE2EIT.java

@@ -0,0 +1,234 @@
+package de.caritas.cob.userservice.api.adapters.web.controller;
+
+import static de.caritas.cob.userservice.api.adapters.web.controller.UserAdminControllerIT.ADMIN_DATA_PATH;
+import static de.caritas.cob.userservice.api.adapters.web.controller.UserAdminControllerIT.AGENCY_ADMIN_PATH;
+import static de.caritas.cob.userservice.api.adapters.web.controller.UserAdminControllerIT.CONSULTANT_PATH;
+import static de.caritas.cob.userservice.api.adapters.web.controller.UserAdminControllerIT.TENANT_ADMIN_PATH;
+import static de.caritas.cob.userservice.api.adapters.web.controller.UserAdminControllerIT.TENANT_ADMIN_PATH_WITHOUT_SLASH;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.hamcrest.Matchers.nullValue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.when;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.patch;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.put;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jayway.jsonpath.JsonPath;
+import de.caritas.cob.userservice.api.adapters.keycloak.dto.KeycloakCreateUserResponseDTO;
+import de.caritas.cob.userservice.api.adapters.rocketchat.RocketChatCredentialsProvider;
+import de.caritas.cob.userservice.api.adapters.web.dto.CreateAdminDTO;
+import de.caritas.cob.userservice.api.adapters.web.dto.CreateConsultantDTO;
+import de.caritas.cob.userservice.api.adapters.web.dto.PatchAdminDTO;
+import de.caritas.cob.userservice.api.adapters.web.dto.UpdateAgencyAdminDTO;
+import de.caritas.cob.userservice.api.adapters.web.dto.UpdateTenantAdminDTO;
+import de.caritas.cob.userservice.api.admin.service.tenant.TenantService;
+import de.caritas.cob.userservice.api.config.apiclient.AgencyServiceApiControllerFactory;
+import de.caritas.cob.userservice.api.config.apiclient.ConsultingTypeServiceApiControllerFactory;
+import de.caritas.cob.userservice.api.config.apiclient.MailServiceApiControllerFactory;
+import de.caritas.cob.userservice.api.config.auth.Authority.AuthorityValue;
+import de.caritas.cob.userservice.api.config.auth.IdentityConfig;
+import de.caritas.cob.userservice.api.helper.AuthenticatedUser;
+import de.caritas.cob.userservice.api.model.Admin.AdminType;
+import de.caritas.cob.userservice.api.model.User;
+import de.caritas.cob.userservice.api.port.out.AdminRepository;
+import de.caritas.cob.userservice.api.port.out.IdentityClient;
+import de.caritas.cob.userservice.api.tenant.TenantResolverService;
+import de.caritas.cob.userservice.api.testConfig.TestAgencyControllerApi;
+import de.caritas.cob.userservice.consultingtypeservice.generated.web.ConsultingTypeControllerApi;
+import de.caritas.cob.userservice.mailservice.generated.web.MailsControllerApi;
+import de.caritas.cob.userservice.tenantservice.generated.web.model.RestrictedTenantDTO;
+import de.caritas.cob.userservice.topicservice.generated.web.TopicControllerApi;
+import java.util.LinkedHashMap;
+import javax.servlet.http.Cookie;
+import net.minidev.json.JSONArray;
+import org.jeasy.random.EasyRandom;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.keycloak.admin.client.Keycloak;
+import org.mockito.Mockito;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.test.autoconfigure.jdbc.AutoConfigureTestDatabase;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.MediaType;
+import org.springframework.security.test.context.support.WithMockUser;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.test.context.TestPropertySource;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.MvcResult;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.client.RestTemplate;
+
+@SpringBootTest
+@AutoConfigureMockMvc
+@ActiveProfiles("testing")
+@AutoConfigureTestDatabase
+@TestPropertySource(properties = {"multitenancy.enabled=true"})
+@Transactional
+class UserAdminControllerMultiTenancyTrueE2EIT {
+
+  private static final String CSRF_HEADER = "csrfHeader";
+  private static final String CSRF_VALUE = "test";
+  private static final Cookie CSRF_COOKIE = new Cookie("csrfCookie", CSRF_VALUE);
+  @Autowired private MockMvc mockMvc;
+
+  @Autowired private ObjectMapper objectMapper;
+
+  @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
+  @Autowired
+  private ConsultingTypeControllerApi consultingTypeControllerApi;
+
+  @Autowired private IdentityConfig identityConfig;
+
+  @MockBean
+  private ConsultingTypeServiceApiControllerFactory consultingTypeServiceApiControllerFactory;
+
+  @MockBean private MailServiceApiControllerFactory mailServiceApiControllerFactory;
+
+  @MockBean
+  @Qualifier("mailsControllerApi")
+  private MailsControllerApi mailsControllerApi;
+
+  @MockBean AgencyServiceApiControllerFactory agencyServiceApiControllerFactory;
+
+  @MockBean IdentityClient identityClient;
+
+  @MockBean TenantService tenantService;
+
+  @MockBean
+  TenantResolverService tenantResolverService;
+
+  @MockBean
+  AuthenticatedUser authenticatedUser;
+
+  @AfterEach
+  void reset() {
+    identityConfig.setDisplayNameAllowedForConsultants(false);
+  }
+
+  @BeforeEach
+  public void setUp() {
+    when(agencyServiceApiControllerFactory.createControllerApi())
+        .thenReturn(
+            new TestAgencyControllerApi(
+                new de.caritas.cob.userservice.agencyserivce.generated.ApiClient()));
+
+    when(consultingTypeServiceApiControllerFactory.createControllerApi())
+        .thenReturn(consultingTypeControllerApi);
+    when(mailServiceApiControllerFactory.createControllerApi()).thenReturn(mailsControllerApi);
+
+    KeycloakCreateUserResponseDTO keycloakResponse = new KeycloakCreateUserResponseDTO();
+    keycloakResponse.setUserId(new EasyRandom().nextObject(String.class));
+    when(identityClient.createKeycloakUser(Mockito.any(), Mockito.anyString(), Mockito.anyString()))
+        .thenReturn(keycloakResponse);
+  }
+
+  @Test
+  @WithMockUser(authorities = {AuthorityValue.USER_ADMIN})
+  void createNewAgencyAdmin_Should_returnOk_When_requiredCreateAgencyAdminIsGiven()
+      throws Exception {
+    // given
+    CreateAdminDTO createAdminDTO = new EasyRandom().nextObject(CreateAdminDTO.class);
+    createAdminDTO.setEmail("[email protected]");
+    createAdminDTO.setTenantId(95);
+    givenTenant();
+    givenTenantSuperAdmin();
+
+    // when
+
+    MvcResult mvcResult =
+        this.mockMvc
+            .perform(
+                post(AGENCY_ADMIN_PATH)
+                    .cookie(CSRF_COOKIE)
+                    .header(CSRF_HEADER, CSRF_VALUE)
+                    .contentType(MediaType.APPLICATION_JSON)
+                    .content(objectMapper.writeValueAsString(createAdminDTO)))
+            .andExpect(status().isOk())
+            .andExpect(jsonPath("_embedded.id", notNullValue()))
+            .andExpect(jsonPath("_embedded.username", notNullValue()))
+            .andExpect(jsonPath("_embedded.lastname", notNullValue()))
+            .andExpect(jsonPath("_embedded.email", is("[email protected]")))
+            .andExpect(jsonPath("_embedded.tenantId", is("95")))
+            .andReturn();
+    String content = mvcResult.getResponse().getContentAsString();
+    JsonPath.read(content, "_embedded.id");
+  }
+
+  @Test
+  @WithMockUser(authorities = {AuthorityValue.USER_ADMIN})
+  void createNewAgencyAdmin_Should_return500_When_superAdminHasNullTenantID()
+      throws Exception {
+    // given
+    CreateAdminDTO createAdminDTO = new EasyRandom().nextObject(CreateAdminDTO.class);
+    createAdminDTO.setEmail("[email protected]");
+    createAdminDTO.setTenantId(null);
+    givenTenant();
+    givenTenantSuperAdmin();
+
+    // when
+
+    this.mockMvc
+        .perform(
+            post(AGENCY_ADMIN_PATH)
+                .cookie(CSRF_COOKIE)
+                .header(CSRF_HEADER, CSRF_VALUE)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(createAdminDTO)))
+        .andExpect(status().isInternalServerError())
+        .andReturn();
+  }
+
+  private void givenTenantSuperAdmin() {
+    when(authenticatedUser.isTenantSuperAdmin()).thenReturn(true);
+  }
+
+  private void givenTenant() {
+    when(tenantResolverService.resolve(any())).thenReturn(95L);
+    when(tenantService.getRestrictedTenantData(anyLong())).thenReturn(new RestrictedTenantDTO().subdomain("subdomain"));
+  }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/test/java/de/caritas/cob/userservice/api/admin/service/admin/create/CreateAdminServiceIT.java

@@ -169,6 +169,39 @@ public void afterTests() {
     assertThat(admin.getId()).isNotNull();
   }
 
+  @Test
+  public void
+  createNewAdminAgency_Should_returnExpectedCreatedAdmin_When_userIsSuperAdminAndInputDataIsCorrectAndMultitenancyDisabled() {
+    // given
+    ReflectionTestUtils.setField(createAdminService, "multiTenancyEnabled", false);
+    TenantContext.setCurrentTenant(0L);
+    when(authenticatedUser.isTenantSuperAdmin()).thenReturn(true);
+    when(identityClient.createKeycloakUser(any(), anyString(), any()))
+        .thenReturn(easyRandom.nextObject(KeycloakCreateUserResponseDTO.class));
+    when(identityClient.createKeycloakUser(any(), anyString(), any()))
+        .thenReturn(easyRandom.nextObject(KeycloakCreateUserResponseDTO.class));
+    CreateAdminDTO createAdminDTO = this.easyRandom.nextObject(CreateAdminDTO.class);
+    createAdminDTO.setTenantId(1);
+    createAdminDTO.setUsername(VALID_USERNAME);
+    createAdminDTO.setEmail(VALID_EMAIL_ADDRESS);
+
+    // when
+    Admin admin = this.createAdminService.createNewAgencyAdmin(createAdminDTO);
+
+    // then
+    verify(identityClient)
+        .createKeycloakUser(userDTOArgumentCaptor.capture(), anyString(), anyString());
+    assertNull(userDTOArgumentCaptor.getValue().getTenantId());
+
+    verify(identityClient).updatePassword(anyString(), anyString());
+    verify(identityClient).updateRole(anyString(), eq(RESTRICTED_AGENCY_ADMIN));
+    verify(identityClient).updateRole(anyString(), eq(USER_ADMIN));
+
+    assertThat(admin).isNotNull();
+    assertThat(admin.getTenantId()).isNull();
+    assertThat(admin.getId()).isNotNull();
+  }
+
   @Test
   public void getUserRolesForTenantAdmin_ShouldGetProperDefaultRoles_ForSingleDomainMultitenancy() {
     Whitebox.setInternalState(createAdminService, "multitenancyWithSingleDomain", true);