From 071ed34b4064aeec1005d46f6e8ff95bfeb0f141 Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 09:56:34 -0400 Subject: [PATCH 01/12] Conditionally disabled test that doesn't work in ci --- .../openapi/codegen/javaclient/integration/CodegenIT.java | 2 ++ pom.xml | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java index 2578353..722c609 100644 --- a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java +++ b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java @@ -16,6 +16,7 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.condition.DisabledIfSystemProperty; /** * Integration tests that validate this codegen against various openapi specifications. All of these @@ -124,6 +125,7 @@ void bitbucket() { } @Test + @DisabledIfSystemProperty(named = "ci-run", matches = "true") void radiantlogicCloudmanager() { generateAndBuild("radiantlogic-cloudmanager-1.3.2.json", "Radiantlogic-CloudManager/1.3.2"); } diff --git a/pom.xml b/pom.xml index adcb0c4..cfa8ddf 100644 --- a/pom.xml +++ b/pom.xml @@ -44,6 +44,7 @@ ./codegen-modules/openapi-java-client-codegen ./usage-modules/openapi-java-client-usage ${skipTests} + false @@ -247,6 +248,9 @@ + + ${ci-run} + false false -Xmx8000m From 1ba7014630c966c789eadfd2f6649686f65b25b9 Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 09:56:54 -0400 Subject: [PATCH 02/12] Updated github action with new arg --- .github/workflows/core-maven-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/core-maven-build.yml b/.github/workflows/core-maven-build.yml index 7247f23..4ff7d89 100644 --- a/.github/workflows/core-maven-build.yml +++ b/.github/workflows/core-maven-build.yml @@ -94,7 +94,7 @@ jobs: with: pom_artifact_name: ${{ inputs.is_release && 'release_pom_xml' || '' }} - name: Run Integration Tests - run: mvn integration-test -Dskip.surefire.tests + run: mvn integration-test -Dskip.surefire.tests -Dci-run=true - name: Upload Integration Test Artifacts uses: actions/upload-artifact@v4 with: From 7743c698032271f58dc162fb76b5d073a0a9307b Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 09:59:45 -0400 Subject: [PATCH 03/12] Updating memory monitor --- .../codegen/javaclient/integration/CodegenIT.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java index 722c609..a44a8c6 100644 --- a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java +++ b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java @@ -13,6 +13,7 @@ import lombok.NonNull; import lombok.SneakyThrows; import org.apache.commons.io.FileUtils; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; @@ -29,10 +30,12 @@ public class CodegenIT { private static final Duration WAIT_FOR_BUILD = Duration.ofMinutes(2); private static long peakMemory = 0; + private static Thread memoryMonitorThread; /** * This prints the memory being used on an ongoing basis. This is useful information due to the - * sheer absurd size of some of the specs. + * sheer absurd size of some of the specs. Also in the more memory-constrained Github Action CI/CD + * pipeline this was helpful for getting the configuration right. */ @BeforeAll static void beforeAll() { @@ -46,14 +49,20 @@ static void beforeAll() { } System.out.printf("Memory Current: %,d Peak: %,d%n", amount, peakMemory); try { - Thread.sleep(3000); + Thread.sleep(5000); } catch (InterruptedException e) { + return; } } }) .start(); } + @AfterAll + static void afterAll() { + memoryMonitorThread.interrupt(); + } + @Test void oktaIdpMinimal() { generateAndBuild("okta-idp-minimal-2025.01.1.yaml", "MyAccount-Management/2025.01.1"); From b752c0018d4b9cb9303637ba18213e868d34c71d Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 09:59:59 -0400 Subject: [PATCH 04/12] Updating memory monitor thread --- .../javaclient/integration/CodegenIT.java | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java index a44a8c6..cc481b3 100644 --- a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java +++ b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java @@ -39,23 +39,24 @@ public class CodegenIT { */ @BeforeAll static void beforeAll() { - new Thread( - () -> { - while (true) { - final long amount = - Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); - if (amount > peakMemory) { - peakMemory = amount; - } - System.out.printf("Memory Current: %,d Peak: %,d%n", amount, peakMemory); - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - return; - } - } - }) - .start(); + memoryMonitorThread = + new Thread( + () -> { + while (true) { + final long amount = + Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); + if (amount > peakMemory) { + peakMemory = amount; + } + System.out.printf("Memory Current: %,d Peak: %,d%n", amount, peakMemory); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + return; + } + } + }) + .start(); } @AfterAll From 9098eeba0b06001292917dc6fa18827b5cd8931b Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:00:41 -0400 Subject: [PATCH 05/12] Fixed compile error --- .../javaclient/integration/CodegenIT.java | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java index cc481b3..90470a7 100644 --- a/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java +++ b/codegen-modules/openapi-java-client-codegen/src/test/java/com/radiantlogic/openapi/codegen/javaclient/integration/CodegenIT.java @@ -41,22 +41,22 @@ public class CodegenIT { static void beforeAll() { memoryMonitorThread = new Thread( - () -> { - while (true) { - final long amount = - Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); - if (amount > peakMemory) { - peakMemory = amount; - } - System.out.printf("Memory Current: %,d Peak: %,d%n", amount, peakMemory); - try { - Thread.sleep(5000); - } catch (InterruptedException e) { - return; - } - } - }) - .start(); + () -> { + while (true) { + final long amount = + Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); + if (amount > peakMemory) { + peakMemory = amount; + } + System.out.printf("Memory Current: %,d Peak: %,d%n", amount, peakMemory); + try { + Thread.sleep(5000); + } catch (InterruptedException e) { + return; + } + } + }); + memoryMonitorThread.start(); } @AfterAll From a0344f545799b04b83f1fd5f16e24436ab22d494 Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:36:46 -0400 Subject: [PATCH 06/12] Added lib --- usage-modules/openapi-java-client-usage/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usage-modules/openapi-java-client-usage/pom.xml b/usage-modules/openapi-java-client-usage/pom.xml index 1cf4711..ba6af74 100644 --- a/usage-modules/openapi-java-client-usage/pom.xml +++ b/usage-modules/openapi-java-client-usage/pom.xml @@ -49,6 +49,11 @@ RadiantLogic-CloudManager 1.3.2 + + com.radiantlogic.openapi.generated + Okta-OpenID-Connect--OAuth-2.0 + 2025.01.1 + com.radiantlogic.openapi.generated GitLab-API From ccdcfc7242ed33052e08962934165f73314de0fb Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:36:56 -0400 Subject: [PATCH 07/12] Added comment --- usage-modules/openapi-java-client-usage/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/usage-modules/openapi-java-client-usage/pom.xml b/usage-modules/openapi-java-client-usage/pom.xml index ba6af74..c34ce27 100644 --- a/usage-modules/openapi-java-client-usage/pom.xml +++ b/usage-modules/openapi-java-client-usage/pom.xml @@ -44,6 +44,7 @@ Snyk-API 1.0 + com.radiantlogic.openapi.generated RadiantLogic-CloudManager From 17c25f94c219d0ea4a0384a704d62f016aff159a Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:39:39 -0400 Subject: [PATCH 08/12] Disabling code --- .../usage/javaclient/ApiClientSupport.java | 9 +++++ .../usage/javaclient/FormUrlencodedTest.java | 37 ++++++++++--------- 2 files changed, 29 insertions(+), 17 deletions(-) diff --git a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/ApiClientSupport.java b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/ApiClientSupport.java index 3b7b578..2093b09 100644 --- a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/ApiClientSupport.java +++ b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/ApiClientSupport.java @@ -94,4 +94,13 @@ public class ApiClientSupport { apiClient.setBasePath(ApiClientSupport.BASE_URL); return apiClient; } + + public static com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.invoker.ApiClient + createOktaOpenidConnectApiClient() { + final com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.invoker.ApiClient apiClient = + new com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.invoker.ApiClient(); + apiClient.setDebugging(true); + apiClient.setBasePath(ApiClientSupport.BASE_URL); + return apiClient; + } } diff --git a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java index efc1ee3..edbc793 100644 --- a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java +++ b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java @@ -1,13 +1,15 @@ package com.radiantlogic.openapi.usage.javaclient; -import static com.github.tomakehurst.wiremock.client.WireMock.*; -import static com.radiantlogic.openapi.usage.javaclient.ApiClientSupport.BASE_URL; -import static org.assertj.core.api.Assertions.assertThat; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; +import static com.github.tomakehurst.wiremock.client.WireMock.post; +import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; +import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; +import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; +import static com.github.tomakehurst.wiremock.client.WireMock.verify; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.junit5.WireMockTest; -import com.radiantlogic.openapi.generated.radiantlogiccloudmanager.api.AuthApi; -import com.radiantlogic.openapi.generated.radiantlogiccloudmanager.invoker.ApiClient; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.BeforeEach; @@ -16,14 +18,15 @@ @WireMockTest(httpPort = 9000) public class FormUrlencodedTest { private final ObjectMapper objectMapper = new ObjectMapper(); - private AuthApi authApi; + + // private AuthApi authApi; @BeforeEach void setUp() { - final ApiClient apiClient = new ApiClient(); - apiClient.setBasePath(BASE_URL); - apiClient.setDebugging(true); - authApi = new AuthApi(apiClient); + // final ApiClient apiClient = new ApiClient(); + // apiClient.setBasePath(BASE_URL); + // apiClient.setDebugging(true); + // authApi = new AuthApi(apiClient); } @Test @@ -47,13 +50,13 @@ void testFormUrlencodedRequest() throws Exception { .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(expectedResponse)))); - final Object result = authApi.authControllerLocalLogin(email, password, null); - - assertThat(result).isNotNull(); - assertThat(result).isInstanceOf(Map.class); - final Map resultMap = (Map) result; - - assertThat(resultMap).usingRecursiveComparison().isEqualTo(expectedResponse); + // final Object result = authApi.authControllerLocalLogin(email, password, null); + // + // assertThat(result).isNotNull(); + // assertThat(result).isInstanceOf(Map.class); + // final Map resultMap = (Map) result; + // + // assertThat(resultMap).usingRecursiveComparison().isEqualTo(expectedResponse); verify( postRequestedFor(urlPathEqualTo("/eoc-backend/auth/local")) From 84cfb065614f5948cf1aa0bf43077674ad717ce7 Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:45:42 -0400 Subject: [PATCH 09/12] Working on test --- .../usage/javaclient/FormUrlencodedTest.java | 64 +++++++++++++------ 1 file changed, 46 insertions(+), 18 deletions(-) diff --git a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java index edbc793..6546f4a 100644 --- a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java +++ b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java @@ -3,13 +3,19 @@ import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; import static com.github.tomakehurst.wiremock.client.WireMock.equalTo; import static com.github.tomakehurst.wiremock.client.WireMock.post; -import static com.github.tomakehurst.wiremock.client.WireMock.postRequestedFor; import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo; -import static com.github.tomakehurst.wiremock.client.WireMock.verify; import com.fasterxml.jackson.databind.ObjectMapper; import com.github.tomakehurst.wiremock.junit5.WireMockTest; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.api.OrgAsApi; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.invoker.ApiClient; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.model.AcrValue; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.model.AmrValue; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.model.CodeChallengeMethod; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.model.Prompt; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.model.ResponseMode; +import com.radiantlogic.openapi.generated.oktaopenidconnectoauth20.model.ResponseTypesSupported; import java.util.HashMap; import java.util.Map; import org.junit.jupiter.api.BeforeEach; @@ -18,21 +24,19 @@ @WireMockTest(httpPort = 9000) public class FormUrlencodedTest { private final ObjectMapper objectMapper = new ObjectMapper(); - - // private AuthApi authApi; + private OrgAsApi orgAsApi; @BeforeEach void setUp() { - // final ApiClient apiClient = new ApiClient(); - // apiClient.setBasePath(BASE_URL); - // apiClient.setDebugging(true); - // authApi = new AuthApi(apiClient); + final ApiClient apiClient = ApiClientSupport.createOktaOpenidConnectApiClient(); + orgAsApi = new OrgAsApi(apiClient); } @Test void testFormUrlencodedRequest() throws Exception { - final String email = "testuser"; - final String password = "password123"; + final String clientId = "client-id"; + final String codeChallenge = "challenge"; + final CodeChallengeMethod codeChallengeMethod = CodeChallengeMethod.S256; final Map expectedResponse = new HashMap<>(); expectedResponse.put("access_token", "test-token"); @@ -40,16 +44,39 @@ void testFormUrlencodedRequest() throws Exception { expectedResponse.put("expires_in", 3600); stubFor( - post(urlPathEqualTo("/eoc-backend/auth/local")) + post(urlPathEqualTo("/oauth2/v1/authorize")) .withHeader("Content-Type", equalTo("application/x-www-form-urlencoded;charset=UTF-8")) - .withFormParam("email", equalTo(email)) - .withFormParam("password", equalTo(password)) + .withFormParam("client_id", equalTo(clientId)) + .withFormParam("code_challenge", equalTo(codeChallenge)) + .withFormParam("code_challenge_method", equalTo(codeChallengeMethod.getValue())) .willReturn( aResponse() .withStatus(201) .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(expectedResponse)))); + orgAsApi.authorize( + clientId, + "", + ResponseTypesSupported.CODE, + "", + "", + AcrValue.PHR, + codeChallenge, + codeChallengeMethod, + "", + AmrValue.DUO, + "", + "", + "", + 10, + "", + Prompt.NONE, + ResponseMode.FORM_POST, + "", + "", + ""); + // final Object result = authApi.authControllerLocalLogin(email, password, null); // // assertThat(result).isNotNull(); @@ -58,10 +85,11 @@ void testFormUrlencodedRequest() throws Exception { // // assertThat(resultMap).usingRecursiveComparison().isEqualTo(expectedResponse); - verify( - postRequestedFor(urlPathEqualTo("/eoc-backend/auth/local")) - .withHeader("Content-Type", equalTo("application/x-www-form-urlencoded;charset=UTF-8")) - .withFormParam("email", equalTo(email)) - .withFormParam("password", equalTo(password))); + // verify( + // postRequestedFor(urlPathEqualTo("/eoc-backend/auth/local")) + // .withHeader("Content-Type", + // equalTo("application/x-www-form-urlencoded;charset=UTF-8")) + // .withFormParam("email", equalTo(email)) + // .withFormParam("password", equalTo(password))); } } From 45bcfb4ab83b623ac0b73e8e6a20143b7fa383da Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:46:41 -0400 Subject: [PATCH 10/12] Progress --- .../openapi/usage/javaclient/FormUrlencodedTest.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java index 6546f4a..e17d53f 100644 --- a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java +++ b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java @@ -37,6 +37,7 @@ void testFormUrlencodedRequest() throws Exception { final String clientId = "client-id"; final String codeChallenge = "challenge"; final CodeChallengeMethod codeChallengeMethod = CodeChallengeMethod.S256; + final ResponseTypesSupported responseTypesSupported = ResponseTypesSupported.CODE; final Map expectedResponse = new HashMap<>(); expectedResponse.put("access_token", "test-token"); @@ -49,6 +50,7 @@ void testFormUrlencodedRequest() throws Exception { .withFormParam("client_id", equalTo(clientId)) .withFormParam("code_challenge", equalTo(codeChallenge)) .withFormParam("code_challenge_method", equalTo(codeChallengeMethod.getValue())) + .withFormParam("response_type", equalTo(responseTypesSupported.getValue())) .willReturn( aResponse() .withStatus(201) @@ -58,7 +60,7 @@ void testFormUrlencodedRequest() throws Exception { orgAsApi.authorize( clientId, "", - ResponseTypesSupported.CODE, + responseTypesSupported, "", "", AcrValue.PHR, From 725f7772038858e2441a661c41d76d1258b259c0 Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:48:57 -0400 Subject: [PATCH 11/12] Fixing compile error --- .../openapi/usage/javaclient/FormUrlencodedTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java index e17d53f..4489616 100644 --- a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java +++ b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java @@ -57,7 +57,7 @@ void testFormUrlencodedRequest() throws Exception { .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(expectedResponse)))); - orgAsApi.authorize( + orgAsApi.authorizeWithPost( clientId, "", responseTypesSupported, @@ -74,9 +74,9 @@ void testFormUrlencodedRequest() throws Exception { 10, "", Prompt.NONE, - ResponseMode.FORM_POST, "", "", + ResponseMode.FORM_POST, ""); // final Object result = authApi.authControllerLocalLogin(email, password, null); From 59a3582abafed70253eee99239c20b2250aa0a07 Mon Sep 17 00:00:00 2001 From: Craig Miller Date: Wed, 2 Jul 2025 10:52:04 -0400 Subject: [PATCH 12/12] Cleanup --- .../openapi-java-client-usage/pom.xml | 6 ----- .../usage/javaclient/FormUrlencodedTest.java | 24 ++++++------------- 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/usage-modules/openapi-java-client-usage/pom.xml b/usage-modules/openapi-java-client-usage/pom.xml index c34ce27..811975c 100644 --- a/usage-modules/openapi-java-client-usage/pom.xml +++ b/usage-modules/openapi-java-client-usage/pom.xml @@ -44,12 +44,6 @@ Snyk-API 1.0 - - - com.radiantlogic.openapi.generated - RadiantLogic-CloudManager - 1.3.2 - com.radiantlogic.openapi.generated Okta-OpenID-Connect--OAuth-2.0 diff --git a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java index 4489616..ddd9422 100644 --- a/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java +++ b/usage-modules/openapi-java-client-usage/src/test/java/com/radiantlogic/openapi/usage/javaclient/FormUrlencodedTest.java @@ -38,6 +38,8 @@ void testFormUrlencodedRequest() throws Exception { final String codeChallenge = "challenge"; final CodeChallengeMethod codeChallengeMethod = CodeChallengeMethod.S256; final ResponseTypesSupported responseTypesSupported = ResponseTypesSupported.CODE; + final AcrValue acrValue = AcrValue.PHR; + final AmrValue amrValue = AmrValue.DUO; final Map expectedResponse = new HashMap<>(); expectedResponse.put("access_token", "test-token"); @@ -51,23 +53,26 @@ void testFormUrlencodedRequest() throws Exception { .withFormParam("code_challenge", equalTo(codeChallenge)) .withFormParam("code_challenge_method", equalTo(codeChallengeMethod.getValue())) .withFormParam("response_type", equalTo(responseTypesSupported.getValue())) + .withFormParam("acr_values", equalTo(acrValue.getValue())) + .withFormParam("enroll_amr_values", equalTo(amrValue.getValue())) .willReturn( aResponse() .withStatus(201) .withHeader("Content-Type", "application/json") .withBody(objectMapper.writeValueAsString(expectedResponse)))); + // If it doesn't match the stub, an exception will be thrown orgAsApi.authorizeWithPost( clientId, "", responseTypesSupported, "", "", - AcrValue.PHR, + acrValue, codeChallenge, codeChallengeMethod, "", - AmrValue.DUO, + amrValue, "", "", "", @@ -78,20 +83,5 @@ void testFormUrlencodedRequest() throws Exception { "", ResponseMode.FORM_POST, ""); - - // final Object result = authApi.authControllerLocalLogin(email, password, null); - // - // assertThat(result).isNotNull(); - // assertThat(result).isInstanceOf(Map.class); - // final Map resultMap = (Map) result; - // - // assertThat(resultMap).usingRecursiveComparison().isEqualTo(expectedResponse); - - // verify( - // postRequestedFor(urlPathEqualTo("/eoc-backend/auth/local")) - // .withHeader("Content-Type", - // equalTo("application/x-www-form-urlencoded;charset=UTF-8")) - // .withFormParam("email", equalTo(email)) - // .withFormParam("password", equalTo(password))); } }