Upgrade EPSDK-FW to version 2.6

[portal/ric-dashboard.git] / webapp-backend / src / main / java / org / oransc / ric / portal / dashboard / portalapi / PortalAuthManager.java

diff --git a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManager.java b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManager.java
index 8eb7362..dc70f7e 100644 (file)
--- a/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManager.java
+++ b/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/portalapi/PortalAuthManager.java
@@ -27,6 +27,7 @@ import java.util.Map;
 import javax.servlet.http.Cookie;
 import javax.servlet.http.HttpServletRequest;
 
+import org.onap.portalsdk.core.onboarding.crossapi.IPortalRestCentralService;
 import org.onap.portalsdk.core.onboarding.exception.CipherUtilException;
 import org.onap.portalsdk.core.onboarding.util.PortalApiConstants;
 import org.slf4j.Logger;
@@ -48,10 +49,9 @@ public class PortalAuthManager {
                        throws ClassNotFoundException, InstantiationException, IllegalAccessException, IllegalArgumentException,
                        InvocationTargetException, NoSuchMethodException, SecurityException {
                credentialsMap = new HashMap<>();
-               // The map keys are hardcoded in EPSDK-FW, no constants are defined :(
-               credentialsMap.put("appName", appName);
-               credentialsMap.put("username", username);
-               credentialsMap.put("password", password);
+               credentialsMap.put(IPortalRestCentralService.CREDENTIALS_APP, appName);
+               credentialsMap.put(IPortalRestCentralService.CREDENTIALS_USER, username);
+               credentialsMap.put(IPortalRestCentralService.CREDENTIALS_PASS, password);
                this.userIdCookieName = userCookie;
                // Instantiate here so configuration errors are detected at app-start time
                logger.debug("ctor: using decryptor class {}", decryptorClassName);