Update saml integration

reportportal · Oct 24, 2024 · b36c866 · b36c866
1 parent 02855c1
commit b36c866
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/epam/reportportal/auth/config/saml/SamlSecurityConfiguration.java b/src/main/java/com/epam/reportportal/auth/config/saml/SamlSecurityConfiguration.java
@@ -147,7 +147,7 @@ public RelyingPartyRegistrationRepository relyingParty() throws Exception {
     List<RelyingPartyRegistration> registrations = providers.stream().map(provider -> {
       RelyingPartyRegistration relyingPartyRegistration = RelyingPartyRegistrations
           .fromMetadataLocation(SamlParameter.IDP_METADATA_URL.getParameter(provider).get())
-          .registrationId("report.portal.sp.id")
+          .registrationId(SamlParameter.IDP_NAME.getParameter(provider).get())
           .entityId(entityId)
           .assertionConsumerServiceLocation(samlIntegrationType.getDetails().getDetails().get("callbackUrl").toString())
           .assertingPartyDetails(party -> party.entityId(SamlParameter.IDP_NAME.getParameter(provider).get())

diff --git a/src/main/java/com/epam/reportportal/auth/endpoint/AuthProvidersInfoContributor.java b/src/main/java/com/epam/reportportal/auth/endpoint/AuthProvidersInfoContributor.java
@@ -95,9 +95,9 @@ public void contribute(Info.Builder builder) {
           .filter(it -> SamlParameter.IDP_URL.getParameter(it).isPresent())
           .collect(Collectors.toMap(
               Integration::getName,
-              it -> fromCurrentContextPath().path(String.format("/%s/discovery?idp=%s",
+              it -> fromCurrentContextPath().path(String.format("/%s/discovery/%s",
                   samlPrefix,
-                  UriUtils.encode(SamlParameter.IDP_URL.getParameter(it).get(), UTF_8.toString())
+                  UriUtils.encode(SamlParameter.IDP_NAME.getParameter(it).get(), UTF_8.toString())
               )).build().getPath()
           ));
     }