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

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

parent b65cae6a

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",

    "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/clients/oss/oss/external/OidcClientCreator.java

+15 −12
Original line number Diff line number Diff line 
package org.etsi.osl.hypo.clients.oss.oss.external;



import io.quarkus.oidc.client.OidcClient;

import io.quarkus.oidc.client.OidcClientConfig;

import io.quarkus.oidc.client.OidcClientConfig.Grant.Type;

import io.quarkus.oidc.client.OidcClientConfigBuilder;

import io.quarkus.oidc.client.OidcClients;

import io.quarkus.oidc.client.runtime.OidcClientConfig;

import io.smallrye.mutiny.Uni;

import jakarta.enterprise.context.ApplicationScoped;

import jakarta.inject.Inject;
@@ -14,6 +14,8 @@ import org.etsi.osl.hypo.clients.oss.util.OssConstants; 
public class OidcClientCreator {



    private final OidcClients oidcClients;

    private static final String OIDC_TOKEN_PATH =

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



    @Inject

    public OidcClientCreator(OidcClients oidcClients) {
@@ -22,20 +24,21 @@ public class OidcClientCreator { 


    public Uni<OidcClient> createOidcClient(

            String name,

            String url,

            String clientId,

            String secret,

            String username,

            String password,

            String tokenPath) {

        OidcClientConfig cfg = new OidcClientConfig();

        cfg.setId(name);

        cfg.setAuthServerUrl(url + OssConstants.OPEN_SLICE_REALM);

        cfg.setClientId(clientId);

        cfg.getCredentials().setSecret(secret);

        cfg.getGrant().setType(Type.PASSWORD);

        cfg.setGrantOptions(Map.of("password", Map.of("username", username, "password", password)));

        cfg.setTokenPath(tokenPath);

            String oidcBaseUrl) {

        OidcClientConfig cfg =

                new OidcClientConfigBuilder()

                        .id(name)

                        .authServerUrl(oidcBaseUrl + OssConstants.OPEN_SLICE_REALM)

                        .clientId(clientId)

                        .credentials(secret)

                        .grant(OidcClientConfig.Grant.Type.PASSWORD)

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

                        .tokenPath(oidcBaseUrl + OIDC_TOKEN_PATH)

                        .build();

        return oidcClients.newClient(cfg);

    }

}

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

+1 −2
Original line number Diff line number Diff line
@@ -369,12 +369,11 @@ public class OpenSliceRestClientImpl { 
        return oidcClientCreator

                .createOidcClient(

                        ossLifecycleData.getName(),

                        ossLifecycleData.getBaseUrl(),

                        ossLifecycleData.getOauth2ClientId(),

                        ossLifecycleData.getOauth2ClientSecret(),

                        ossLifecycleData.getUsername(),

                        ossLifecycleData.getPassword(),

                        ossLifecycleData.getOauth2TokenUri())

                        ossLifecycleData.getOidcBaseUrl())

                .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.getOauth2TokenUri())) {

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

            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.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);