From 07ebdbb579bc2b9ef1f0e26d0c98d2c0fdcd353d Mon Sep 17 00:00:00 2001 From: pwielebs Date: Tue, 5 Jun 2018 12:19:28 +0200 Subject: basic authentication for AAI Producer Client Change-Id: I087db36dc3c60015f91de5fde49358b18564ab9e Issue-ID: DCAEGEN2-451 Signed-off-by: pwielebs --- .../dcaegen2/services/prh/service/AAIProducerClient.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'prh-aai-client/src/main/java/org/onap/dcaegen2') diff --git a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java index dce326ec..f9c2708e 100644 --- a/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java +++ b/prh-aai-client/src/main/java/org/onap/dcaegen2/services/prh/service/AAIProducerClient.java @@ -35,6 +35,7 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; +import java.util.Base64; import java.util.Map; import java.util.Optional; @@ -49,6 +50,8 @@ public class AAIProducerClient implements AAIExtendedHttpClient { private final Integer aaiHostPortNumber; private final String aaiPath; private final Map aaiHeaders; + private final String aaiUserName; + private final String aaiUserPassword; public AAIProducerClient(AAIClientConfiguration aaiClientConfiguration) { @@ -58,6 +61,8 @@ public class AAIProducerClient implements AAIExtendedHttpClient { aaiHostPortNumber = aaiClientConfiguration.aaiHostPortNumber(); aaiPath = aaiClientConfiguration.aaiBasePath() + aaiClientConfiguration.aaiPnfPath(); aaiHeaders = aaiClientConfiguration.aaiHeaders(); + aaiUserName = aaiClientConfiguration.aaiUserName(); + aaiUserPassword = aaiClientConfiguration.aaiUserPassword(); } @@ -71,7 +76,6 @@ public class AAIProducerClient implements AAIExtendedHttpClient { return Optional.empty(); } }); - } private Optional createRequest(ConsumerDmaapModel consumerDmaapModel) throws URISyntaxException { @@ -98,11 +102,17 @@ public class AAIProducerClient implements AAIExtendedHttpClient { }); } - private HttpPatch createHttpPatch(URI extendedURI, String jsonBody) throws UnsupportedEncodingException { + HttpPatch createHttpPatch(URI extendedURI, String jsonBody) throws UnsupportedEncodingException { HttpPatch httpPatch = new HttpPatch(extendedURI); httpPatch.setEntity( new StringEntity(jsonBody)); aaiHeaders.forEach(httpPatch::addHeader); httpPatch.addHeader("Content-Type", "application/merge-patch+json"); + httpPatch.addHeader("Authorization", "Basic " + encode()); return httpPatch; } + + String encode() throws UnsupportedEncodingException { + return Base64.getEncoder().encodeToString((this.aaiUserName + ":" + this.aaiUserPassword) + .getBytes("UTF-8")); + } } -- cgit 1.2.3-korg