Merge "Publish fixed strings as public constants"

1 files changed, 5 insertions, 4 deletions

diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java
index dc49933e..ac310805 100644
--- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java
+++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java
@@ -53,6 +53,7 @@ import org.apache.commons.logging.LogFactory;
 import org.onap.aaf.cadi.CadiWrap;
 import org.onap.aaf.cadi.Permission;
 import org.onap.aaf.cadi.aaf.AAFPermission;
+import org.onap.portalsdk.core.onboarding.crossapi.IPortalRestCentralService;
 import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 
 public class AuthUtil {
@@ -215,9 +216,9 @@ public class AuthUtil {
 			String appName = "";
 
 			for (Map.Entry<String, String> entry : appCredentials.entrySet()) {
-				if (entry.getKey().equalsIgnoreCase("username")) {
+				if (entry.getKey().equalsIgnoreCase(IPortalRestCentralService.CREDENTIALS_USER)) {
 					appUserName = entry.getValue();
-				} else if (entry.getKey().equalsIgnoreCase("password")) {
+				} else if (entry.getKey().equalsIgnoreCase(IPortalRestCentralService.CREDENTIALS_PASS)) {
 					appPassword = entry.getValue();
 				} else {
 					appName = entry.getValue();
@@ -225,8 +226,8 @@ public class AuthUtil {
 			}
 
 			try {
-				String appUser = request.getHeader("username");
-				String password = request.getHeader("password");
+				String appUser = request.getHeader(IPortalRestCentralService.CREDENTIALS_USER);
+				String password = request.getHeader(IPortalRestCentralService.CREDENTIALS_PASS);
 
 				if (password.equals(appPassword) && appUserName.equals(appUser)) {
 					isauthorized = true;