Commit f9c83836 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

feat: use oidc provider url to retrieve the oidc access token

parent 255cbd85

src/main/java/org/etsi/osl/hypo/clients/oss/oss/external/OidcClientCreator.java

+4 −6
Original line number Diff line number Diff line
@@ -8,14 +8,12 @@ import io.smallrye.mutiny.Uni; 
import jakarta.enterprise.context.ApplicationScoped;

import jakarta.inject.Inject;

import java.util.Map;

import org.etsi.osl.hypo.clients.oss.util.OssConstants;



@ApplicationScoped

public class OidcClientCreator {



    private final OidcClients oidcClients;

    private static final String OIDC_TOKEN_PATH =

            "/auth/realms/openslice/protocol/openid-connect/token";

    private static final String OIDC_TOKEN_PATH = "/protocol/openid-connect/token";



    @Inject

    public OidcClientCreator(OidcClients oidcClients) {
@@ -28,16 +26,16 @@ public class OidcClientCreator { 
            String secret,

            String username,

            String password,

            String oidcBaseUrl) {

            String authUrl) {

        OidcClientConfig cfg =

                new OidcClientConfigBuilder()

                        .id(name)

                        .authServerUrl(oidcBaseUrl + OssConstants.OPEN_SLICE_REALM)

                        .authServerUrl(authUrl)

                        .clientId(clientId)

                        .credentials(secret)

                        .grant(OidcClientConfig.Grant.Type.PASSWORD)

                        .grantOptions(Map.of("password", Map.of("username", username, "password", password)))

                        .tokenPath(oidcBaseUrl + OIDC_TOKEN_PATH)

                        .tokenPath(authUrl + OIDC_TOKEN_PATH)

                        .build();

        return oidcClients.newClient(cfg);

    }

src/test/java/org/etsi/osl/hypo/clients/oss/test/helpers/TestHelpers.java

+3 −2
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public final class TestHelpers { 
        ossLifecycleData.setBaseUrl("http://localhost:8089");

        ossLifecycleData.setOauth2ClientId("osapiWebClientId");

        ossLifecycleData.setOauth2Scopes("admin;read");

        ossLifecycleData.setOidcBaseUrl("http://localhost:8089");

        ossLifecycleData.setOidcBaseUrl("http://localhost:8089/auth/realms/openslice");

        ossLifecycleData.setOauth2ClientSecret("secret");

        ossLifecycleData.setClientRegistrationId("authOpensliceProvider");

        ossLifecycleData.setCategoryUrl("/tmf-api/serviceCatalogManagement/v4/serviceCategory");
@@ -93,7 +93,8 @@ public final class TestHelpers { 
        characteristics.put(EXTERNAL_TMF_API_PASSWORD, "password1234");

        characteristics.put(EXTERNAL_TMF_API_OAUTH2_CLIENT_SECRET, "secret");

        characteristics.put(EXTERNAL_TMF_API_OAUTH2_SCOPES, "admin;read");

        characteristics.put(EXTERNAL_TMF_API_OAUTH2_TOKEN_URI, "http://localhost:8089");

        characteristics.put(

                EXTERNAL_TMF_API_OAUTH2_TOKEN_URI, "http://localhost:8089/auth/realms/openslice");

        characteristics.put(EXTERNAL_TMF_API_OAUTH2_CLIENT_ID, "osapiWebClientId");

        characteristics.put(EXTERNAL_TMF_API_BASE_URL, "http://localhost:8089");

        characteristics.put(