Commit 056881cf authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

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

parent f9c83836

src/main/java/org/etsi/osl/hypo/clients/oss/model/OssLifecycleData.java

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ import lombok.ToString; 
    "oauth2ClientId",

    "oauth2ClientSecret",

    "oauth2Scopes",

    "oidcBaseUrl",

    "authUrl",

    "username",

    "password"

})
@@ -38,7 +38,7 @@ public class OssLifecycleData { 


    private String oauth2Scopes;



    private String oidcBaseUrl;

    private String authUrl;



    private String username;

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

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ public class OpenSliceRestClientImpl { 
                        ossLifecycleData.getOauth2ClientSecret(),

                        ossLifecycleData.getUsername(),

                        ossLifecycleData.getPassword(),

                        ossLifecycleData.getOidcBaseUrl())

                        ossLifecycleData.getAuthUrl())

                .chain(tokenHelper::getTokens)

                .map(tokens -> "Bearer " + tokens.getAccessToken());

    }

src/main/java/org/etsi/osl/hypo/clients/oss/service/OrderingService.java

+1 −1
Original line number Diff line number Diff line
@@ -957,7 +957,7 @@ public class OrderingService { 
        if (StringUtils.isBlank(data.getOauth2Scopes())) {

            errorMessages.add("oauth2Scopes is required");

        }

        if (StringUtils.isBlank(data.getOidcBaseUrl())) {

        if (StringUtils.isBlank(data.getAuthUrl())) {

            errorMessages.add("oauth2TokenUri is required");

        }

        if (StringUtils.isBlank(data.getUsername())) {

src/main/java/org/etsi/osl/hypo/clients/oss/util/HelperFunctions.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class HelperFunctions { 
                case EXTERNAL_TMF_API_PASSWORD -> ossLifecycleData.setPassword(value);

                case EXTERNAL_TMF_API_OAUTH2_CLIENT_SECRET -> ossLifecycleData.setOauth2ClientSecret(value);

                case EXTERNAL_TMF_API_OAUTH2_SCOPES -> ossLifecycleData.setOauth2Scopes(value);

                case EXTERNAL_TMF_API_OAUTH2_TOKEN_URI -> ossLifecycleData.setOidcBaseUrl(value);

                case EXTERNAL_TMF_API_OAUTH2_TOKEN_URI -> ossLifecycleData.setAuthUrl(value);

                case EXTERNAL_TMF_API_OAUTH2_CLIENT_ID -> ossLifecycleData.setOauth2ClientId(value);

                case EXTERNAL_TMF_API_BASE_URL -> ossLifecycleData.setBaseUrl(value);

                case EXTERNAL_TMF_API_SERVICE_CATALOG_URL -> ossLifecycleData.setCatalogUrl(value);

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

+1 −1
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/auth/realms/openslice");

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

        ossLifecycleData.setOauth2ClientSecret("secret");

        ossLifecycleData.setClientRegistrationId("authOpensliceProvider");

        ossLifecycleData.setCategoryUrl("/tmf-api/serviceCatalogManagement/v4/serviceCategory");