Correct the CDS basic auth header in the request

Issue-ID: POLICY-2088
Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca>
Change-Id: Ibcdfdbd1de66fcf193e52fcc14a1220c7520f140

diff --git a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java
index 8505318..1b31490 100644 (file)
--- a/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java
+++ b/models-interactions/model-impl/cds/src/main/java/org/onap/policy/cds/properties/CdsServerProperties.java
@@ -82,7 +82,9 @@ public class CdsServerProperties implements ParameterGroup {
      * @return Base64 encoded string
      */
     public String getBasicAuth() {
-        return Base64.getEncoder().encodeToString(String.format("%s:%s", getUsername(), getPassword())
-            .getBytes(StandardCharsets.UTF_8));
+        String encodedAuth = Base64.getEncoder().encodeToString(
+                String.format("%s:%s", getUsername(), getPassword()).getBytes(StandardCharsets.UTF_8));
+        // Return encoded basic auth header
+        return "Basic " + encodedAuth;
     }
 }

diff --git a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java
index fedf470..3192520 100644 (file)
--- a/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java
+++ b/models-interactions/model-impl/cds/src/test/java/org/onap/policy/cds/client/BasicAuthClientHeaderInterceptorTest.java
@@ -120,7 +120,7 @@ public class BasicAuthClientHeaderInterceptorTest {
 
         Key<String> authHeader = Key
             .of(BasicAuthClientHeaderInterceptor.BASIC_AUTH_HEADER_KEY, Metadata.ASCII_STRING_MARSHALLER);
-        String expectedBaseAuth = Base64.getEncoder().encodeToString(String.format("%s:%s", CREDS, CREDS)
+        String expectedBaseAuth = "Basic " + Base64.getEncoder().encodeToString(String.format("%s:%s", CREDS, CREDS)
             .getBytes(StandardCharsets.UTF_8));
         assertEquals(expectedBaseAuth, metadataCaptor.getValue().get(authHeader));
     }