Code Review
/
portal
/
ric-dashboard.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add Xapp Onboarder client to backend
[portal/ric-dashboard.git]
/
dashboard
/
webapp-backend
/
src
/
main
/
java
/
org
/
oransc
/
ric
/
portal
/
dashboard
/
config
/
WebSecurityConfiguration.java
diff --git
a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
index
0a3f022
..
9d9bb11
100644
(file)
--- a/
dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
+++ b/
dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/config/WebSecurityConfiguration.java
@@
-29,6
+29,7
@@
import org.oransc.ric.portal.dashboard.controller.AdminController;
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.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;
import org.oransc.ric.portal.dashboard.portalapi.PortalAuthManager;
import org.oransc.ric.portal.dashboard.portalapi.PortalAuthenticationFilter;
import org.slf4j.Logger;
@@
-102,6
+103,9
@@
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
E2ManagerController.CONTROLLER_PATH + "/" + DashboardConstants.RIC_INSTANCE_KEY + "/*/"
+ E2ManagerController.HEALTH_METHOD, //
E2ManagerController.CONTROLLER_PATH + "/" + DashboardConstants.VERSION_METHOD, //
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
SimpleErrorController.ERROR_PATH };
@Override
@@
-113,7
+117,7
@@
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
@Bean
public PortalAuthManager portalAuthManagerBean() throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException, NoSuchMethodException {
@Bean
public PortalAuthManager portalAuthManagerBean() throws ClassNotFoundException, IllegalAccessException,
InstantiationException, InvocationTargetException, NoSuchMethodException {
- logger.debug("portalAuthManagerBean
"
);
+ logger.debug("portalAuthManagerBean
: appName {}", appName
);
return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
}
return new PortalAuthManager(appName, portalApiUsername, portalApiPassword, decryptor, userCookie);
}
@@
-128,7
+132,7
@@
public class WebSecurityConfiguration extends WebSecurityConfigurerAdapter {
*/
public PortalAuthenticationFilter portalAuthenticationFilterBean() throws ClassNotFoundException,
IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
*/
public PortalAuthenticationFilter portalAuthenticationFilterBean() throws ClassNotFoundException,
IllegalAccessException, InstantiationException, InvocationTargetException, NoSuchMethodException {
- logger.debug("portalAuthenticationFilterBean
"
);
+ logger.debug("portalAuthenticationFilterBean
: portalapiSecurity {}", portalapiSecurity
);
return new PortalAuthenticationFilter(portalapiSecurity, portalAuthManagerBean(), this.userManager);
}
return new PortalAuthenticationFilter(portalapiSecurity, portalAuthManagerBean(), this.userManager);
}