diff --git a/openvidu-test-browsers/pom.xml b/openvidu-test-browsers/pom.xml index a96cc429..6dc2a2f2 100644 --- a/openvidu-test-browsers/pom.xml +++ b/openvidu-test-browsers/pom.xml @@ -49,14 +49,14 @@ https://github.com/OpenVidu/openvidu git@github.com:OpenVidu/openvidu.git - 2.7.18 + 3.4.1 2.30.0 - 1.7.36 - 4.12.1 - 2.10 + 2.0.16 + 4.27.0 + 2.11.0 0.2.5 - 5.9.1 - 8.3.0 + 5.11.4 + 9.3.0 diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/AndroidChromeUser.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/AndroidChromeUser.java index 32951d25..2212fbc7 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/AndroidChromeUser.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/AndroidChromeUser.java @@ -4,10 +4,10 @@ import java.net.MalformedURLException; import java.net.URL; import org.openqa.selenium.chrome.ChromeOptions; +import org.openqa.selenium.remote.CapabilityType; import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.RemoteWebDriver; -import io.appium.java_client.remote.MobileCapabilityType; import io.appium.java_client.remote.MobilePlatform; // Run Docker Android: @@ -40,7 +40,7 @@ public class AndroidChromeUser extends BrowserUser { "autoplay-policy=no-user-gesture-required"); DesiredCapabilities capabilities = new DesiredCapabilities(); - capabilities.setCapability(MobileCapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID); + capabilities.setCapability(CapabilityType.PLATFORM_NAME, MobilePlatform.ANDROID); capabilities.setCapability(ChromeOptions.CAPABILITY, options); URL url = null; diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/CustomHttpClient.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/CustomHttpClient.java index e07c329a..f4f1bad6 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/CustomHttpClient.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/CustomHttpClient.java @@ -290,33 +290,33 @@ public class CustomHttpClient { if (body != null && !body.isEmpty()) { body = body.replaceAll("'", "\""); BodyPublisher bodyPublisher = HttpRequest.BodyPublishers.ofString(body); - switch (method) { - case POST: + switch (method.name()) { + case "POST": builder = builder.POST(bodyPublisher); break; - case PUT: + case "PUT": builder = builder.PUT(bodyPublisher); break; - case PATCH: + case "PATCH": default: builder = builder.method("PATCH", bodyPublisher); break; } builder.setHeader("Content-Type", "application/json"); } else { - switch (method) { - case GET: + switch (method.name()) { + case "GET": builder = builder.GET(); builder.setHeader("Content-Type", "application/x-www-form-urlencoded"); break; - case POST: + case "POST": builder = builder.POST(HttpRequest.BodyPublishers.noBody()); break; - case DELETE: + case "DELETE": builder = builder.DELETE(); builder.setHeader("Content-Type", "application/x-www-form-urlencoded"); break; - case PUT: + case "PUT": builder = builder.PUT(HttpRequest.BodyPublishers.noBody()); default: break; diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/layout/CustomLayoutHandler.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/layout/CustomLayoutHandler.java index a1ca17b1..7bcfa5d9 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/layout/CustomLayoutHandler.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/layout/CustomLayoutHandler.java @@ -6,13 +6,14 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ConfigurableApplicationContext; +import org.springframework.context.annotation.Bean; import org.springframework.context.event.EventListener; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @SpringBootApplication -public class CustomLayoutHandler extends WebSecurityConfigurerAdapter implements WebMvcConfigurer { +public class CustomLayoutHandler implements WebMvcConfigurer { private static ConfigurableApplicationContext context; public static CountDownLatch initLatch; @@ -24,9 +25,10 @@ public class CustomLayoutHandler extends WebSecurityConfigurerAdapter implements .run(args); } - @Override - protected void configure(HttpSecurity security) throws Exception { - security.httpBasic().disable(); + @Bean + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.httpBasic().disable(); + return http.build(); } @EventListener(ApplicationReadyEvent.class) diff --git a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/webhook/CustomWebhook.java b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/webhook/CustomWebhook.java index b2ed7207..dec4f233 100644 --- a/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/webhook/CustomWebhook.java +++ b/openvidu-test-browsers/src/main/java/io/openvidu/test/browsers/utils/webhook/CustomWebhook.java @@ -32,10 +32,10 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.builder.SpringApplicationBuilder; import org.springframework.boot.context.event.ApplicationReadyEvent; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Bean; import org.springframework.context.event.EventListener; import org.springframework.security.config.annotation.web.builders.HttpSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.web.SecurityFilterChain; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -174,13 +174,11 @@ public class CustomWebhook { CustomWebhook.initLatch.countDown(); } - @Configuration - public class SecurityConfig extends WebSecurityConfigurerAdapter { - @Override - protected void configure(HttpSecurity http) throws Exception { - http.requiresChannel().antMatchers("/webhook").requiresInsecure(); - http.csrf().disable().authorizeRequests().antMatchers("/webhook").permitAll(); - } + @Bean + SecurityFilterChain filterChain(HttpSecurity http) throws Exception { + http.requiresChannel().requestMatchers("/webhook").requiresInsecure(); + http.csrf().disable().authorizeRequests().requestMatchers("/webhook").permitAll(); + return http.build(); } } diff --git a/openvidu-test-e2e/pom.xml b/openvidu-test-e2e/pom.xml index 09bb91c6..08c39df7 100644 --- a/openvidu-test-e2e/pom.xml +++ b/openvidu-test-e2e/pom.xml @@ -50,13 +50,13 @@ https://github.com/OpenVidu/openvidu git@github.com:OpenVidu/openvidu.git - 2.7.18 - 3.0.0-M7 - 4.12.1 - 2.10 + 3.4.1 + 3.5.2 + 4.27.0 + 2.11.0 0.8.3 - 1.17.6 - 3.2.13 + 1.20.4 + 3.4.1 2.0.0 1.1.0