From 54920aad72efa8bc8239fab6fce968b888401704 Mon Sep 17 00:00:00 2001 From: ShakedSol Date: Mon, 3 Mar 2025 12:16:41 +0200 Subject: [PATCH 1/4] FR-19354 - added-SsoRequestPayload-class --- .../java/com/frontegg/sdk/sso/SsoClient.java | 2 +- .../frontegg/sdk/sso/SsoRequestPayload.java | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java diff --git a/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java b/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java index dcbdaeb..52a23e6 100644 --- a/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java +++ b/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java @@ -52,7 +52,7 @@ public String preLogin(String payload) public String preLoginWithEmailOrTenantId(String payload) { var urlPath = this.fronteggConfig.getUrlConfig().getTeamService() + DEPRECATED_PRE_LOGIN_PATH; - var response = this.apiClient.post(urlPath, Object.class, withHeaders(), new SsoRequest(payload)); + var response = this.apiClient.post(urlPath, Object.class, withHeaders(), new SsoRequestWithPayload(payload)); validateStatus(urlPath, response); var locationHeader = response.getHeaders() .stream() diff --git a/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java b/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java new file mode 100644 index 0000000..4487706 --- /dev/null +++ b/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java @@ -0,0 +1,20 @@ +package com.frontegg.sdk.sso; + +public class SsoRequestPayload +{ + private String payload; + + public SsoRequestPayload() + { + } + + public SsoRequestPayload(String payload) + { + this.payload = payload; + } + + public String getPayload() + { + return this.payload; + } +} \ No newline at end of file From fae043130095878e45985ce36a0289c0a5a1adc4 Mon Sep 17 00:00:00 2001 From: ShakedSol Date: Mon, 3 Mar 2025 12:19:26 +0200 Subject: [PATCH 2/4] fix --- .../{SsoRequestPayload.java => SsoRequestWithPayload.java} | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) rename sso/src/main/java/com/frontegg/sdk/sso/{SsoRequestPayload.java => SsoRequestWithPayload.java} (58%) diff --git a/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java b/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestWithPayload.java similarity index 58% rename from sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java rename to sso/src/main/java/com/frontegg/sdk/sso/SsoRequestWithPayload.java index 4487706..b82b924 100644 --- a/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestPayload.java +++ b/sso/src/main/java/com/frontegg/sdk/sso/SsoRequestWithPayload.java @@ -1,14 +1,11 @@ package com.frontegg.sdk.sso; -public class SsoRequestPayload +public class SsoRequestWithPayload { private String payload; - public SsoRequestPayload() - { - } - public SsoRequestPayload(String payload) + public SsoRequestWithPayload(String payload) { this.payload = payload; } From 65b11e46cef4224f76cb1d3571e36521bc78faab Mon Sep 17 00:00:00 2001 From: ShakedSol Date: Mon, 3 Mar 2025 13:06:09 +0200 Subject: [PATCH 3/4] upgrade to v4 --- .github/workflows/ci-actions.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml index 2715e5e..e1db998 100644 --- a/.github/workflows/ci-actions.yml +++ b/.github/workflows/ci-actions.yml @@ -31,7 +31,7 @@ jobs: uses: actions/setup-java@v4 with: java-version: 17 - distribution: 'adopt' + distribution: "adopt" - name: Cache local Maven repository uses: actions/cache@v4 with: @@ -62,12 +62,12 @@ jobs: uses: actions/setup-java@v4 with: java-version: ${{ matrix.java.java-version }} - distribution: 'adopt' + distribution: "adopt" - name: Cache local Maven repository - uses: actions/cache@v2 + uses: actions/cache@v4 with: path: ~/.m2/repository key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - name: Test run: | - mvn -e -B test \ No newline at end of file + mvn -e -B test From 98a3c798e82d83e8bfa426c0c0eb16072c16bc51 Mon Sep 17 00:00:00 2001 From: ShakedSol Date: Mon, 3 Mar 2025 19:33:00 +0200 Subject: [PATCH 4/4] fix getSsoConfiguratio --- sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java b/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java index 52a23e6..cf47b21 100644 --- a/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java +++ b/sso/src/main/java/com/frontegg/sdk/sso/SsoClient.java @@ -21,7 +21,7 @@ public class SsoClient private static final String DEPRECATED_SSO_PATH_PREFIX = "/resources/sso/v1"; private static final String DEPRECATED_PRE_LOGIN_PATH = DEPRECATED_SSO_PATH_PREFIX + "/prelogin"; - private static final String SAML_PATH = SSO_PATH_PREFIX + "/saml"; + private static final String SAML_PATH = DEPRECATED_SSO_PATH_PREFIX + "/saml"; private static final String SAML_CONFIGURATIONS_PATH = SAML_PATH + "/configurations"; private static final String SAML_VENDOR_CONFIG_PATH = SAML_CONFIGURATIONS_PATH + "/vendor-config";