Skip to content

Commit

Permalink
GH-452 - Make SalespointWebSecurityConfiguration @ConditionalOnWebApp…
Browse files Browse the repository at this point in the history
…lication.

This fixes the previously failing bootstrap for @DataJpaTests as those do no create a UserDetailsService bean that SalespointWebSecurityConfiguration depends upon.
  • Loading branch information
odrotbohm committed Dec 5, 2023
1 parent 9f510ea commit 12aa6a2
Show file tree
Hide file tree
Showing 2 changed files with 39 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,33 +19,32 @@
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.servlet.util.matcher.MvcRequestMatcher;
import org.springframework.web.servlet.handler.HandlerMappingIntrospector;

/**
* Basic Salespoint security configuration setting up the {@link AuthenticationManagerBuilder} to work with the
* {@link UserDetailsService} implementation as well as the {@link PasswordEncoder} we provide.
* Basic Salespoint security configuration setting up the
* {@link org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder} to work
* with the {@link UserDetailsService} implementation as well as the
* {@link org.springframework.security.crypto.password.PasswordEncoder} we provide.
*
* @author Oliver Gierke
*/
@Configuration
@ConditionalOnWebApplication
class SalespointWebSecurityConfiguration {

@Autowired UserDetailsService userDetailsService;

@Bean
@ConditionalOnWebApplication
MvcRequestMatcher.Builder mvc(HandlerMappingIntrospector introspector) {
return new MvcRequestMatcher.Builder(introspector).servletPath("/");
}

@Bean
@ConditionalOnWebApplication
SecurityFilterChain filterChain(HttpSecurity security, MvcRequestMatcher.Builder mvc) throws Exception {

return security
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
/*
* Copyright 2023 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.salespointframework.catalog;

import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;

/**
* Test to verify that a {@link DataJpaTest} bootstraps successfully.
*
* @author Oliver Drotbohm
*/
@DataJpaTest
class CatalogRepositoryTest {

@Autowired Catalog<Product> catalog;

@Test // GH-452
void bootstrapsRepositories() {}
}

0 comments on commit 12aa6a2

Please sign in to comment.