Merge branch 'develop' of github.com:cloudfoundry/uaa into fix/2821/r…

…educeDbCalls
cloudfoundry · Aug 27, 2024 · 3ad5592 · 3ad5592
2 parents d79eac4 + 28116ea
commit 3ad5592
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -78,7 +78,7 @@ libraries.lombok = "org.projectlombok:lombok"
 libraries.mariaJdbcDriver = "org.mariadb.jdbc:mariadb-java-client"
 libraries.mockito = "org.mockito:mockito-core"
 libraries.mockitoJunit5 = "org.mockito:mockito-junit-jupiter"
-libraries.passay = "org.passay:passay:1.6.4"
+libraries.passay = "org.passay:passay:1.6.5"
 libraries.postgresql = "org.postgresql:postgresql:42.7.4"
 libraries.selenium = "org.seleniumhq.selenium:selenium-java:${versions.seleniumVersion}"
 libraries.seleniumHttp = "org.seleniumhq.selenium:selenium-http-jdk-client:4.13.0"

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/CreateAccountIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/CreateAccountIT.java
@@ -183,7 +183,7 @@ private String startCreateUserFlow(String secret) {
     public void testEmailDomainRegisteredWithIDPDoesNotAllowAccountCreation() throws Exception {
         String adminToken = IntegrationTestUtils.getClientCredentialsToken(baseUrl, "admin", "adminsecret");
         IdentityProvider<OIDCIdentityProviderDefinition> oidcProvider = new IdentityProvider().setName("oidc_provider").setActive(true).setType(OriginKeys.OIDC10).setOriginKey(OriginKeys.OIDC10).setConfig(new OIDCIdentityProviderDefinition());
-        oidcProvider.getConfig().setAuthUrl(new URL("http://example.com"));
+        oidcProvider.getConfig().setAuthUrl(new URL("https://example.com"));
         oidcProvider.getConfig().setShowLinkText(false);
         oidcProvider.getConfig().setTokenUrl(new URL("http://localhost:8080/uaa/idp_login"));
         oidcProvider.getConfig().setTokenKeyUrl(new URL("http://localhost:8080/uaa/idp_login"));

diff --git a/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ResetPasswordIT.java b/uaa/src/test/java/org/cloudfoundry/identity/uaa/integration/feature/ResetPasswordIT.java
@@ -195,7 +195,7 @@ public void testNotAutoLoginAfterResetPassword() {
         webDriver.findElement(By.name("password")).sendKeys("new_password");
         webDriver.findElement(By.xpath("//input[@value='Sign in']")).click();
 
-        assertThat(webDriver.getCurrentUrl(), startsWith("http://example.redirect.com/?code="));
+        assertThat(webDriver.getCurrentUrl(), startsWith("https://example.redirect.com/?code="));
     }
 
     @Test