From c680a22131209029d60000b8077548018dc952bc Mon Sep 17 00:00:00 2001 From: Juan-Rpenuela Date: Mon, 26 May 2025 08:26:18 -0500 Subject: [PATCH 1/4] fix: deployment auth --- .../java/edu/eci/cvds/prometeo/config/SecurityConfig.java | 2 +- src/main/resources/application.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java index cd31946..a393389 100644 --- a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java +++ b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java @@ -29,7 +29,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti http .cors(cors -> {}) .csrf(csrf -> csrf.disable()) - .authorizeHttpRequests(auth -> auth + .authorizeHttpRequests(request -> request .requestMatchers("/api/users/create").authenticated() .requestMatchers("/api/users/trainer/sessions").hasAnyRole("STUDENT", "TRAINER") .requestMatchers("/api/users/trainer/**").hasRole("TRAINER") diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a2d0b4b..cdbc892 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -19,5 +19,5 @@ openai.api.url=${OPEN_AI_MODEL} spring.datasource.hikari.properties.ssl=true spring.datasource.hikari.properties.sslfactory=org.postgresql.ssl.NonValidatingFactory -# Server configuration, comentado porque no es necesario. -server.port=8081 \ No newline at end of file +# Server configuration, comentado porque no es necesario. +#server.port=8081 \ No newline at end of file From 105d79f86296d7972665b66c6164572413887ba6 Mon Sep 17 00:00:00 2001 From: Juan-Rpenuela Date: Mon, 26 May 2025 09:30:23 -0500 Subject: [PATCH 2/4] fix: deployment auth-headers --- .../java/edu/eci/cvds/prometeo/config/SecurityConfig.java | 4 ++-- src/test/resources/application.properties | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java index a393389..3129628 100644 --- a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java +++ b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java @@ -29,7 +29,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti http .cors(cors -> {}) .csrf(csrf -> csrf.disable()) - .authorizeHttpRequests(request -> request + .authorizeHttpRequests(auth -> auth .requestMatchers("/api/users/create").authenticated() .requestMatchers("/api/users/trainer/sessions").hasAnyRole("STUDENT", "TRAINER") .requestMatchers("/api/users/trainer/**").hasRole("TRAINER") @@ -45,7 +45,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); - config.setAllowedOrigins(List.of("http://localhost:3000")); + config.setAllowedOrigins(List.of("**")); config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); config.setAllowedHeaders(List.of("*")); config.setAllowCredentials(true); diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 6ab5b83..845b286 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -7,6 +7,7 @@ spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.username=sa spring.datasource.password= spring.datasource.driver-class-name=org.h2.Driver +server.forward-headers-strategy=native # Deshabilitar características no necesarias para pruebas spring.jpa.show-sql=false From 9a345f195d41d26a0b65bd0371831e2e467c2e59 Mon Sep 17 00:00:00 2001 From: Juan-Rpenuela Date: Mon, 26 May 2025 09:53:44 -0500 Subject: [PATCH 3/4] fix: retry cors --- src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java index 3129628..cd31946 100644 --- a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java +++ b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java @@ -45,7 +45,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); - config.setAllowedOrigins(List.of("**")); + config.setAllowedOrigins(List.of("http://localhost:3000")); config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); config.setAllowedHeaders(List.of("*")); config.setAllowCredentials(true); From 19f140a8530e2fbf59e2edc3471cdfcef8c3248b Mon Sep 17 00:00:00 2001 From: Juan-Rpenuela Date: Mon, 26 May 2025 10:21:04 -0500 Subject: [PATCH 4/4] feat: add new cors --- src/main/java/edu/eci/cvds/prometeo/config/CorsConfig.java | 2 +- src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java | 2 +- src/test/resources/application.properties | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/edu/eci/cvds/prometeo/config/CorsConfig.java b/src/main/java/edu/eci/cvds/prometeo/config/CorsConfig.java index 831a40b..6d3b77e 100644 --- a/src/main/java/edu/eci/cvds/prometeo/config/CorsConfig.java +++ b/src/main/java/edu/eci/cvds/prometeo/config/CorsConfig.java @@ -9,7 +9,7 @@ public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins("http://localhost:3000") + .allowedOrigins("http://localhost:3000","https://jolly-rock-0b67b0810.6.azurestaticapps.net/") .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") .allowedHeaders("*") .allowCredentials(true); diff --git a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java index cd31946..afbc634 100644 --- a/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java +++ b/src/main/java/edu/eci/cvds/prometeo/config/SecurityConfig.java @@ -45,7 +45,7 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti @Bean public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration config = new CorsConfiguration(); - config.setAllowedOrigins(List.of("http://localhost:3000")); + config.setAllowedOrigins(List.of("http://localhost:3000","https://jolly-rock-0b67b0810.6.azurestaticapps.net/")); config.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "OPTIONS")); config.setAllowedHeaders(List.of("*")); config.setAllowCredentials(true); diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index 845b286..6ab5b83 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -7,7 +7,6 @@ spring.datasource.url=jdbc:h2:mem:testdb spring.datasource.username=sa spring.datasource.password= spring.datasource.driver-class-name=org.h2.Driver -server.forward-headers-strategy=native # Deshabilitar características no necesarias para pruebas spring.jpa.show-sql=false