login and Certman AAF Integration changes

[portal.git] / ecomp-portal-BE-os / src / main / java / org / onap / portalapp / conf / ExternalAppConfig.java

diff --git a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
index c3fdf0a..e9c4825 100644 (file)
--- a/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
+++ b/ecomp-portal-BE-os/src/main/java/org/onap/portalapp/conf/ExternalAppConfig.java
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.conf;
 
@@ -74,7 +74,6 @@ import org.onap.portalapp.portal.service.ExternalAccessRolesService;
 import org.onap.portalapp.portal.service.UserRolesService;
 import org.onap.portalapp.portal.transport.ExternalAuthUserRole;
 import org.onap.portalapp.portal.transport.ExternalRoleDescription;
-import org.onap.portalapp.portal.ueb.EPUebHelper;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
 import org.onap.portalapp.portal.utils.EPSystemProperties;
 import org.onap.portalapp.scheduler.RegistryAdapter;
@@ -162,9 +161,10 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                        MDC.put(MDC_SERVICE_INSTANCE_ID, "");
                        MDC.put(MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.severity());
                        MDC.put(MDC_INSTANCE_UUID, SystemProperties.getProperty(SystemProperties.INSTANCE_UUID));
-                       if("true".equalsIgnoreCase(remotecentralizedsystemaccess)){
-                               importFromExternalAuth();
-                       }                       
+                       
+                       //                      if("true".equalsIgnoreCase(remotecentralizedsystemaccess)){
+                       //                              importFromExternalAuth();
+                       //                      }                       
                } catch (Exception e) {
                        logger.error(EELFLoggerDelegate.errorLogger, "init failed", e);
                }
@@ -175,7 +175,10 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
         * for all the centralized applications between AAF and ONAP, updates
         * fn_user and fn_user_role with user information from AAF.
         * 
+        * This is being handled in AAF directly, so it has been deprecated
+        * 
         */
+       @Deprecated
        private void importFromExternalAuth() throws Exception {
                JSONArray aafAppRoles = new JSONArray();
                JSONArray aafUserList = new JSONArray();
@@ -286,7 +289,7 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
                registry.addInterceptor(sessionTimeoutInterceptor()).excludePathPatterns("/oid-login", "/portalApi/healthCheck",
                                "/portalApi/healthCheck/", "/portalApi/healthCheckSuspend", "/portalApi/healthCheckSuspend/",
                                "/portalApi/healthCheckResume", "/portalApi/healthCheckResume/", "/login_external",
-                               "/login_external.htm*", "login", "/login.htm*", "/auxapi/*", "/context/*", "/api*",
+                               "/login_external.htm*", "login", "/login.htm*", "/auxapi/**/*", "/context/*", "/api*",
                                "/single_signon.htm", "/single_signon", "/dashboard", "/OpenSourceLogin.htm");
 
                registry.addInterceptor(portalResourceInterceptor());
@@ -300,11 +303,11 @@ public class ExternalAppConfig extends AppConfig implements Configurable {
         * @return New instance of {@link SchedulerFactoryBean}
         */
 
-       @Bean
+/*     @Bean
        public EPUebHelper epUebHelper() {
                return new EPUebHelper();
        }
-
+*/
        @Bean
        public HealthMonitor healthMonitor() {
                return new HealthMonitor();