This is an automated email from the ASF dual-hosted git repository. jamesbognar pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/juneau-petstore.git
commit 363864f7176cdd7ed883ebe0fe086eead9b43f85 Author: rasa <[email protected]> AuthorDate: Mon Jan 20 11:27:40 2020 +0200 react frontend added --- .../java/org/apache/juneau/petstore/AppConfiguration.java | 15 +++++++++++++++ .../juneau/petstore/config/SpringSecurityConfig.java | 8 +++++--- .../org/apache/juneau/petstore/rest/PetStoreResource.java | 2 ++ .../org/apache/juneau/petstore/rest/RootResources.java | 4 ++-- pets | 1 + 5 files changed, 25 insertions(+), 5 deletions(-) diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/AppConfiguration.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/AppConfiguration.java index fd1b5f8..97b153a 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/AppConfiguration.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/AppConfiguration.java @@ -12,11 +12,15 @@ // *************************************************************************************************************************** package org.apache.juneau.petstore; +import java.util.Arrays; + import org.apache.juneau.petstore.rest.*; import org.apache.juneau.petstore.service.*; import org.apache.juneau.rest.springboot.annotation.JuneauRestRoot; import org.springframework.boot.web.servlet.*; import org.springframework.context.annotation.*; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import org.springframework.web.filter.*; @SuppressWarnings("javadoc") @@ -60,4 +64,15 @@ public class AppConfiguration { registration.setEnabled(false); return registration; } + @Bean + public CorsFilter corsFilter() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + CorsConfiguration config = new CorsConfiguration(); + config.setAllowCredentials(true); + config.addAllowedOrigin("*"); + config.setAllowedMethods(Arrays.asList("POST", "OPTIONS", "GET", "DELETE", "PUT")); + config.setAllowedHeaders(Arrays.asList("X-Requested-With", "Origin", "Content-Type", "Accept", "Authorization")); + source.registerCorsConfiguration("/**", config); + return new CorsFilter(source); + } } diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java index 13f427b..ebbc64c 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/config/SpringSecurityConfig.java @@ -27,9 +27,11 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter { .httpBasic() .and() .authorizeRequests() - .anyRequest().authenticated() - .antMatchers(GET).anonymous() // Allow anonymous read-only access. - .antMatchers(POST).anonymous() // TEMPORARY. + .antMatchers(GET).permitAll() + .antMatchers(POST).permitAll() + //.anyRequest().authenticated() + //.antMatchers(GET).anonymous() // Allow anonymous read-only access. + //.antMatchers(POST).anonymous() // TEMPORARY. .and() .csrf().disable() .formLogin().disable(); diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java index 51d287f..0d2dbcc 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/PetStoreResource.java @@ -36,6 +36,7 @@ import org.apache.juneau.rest.helper.*; import org.apache.juneau.http.response.*; import org.apache.juneau.rest.widget.*; import org.apache.juneau.transforms.*; +import org.springframework.web.bind.annotation.CrossOrigin; import org.apache.juneau.rest.converters.*; /** @@ -188,6 +189,7 @@ public class PetStoreResource extends BasicRest implements PetStore { } @Override /* PetStore */ + @CrossOrigin(origins = "http://localhost:3000";, maxAge = 3600) @RestMethod( name=GET, path="/pet/{petId}", diff --git a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java index 9fd94b9..c836f13 100644 --- a/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java +++ b/juneau-petstore-server/src/main/java/org/apache/juneau/petstore/rest/RootResources.java @@ -56,12 +56,12 @@ import org.apache.juneau.serializer.annotation.*; "</div>" } ) -@SerializerConfig( +/*@SerializerConfig( // For testing purposes, we want to use single quotes in all the serializers so it's easier to do simple // String comparisons. // You can apply any of the Serializer/Parser/BeanContext settings this way. quoteChar="'" -) +) */ public class RootResources extends BasicRestServletGroup { private static final long serialVersionUID = 1L; } diff --git a/pets b/pets new file mode 160000 index 0000000..56287f0 --- /dev/null +++ b/pets @@ -0,0 +1 @@ +Subproject commit 56287f05535f3a61e184e884e914f6fcb9a4ec27
