From 439e16586f6a1b05a892cada09e7b48cb322878c Mon Sep 17 00:00:00 2001
From: rv871f <richard.vondadelszen@amdocs.com>
Date: Thu, 29 Mar 2018 11:38:04 -0400
Subject: Portal Login Filter reintegration

Issue-ID: AAI-599
Change-Id: I119608a418a07546cd58d4fcbdf93f033c8fbd88
Signed-off-by: rv871f <richard.vondadelszen@amdocs.com>
---
 .../main/java/org/onap/aai/sparky/Application.java | 44 ++++++++++++----------
 .../src/main/scripts/start.sh                      |  3 +-
 2 files changed, 26 insertions(+), 21 deletions(-)

(limited to 'sparkybe-onap-application/src/main')

diff --git a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java
index 693617b..1077642 100644
--- a/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java
+++ b/sparkybe-onap-application/src/main/java/org/onap/aai/sparky/Application.java
@@ -20,25 +20,30 @@
  */
 package org.onap.aai.sparky;
 
+import javax.servlet.Filter;
+
+import org.onap.aai.sparky.security.filter.LoginFilter;
+
 import org.apache.camel.component.servlet.CamelHttpTransportServlet;
 import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.web.servlet.ServletRegistrationBean;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 
 @SpringBootApplication
 public class Application {
-  
-  public static void main(String[] args) {
 
-    SpringApplication.run(Application.class, args);
+  private Filter loginFilter = new LoginFilter();
 
+  public static void main(String[] args) {
+    SpringApplication.run(Application.class, args);
   }
-     
+
   /*
    * This initialization code enabled access to aai-ui-proxy-processor
    */
-  
   @Bean
   ServletRegistrationBean servletRegistrationBean() {
     final ServletRegistrationBean servlet =
@@ -48,20 +53,19 @@ public class Application {
   }
 
   /**
-   * bind LoginFilter 
+   * bind LoginFilter
    */
-  
-  /*@Bean
-  public FilterRegistrationBean myFilter() {
-      FilterRegistrationBean registration = new FilterRegistrationBean();
-      Filter myFilter = new LoginFilter();
-      beanFactory.autowireBean(myFilter);
-      registration.setFilter(myFilter);
-      registration.addUrlPatterns("/*");
-      return registration;
-  }*/
-  
-      
-  
-  
+  @Bean
+  @ConditionalOnProperty(value = "sparky.portal.enabled", havingValue = "true")
+  public FilterRegistrationBean loginFilterRegistrationBean() {
+    FilterRegistrationBean registration = new FilterRegistrationBean();
+    
+    registration.setFilter(loginFilter);
+    registration.addUrlPatterns("/*");
+    
+    return registration;
+  }
+
+
+
 }
diff --git a/sparkybe-onap-application/src/main/scripts/start.sh b/sparkybe-onap-application/src/main/scripts/start.sh
index 0db0d37..f2f6f31 100644
--- a/sparkybe-onap-application/src/main/scripts/start.sh
+++ b/sparkybe-onap-application/src/main/scripts/start.sh
@@ -6,5 +6,6 @@ CONFIG_HOME=${APP_HOME}/appconfig
 PROPS="-DAPP_HOME=${APP_HOME} -DCONFIG_HOME=${CONFIG_HOME}"
 
 set -x
-java -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar --sparky.ssl.enabled=${UI_SSL_ENABLED}
+jar ufv ${APP_HOME}/lib/sparkybe-onap-application*.jar -C ${CONFIG_HOME}/portal/ BOOT-INF/classes/portal.properties
+java -Xms1024m -Xmx4096m $PROPS -jar ${APP_HOME}/lib/sparkybe-onap-application*.jar --sparky.ssl.enabled=${UI_SSL_ENABLED} --sparky.portal.enabled=${UI_PORTAL_ENABLED}
 
-- 
cgit 1.2.3-korg