Commit 097206a8 authored by Labros Papadopoulos's avatar Labros Papadopoulos
Browse files

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

parent 7bf32a43

src/main/java/org/etsi/osl/hypo/api/peering/model/OssLifecycleData.java

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

    "oauth2ClientSecret",

    "oauth2Scopes",

    "oauth2TokenUri",

    "oidcBaseUrl",

    "username",

    "password"

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


    private String oauth2Scopes;



    private String oauth2TokenUri;

    private String oidcBaseUrl;



    private String username;

src/main/java/org/etsi/osl/hypo/api/peering/services/PeeringService.java

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ public class PeeringService { 
                            ossLifecycleData.getUsername(),

                            ossLifecycleData.getPassword(),

                            ossLifecycleData.getOrganizationId(),

                            ossLifecycleData.getOauth2TokenUri());

                            ossLifecycleData.getOidcBaseUrl());



        } catch (OidcClientException oidcClientException) {

            logger.errorf(
@@ -196,7 +196,7 @@ public class PeeringService { 
                                ossLifecycleData.getPassword(),

                                entry.getKey(),

                                ossLifecycleData.getOrganizationId(),

                                ossLifecycleData.getOauth2TokenUri());

                                ossLifecycleData.getOidcBaseUrl());

                serviceSpecificationEntityList.add(serviceSpecificationEntity);

            }

src/main/java/org/etsi/osl/hypo/api/peering/util/HelperFunctions.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,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.setOauth2TokenUri(value);

                case EXTERNAL_TMF_API_OAUTH2_TOKEN_URI -> ossLifecycleData.setOidcBaseUrl(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/api/peering/services/RetrieveSpecificationsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ class RetrieveSpecificationsTest { 
        ossLifecycleData.setUsername(TEST_USERNAME);

        ossLifecycleData.setPassword(TEST_PASSWORD);

        ossLifecycleData.setOrganizationId("testOrganization");

        ossLifecycleData.setOauth2TokenUri(TEST_BASE_URL);

        ossLifecycleData.setOidcBaseUrl(TEST_BASE_URL);

    }



    @Test