diff --git a/src/main/java/de/caritas/cob/userservice/api/adapters/web/controller/interceptor/ApiTokenFilter.java b/src/main/java/de/caritas/cob/userservice/api/adapters/web/controller/interceptor/ApiTokenFilter.java index 5b0aaa826..2dbc547a6 100644 --- a/src/main/java/de/caritas/cob/userservice/api/adapters/web/controller/interceptor/ApiTokenFilter.java +++ b/src/main/java/de/caritas/cob/userservice/api/adapters/web/controller/interceptor/ApiTokenFilter.java @@ -16,13 +16,13 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.web.filter.OncePerRequestFilter; -public class ApiTokenFilter extends OncePerRequestFilter { +public class ApiTokenFilter extends OncePerRequestFilter { @Value("${external.user.create.tenant.api.token}") private String externalUserCreateTenantApiToken; public ApiTokenFilter() { - //Empty constructor + // Empty constructor } @Override @@ -33,16 +33,21 @@ protected boolean shouldNotFilter(HttpServletRequest request) { } @Override - protected void doFilterInternal(@NonNull HttpServletRequest request, @NonNull HttpServletResponse response, - @NonNull FilterChain filterChain) throws ServletException, IOException { + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain) + throws ServletException, IOException { String token = request.getHeader("api-token"); - if (validateExternalUserCreateTenantApiToken(token)){ + if (validateExternalUserCreateTenantApiToken(token)) { // Create an authentication token - UsernamePasswordAuthenticationToken auth = new UsernamePasswordAuthenticationToken( - "ExternalTechnicalAdmin", null, - Collections.singletonList(new SimpleGrantedAuthority(AuthorityValue.TENANT_ADMIN))); + UsernamePasswordAuthenticationToken auth = + new UsernamePasswordAuthenticationToken( + "ExternalTechnicalAdmin", + null, + Collections.singletonList(new SimpleGrantedAuthority(AuthorityValue.TENANT_ADMIN))); // Set the authentication in the SecurityContext SecurityContextHolder.getContext().setAuthentication(auth); } diff --git a/src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserAdminControllerE2EIT.java b/src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserAdminControllerE2EIT.java index 439534347..e80429b9e 100644 --- a/src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserAdminControllerE2EIT.java +++ b/src/test/java/de/caritas/cob/userservice/api/adapters/web/controller/UserAdminControllerE2EIT.java @@ -326,8 +326,9 @@ void createNewTenantAdmin_Should_returnOk_When_requiredCreateTenantAdminIsGiven( } @Test - void createNewTenantAdmin_Should_returnOk_When_calledWithValidTenantCreateParamsAndValidExternalUserCreateTenantApiToken() - throws Exception { + void + createNewTenantAdmin_Should_returnOk_When_calledWithValidTenantCreateParamsAndValidExternalUserCreateTenantApiToken() + throws Exception { // given CreateAdminDTO createAdminDTO = new EasyRandom().nextObject(CreateAdminDTO.class); createAdminDTO.setEmail("valid@email.com"); @@ -350,8 +351,9 @@ void createNewTenantAdmin_Should_returnOk_When_calledWithValidTenantCreateParams } @Test - void createNewTenantAdmin_Should_returnStatusUnauthorized_When_calledWithValidTenantCreateParamsAndInvalidExternalUserCreateTenantApiToken() - throws Exception { + void + createNewTenantAdmin_Should_returnStatusUnauthorized_When_calledWithValidTenantCreateParamsAndInvalidExternalUserCreateTenantApiToken() + throws Exception { // given CreateAdminDTO createAdminDTO = new EasyRandom().nextObject(CreateAdminDTO.class); createAdminDTO.setEmail("valid@email.com");