import org.oransc.ric.portal.dashboard.controller.AppManagerController;
import org.oransc.ric.portal.dashboard.controller.E2ManagerController;
import org.oransc.ric.portal.dashboard.controller.SimpleErrorController;
+import org.oransc.ric.portal.dashboard.controller.XappOnboarderController;
import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
import org.oransc.ric.portal.dashboard.portalapi.PortalAuthenticationFilter;
import org.slf4j.Logger;
@Value("${portalapi.appname}")
private String appName;
@Value("${portalapi.username}")
- private String userName;
+ private String portalApiUsername;
@Value("${portalapi.password}")
- private String password;
+ private String portalApiPassword;
@Value("${portalapi.decryptor}")
private String decryptor;
@Value("${portalapi.usercookie}")
E2ManagerController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
+ E2ManagerController.HEALTH_METHOD, //
E2ManagerController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
+ XappOnboarderController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
+ XappOnboarderController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
+ + XappOnboarderController.HEALTH_METHOD, //
SimpleErrorController.ERROR_PATH };
@Override
@Bean
public PortalAuthManager portalAuthManagerBean() throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException, NoSuchMethodException {
- logger.debug("portalAuthManagerBean");
- return new PortalAuthManager(appName, userName, password, decryptor, userCookie);
+ logger.debug("portalAuthManagerBean: appName {}", appName);
+ return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
}
/*
*/
public PortalAuthenticationFilter portalAuthenticationFilterBean() throws ClassNotFoundException,
IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
- logger.debug("portalAuthenticationFilterBean");
+ logger.debug("portalAuthenticationFilterBean: portalapiSecurity {}", portalapiSecurity);
return new PortalAuthenticationFilter(portalapiSecurity, portalAuthManagerBean(), this.userManager);
}