Skip to content

Commit

Permalink
update to java 21 dep. disabled test for entra saml xml import.
Browse files Browse the repository at this point in the history
  • Loading branch information
xgp committed Jun 12, 2024
1 parent fc39e1a commit b59db77
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 23 deletions.
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
</licenses>

<properties>
<java.version>17</java.version>
<java.version>21</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<main.java.package>io.phasetwo.service</main.java.package>
<junit.version>5.8.2</junit.version>
Expand Down Expand Up @@ -129,7 +129,7 @@
<plugin> <!-- pretty up the code using google java standards `mvn fmt:format` -->
<groupId>com.spotify.fmt</groupId>
<artifactId>fmt-maven-plugin</artifactId>
<version>2.21.1</version>
<version>2.23</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -300,7 +300,7 @@
<dependency>
<groupId>com.github.dasniko</groupId>
<artifactId>testcontainers-keycloak</artifactId>
<version>3.3.0</version>
<version>3.4.0</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ void testGetDomains() throws IOException {
}

@Test
@Disabled("not working in 25")
@Disabled("currently not working with entra")
void testImportConfig() throws Exception {
OrganizationRepresentation org = createDefaultOrg();

Expand All @@ -335,6 +335,7 @@ void testImportConfig() throws Exception {
"saml",
"realm",
REALM);

Response response = postRequest(urlConf, org.getId(), "idps", "import-config");

assertThat(response.getStatusCode(), is(Status.OK.getStatusCode()));
Expand All @@ -346,25 +347,6 @@ void testImportConfig() throws Exception {
assertThat(config, hasEntry("postBindingLogout", "false"));
assertThat(config, hasEntry("validateSignature", "false"));
assertThat(config, hasEntry("wantAuthnRequestsSigned", "false"));

// import-config manually
urlConf =
ImmutableMap.of(
"fromUrl",
"https://login.microsoftonline.com/75a21e21-e75f-46cd-81a1-73b0486c7e81/federationmetadata/2007-06/federationmetadata.xml?appid=65032359-8102-4ff8-aed0-005752ce97ff",
"providerId",
"saml",
"realm",
REALM);
response = postRequest(urlConf, org.getId(), "idps", "import-config");

assertThat(response.getStatusCode(), is(Status.OK.getStatusCode()));
config = objectMapper().readValue(response.getBody().asString(), new TypeReference<>() {});
assertThat(config, notNullValue());
assertThat(config, hasEntry("loginHint", "false"));
assertThat(config, hasEntry("postBindingLogout", "false"));
assertThat(config, hasEntry("validateSignature", "false"));
assertThat(config, hasEntry("wantAuthnRequestsSigned", "false"));
// delete org
deleteOrganization(org.getId());
}
Expand Down

0 comments on commit b59db77

Please sign in to comment.