Fix saml start (#110)

examples/management-cli/pom.xml

@@ -19,7 +19,7 @@
         <dependency>
             <groupId>com.descope</groupId>
             <artifactId>java-sdk</artifactId>
-            <version>1.0.17</version>
+            <version>1.0.19</version>
         </dependency>
         <dependency>
             <groupId>info.picocli</groupId>

pom.xml

@@ -4,7 +4,7 @@
     <groupId>com.descope</groupId>
     <artifactId>java-sdk</artifactId>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.0.18</version>
+    <version>1.0.19</version>
     <name>${project.groupId}:${project.artifactId}</name>
     <description>Java library used to integrate with Descope.</description>
     <url>https://github.com/descope/descope-java</url>

src/main/java/com/descope/model/auth/SAMLResponse.java

@@ -0,0 +1,14 @@
+package com.descope.model.auth;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SAMLResponse {
+  private String url;
+}

src/main/java/com/descope/sdk/auth/impl/SAMLServiceImpl.java

@@ -6,6 +6,7 @@
 
 import com.descope.exception.DescopeException;
 import com.descope.model.auth.AuthenticationInfo;
+import com.descope.model.auth.SAMLResponse;
 import com.descope.model.client.Client;
 import com.descope.model.magiclink.LoginOptions;
 import com.descope.proxy.ApiProxy;
@@ -23,24 +24,21 @@ class SAMLServiceImpl extends AuthenticationServiceImpl implements SAMLService {
   @Override
   public String start(String tenant, String returnURL, LoginOptions loginOptions)
       throws DescopeException {
-    Map<String, String> request = mapOf("tenant", tenant);
+    Map<String, String> params = mapOf("tenant", tenant);
     if (StringUtils.isNotBlank(returnURL)) {
-      request.put("redirectURL", returnURL);
+      params.put("redirectURL", returnURL);
     }
-    URI samlStartURLAML = composeSAMLStartURL();
+    URI samlStartURL = getQueryParamUri(COMPOSE_SAML_START_LINK, params);
     ApiProxy apiProxy = getApiProxy();
-    return apiProxy.post(samlStartURLAML, request, String.class);
+    SAMLResponse response = apiProxy.post(samlStartURL, loginOptions, SAMLResponse.class);
+    return response.getUrl();
   }
 
   @Override
   public AuthenticationInfo exchangeToken(String code) throws DescopeException {
     return exchangeToken(code, composeOAuthExchangeTokenURL());
   }
 
-  private URI composeSAMLStartURL() {
-    return getUri(COMPOSE_SAML_START_LINK);
-  }
-
   private URI composeOAuthExchangeTokenURL() {
     return getUri(EXCHANGE_SAML_LINK);
   }

src/test/java/com/descope/sdk/auth/impl/SamlLinkServiceImplTest.java

@@ -13,6 +13,7 @@
 import static org.mockito.Mockito.mockStatic;
 
 import com.descope.model.auth.AuthenticationInfo;
+import com.descope.model.auth.SAMLResponse;
 import com.descope.model.client.Client;
 import com.descope.model.jwt.Token;
 import com.descope.model.jwt.response.SigningKeysResponse;
@@ -36,17 +37,16 @@ public class SamlLinkServiceImplTest {
   @BeforeEach
   void setUp() {
     Client client = TestUtils.getClient();
-    this.samlService =
-        AuthenticationServiceBuilder.buildServices(client).getSamlService();
+    this.samlService = AuthenticationServiceBuilder.buildServices(client).getSamlService();
   }
 
   @Test
   void testStart() {
     ApiProxy apiProxy = mock(ApiProxy.class);
-    doReturn(MOCK_URL).when(apiProxy).post(any(), any(), any());
+    doReturn(new SAMLResponse(MOCK_URL)).when(apiProxy).post(any(), any(), any());
     try (MockedStatic<ApiProxyBuilder> mockedApiProxyBuilder = mockStatic(ApiProxyBuilder.class)) {
       mockedApiProxyBuilder.when(
-        () -> ApiProxyBuilder.buildProxy(any(), any())).thenReturn(apiProxy);
+          () -> ApiProxyBuilder.buildProxy(any(), any())).thenReturn(apiProxy);
       String start = samlService.start("tenant", "returnurl", new LoginOptions());
       Assertions.assertThat(start).isNotBlank().contains(MOCK_URL);
     }
@@ -57,12 +57,12 @@ void testExchangeToken() {
     ApiProxy apiProxy = mock(ApiProxy.class);
     doReturn(MOCK_JWT_RESPONSE).when(apiProxy).post(any(), any(), any());
     doReturn(new SigningKeysResponse(Arrays.asList(MOCK_SIGNING_KEY)))
-      .when(apiProxy).get(any(), eq(SigningKeysResponse.class));
+        .when(apiProxy).get(any(), eq(SigningKeysResponse.class));
 
     AuthenticationInfo authenticationInfo;
     try (MockedStatic<ApiProxyBuilder> mockedApiProxyBuilder = mockStatic(ApiProxyBuilder.class)) {
       mockedApiProxyBuilder.when(
-        () -> ApiProxyBuilder.buildProxy(any(), any())).thenReturn(apiProxy);
+          () -> ApiProxyBuilder.buildProxy(any(), any())).thenReturn(apiProxy);
 
       try (MockedStatic<JwtUtils> mockedJwtUtils = mockStatic(JwtUtils.class)) {
         mockedJwtUtils.when(() -> JwtUtils.getToken(anyString(), any())).thenReturn(MOCK_TOKEN);