Blackduck scan fixes and PenTest

Issue-ID: PORTAL-631
Change-Id: I606837e3aefd0bbb7ff45ac2e597d214da06e7ed
Signed-off-by: st398c <st398c@research.att.com>

diff --git a/.gitignore b/.gitignore
index 01edd51..20a0744 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,4 +9,6 @@ ecomp-sdk/*/null*.csv
 ecomp-sdk/*/null*
 ecomp-sdk/*/jacoco.exec
 ecomp-sdk/*/target
+.settings
+target/*
 test*.txt

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java
index 24ea203..5c96e16 100644 (file)
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileController.java
@@ -42,6 +42,7 @@ import java.io.PrintWriter;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -51,6 +52,7 @@ import org.json.JSONObject;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.domain.Role;
 import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.domain.UserApp;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.service.RoleService;
 import org.onap.portalsdk.core.service.UserProfileService;
@@ -95,55 +97,6 @@ public class ProfileController extends RestrictedBaseController {
        @Autowired
        private RoleService roleService;
        
-       @RequestMapping(value = { "/profile" }, method = RequestMethod.GET)
-       public ModelAndView profile(HttpServletRequest request) throws IOException {
-               Map<String, Object> model = new HashMap<>();
-               ObjectMapper mapper = new ObjectMapper();
-               User user = UserUtils.getUserSession(request);
-
-               User profile;
-               Long profileId;
-               if (request.getRequestURI().indexOf("self_profile.htm") > -1) {
-                       profile = UserUtils.getUserSession(request);
-                       profileId = profile.getId();
-               } else {
-                       profileId = Long.parseLong(request.getParameter(PROFILE_ID));
-                       profile = userService.getUser(String.valueOf(profileId));
-               }
-
-               try {
-                       model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
-                       model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
-                       model.put(TIME_ZONES, mapper.writeValueAsString(getTimeZones()));
-                       model.put(AVAILABLE_ROLES, mapper.writeValueAsString(getAvailableRoles(user.getOrgUserId())));
-                       model.put(PROFILE, mapper.writeValueAsString(profile));
-                       model.put(PROFILEID, mapper.writeValueAsString(profileId));
-               } catch (Exception e) {
-                       logger.error(EELFLoggerDelegate.errorLogger, "profile: failed to write JSON", e);
-               }
-               return new ModelAndView(PROFILE, "model", model);
-       }
-
-       @RequestMapping(value = { "/self_profile" }, method = RequestMethod.GET)
-       public ModelAndView selfProfile(HttpServletRequest request) {
-               Map<String, Object> model = new HashMap<>();
-               ObjectMapper mapper = new ObjectMapper();
-
-               Long profileId = null;
-               User user = UserUtils.getUserSession(request);
-               User profile = UserUtils.getUserSession(request);
-               try {
-                       model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
-                       model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
-                       model.put(TIME_ZONES, mapper.writeValueAsString(getTimeZones()));
-                       model.put(AVAILABLE_ROLES, mapper.writeValueAsString(getAvailableRoles(user.getOrgUserId())));
-                       model.put(PROFILE, mapper.writeValueAsString(profile));
-                       model.put(PROFILEID, mapper.writeValueAsString(profileId));
-               } catch (Exception e) {
-                       logger.error(EELFLoggerDelegate.errorLogger, "self_profile: failed to write JSON", e);
-               }
-               return new ModelAndView(PROFILE, "model", model);
-       }
 
        @RequestMapping(value = { "/get_self_profile" }, method = RequestMethod.GET)
        public void getSelfProfile(HttpServletRequest request, HttpServletResponse response) {
@@ -153,6 +106,10 @@ public class ProfileController extends RestrictedBaseController {
 
                Long profileId = null;
                User profile = UserUtils.getUserSession(request);       
+                @SuppressWarnings("unchecked")
+                       Set<UserApp> userapps =  user.getUserApps();
+               Set<UserApp> userapplications = UserUtils.getUserApps(userapps);
+               profile.setUserApps(userapplications);
                try {
                        model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
                        model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
@@ -184,6 +141,10 @@ public class ProfileController extends RestrictedBaseController {
                                profileId = Long.parseLong(request.getParameter(PROFILE_ID));
                                profile = userService.getUser(String.valueOf(profileId));                               
                        }
+                        @SuppressWarnings("unchecked")
+                    Set<UserApp> userapps =  user.getUserApps();
+                    Set<UserApp> userapplications = UserUtils.getUserApps(userapps);
+                    profile.setUserApps(userapplications);
                        model.put(STATE_LIST, mapper.writeValueAsString(getStates()));
                        model.put(COUNTRIES, mapper.writeValueAsString(getCountries()));
                        model.put(TIME_ZONES, mapper.writeValueAsString(getTimeZones()));

diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
index a94c3b4..fdd26ba 100644 (file)
--- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
+++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/core/ProfileSearchController.java
@@ -54,6 +54,7 @@ import org.onap.portalsdk.core.auth.LoginStrategy;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.domain.MenuData;
 import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.domain.UserApp;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.onboarding.exception.PortalAPIException;
 import org.onap.portalsdk.core.service.FnMenuService;
@@ -61,6 +62,7 @@ import org.onap.portalsdk.core.service.UserProfileService;
 import org.onap.portalsdk.core.service.UserService;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.portalsdk.core.web.support.JsonMessage;
+import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -105,31 +107,6 @@ public class ProfileSearchController extends RestrictedBaseController {
                return new ModelAndView(getViewName(), "model", model);
        }
 
-       @RequestMapping(value = { "/get_user" }, method = RequestMethod.GET)
-       public void getUser(HttpServletRequest request, HttpServletResponse response) {
-               logger.info(EELFLoggerDelegate.applicationLogger, "Initiating get_user in ProfileSearchController");
-               String  userId = "";
-               try {
-                        userId =  loginStrategy.getUserId(request);
-               } catch (PortalAPIException e1) {
-                       logger.error(EELFLoggerDelegate.applicationLogger, "No User found in request", e1);
-               }
-               
-               final String requestedUserId = userId;
-               ObjectMapper mapper = new ObjectMapper();
-               List<User> profileList = null;
-               try {
-                       profileList = service.findAll();
-            User user = profileList.stream()
-                                       .filter(x -> x.getOrgUserId().equals(requestedUserId)).findAny().orElse(null);
-            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(user));
-                       JSONObject j = new JSONObject(msg);
-                       response.setContentType(APPLICATION_JSON);
-                       response.getWriter().write(j.toString());
-               } catch (Exception e) {
-                       logger.error(EELFLoggerDelegate.applicationLogger, "getUser failed", e);
-               }
-       }
 
        @RequestMapping(value = { "/get_user_pagination" }, method = RequestMethod.GET)
        public void getUserPagination(HttpServletRequest request, HttpServletResponse response) {
@@ -139,16 +116,25 @@ public class ProfileSearchController extends RestrictedBaseController {
                int pageNum = Integer.parseInt(request.getParameter("pageNum"));
                int viewPerPage = Integer.parseInt(request.getParameter("viewPerPage"));
                List<User> profileList = null;
+               List<User> profileFinalList = new ArrayList<>();
                try {
                        profileList = service.findAll();
+                       for(User user: profileList)
+                       {
+                               Set<UserApp> userapps = user.getUserApps();
+                               Set<UserApp> userapplications = UserUtils.getUserApps(userapps);
+                               user.setUserApps(userapplications);
+                               profileFinalList.add(user);
+                       }
+                       
                        model.put("totalPage", (int) Math.ceil((double) profileList.size() / viewPerPage));
                        profileList = profileList.subList(
                                        viewPerPage * (pageNum - 1) < profileList.size() ? viewPerPage * (pageNum - 1) : profileList.size(),
                                        viewPerPage * pageNum < profileList.size() ? viewPerPage * pageNum : profileList.size());
-                       model.put("profileList", mapper.writeValueAsString(profileList));
+                       model.put("profileList", mapper.writeValueAsString(profileFinalList));
                        JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
                        JSONObject j = new JSONObject(msg);
-                       response.setContentType(APPLICATION_JSON);
+                       response.setContentType("application/json");
                        response.getWriter().write(j.toString());
                } catch (Exception e) {
                        logger.error(EELFLoggerDelegate.applicationLogger, "getUserPagination failed", e);

diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java
index fc0871a..e3158bf 100644 (file)
--- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileControllerTest.java
@@ -108,73 +108,7 @@ public class ProfileControllerTest {
        @Mock
        UserUtils userUtils = new UserUtils();
 
-       @Test
-       public void profileTest() throws IOException {
-               ModelAndView actualModelAndView = new ModelAndView("profile");
-               User user = new User();
-               user.setOrgUserId("test");
-               Long profileId = null;
-               PowerMockito.mockStatic(AppUtils.class);
-               PowerMockito.mockStatic(UserUtils.class);
-               Mockito.when(mockedRequest.getRequestURI()).thenReturn("self_profile.htm");
-               Mockito.when(mockedRequest.getParameter("profile_id")).thenReturn("test");
-               Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-               Mockito.when(AppUtils.getLookupList("FN_LU_STATE", "STATE_CD", "STATE", null, "STATE_CD"))
-                               .thenReturn(new ArrayList<>());
-               Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(user);
-               ModelAndView expectedModelAndView = profileController.profile(mockedRequest);
-               assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-       }
-
-       @Test
-       public void profileRequestURITest() throws IOException {
-               ModelAndView actualModelAndView = new ModelAndView("profile");
-               User user = new User();
-               user.setOrgUserId("test");
-               int profileId = 1;
-               PowerMockito.mockStatic(AppUtils.class);
-               PowerMockito.mockStatic(UserUtils.class);
-               Mockito.when(mockedRequest.getRequestURI()).thenReturn("test");
-               Mockito.when(mockedRequest.getParameter("profile_id")).thenReturn("1");
-               Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-               Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(user);
-               Mockito.when(AppUtils.getLookupList("FN_LU_STATE", "STATE_CD", "STATE", null, "STATE_CD"))
-                               .thenReturn(new ArrayList<>());
-               Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(user);
-               ModelAndView expectedModelAndView = profileController.profile(mockedRequest);
-               assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-       }
-
-       @Test
-       public void profileExceptionTest() throws IOException {
-               ModelAndView actualModelAndView = new ModelAndView("profile");
-               User profile = null;
-               Long profileId = null;
-               Mockito.when(mockedRequest.getRequestURI()).thenReturn("self_profile.htm");
-               Mockito.when(mockedRequest.getParameter("profile_id")).thenReturn("test");
-               Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-               Mockito.when(userService.getUser(String.valueOf(profileId))).thenReturn(profile);
-               ModelAndView expectedModelAndView = profileController.profile(mockedRequest);
-               assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-       }
-
-       @Test
-       public void selfProfileTest() throws Exception {
-               ModelAndView actualModelAndView = new ModelAndView("profile");
-               PowerMockito.mockStatic(AppUtils.class);
-               PowerMockito.mockStatic(UserUtils.class);
-               Mockito.when(AppUtils.getLookupList("FN_LU_STATE", "STATE_CD", "STATE", null, "STATE_CD"))
-                               .thenReturn(new ArrayList<>());
-               Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-               ModelAndView expectedModelAndView = profileController.selfProfile(mockedRequest);
-               assertEquals(actualModelAndView.getViewName(), expectedModelAndView.getViewName());
-       }
-
-       @Test
-       public void selfProfileExceptionTest() throws Exception {
-               Mockito.when(UserUtils.getUserSession(mockedRequest)).thenReturn(user);
-               profileController.selfProfile(mockedRequest);
-       }
+       
 
        @SuppressWarnings("rawtypes")
        @Test

diff --git a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileSearchControllerTest.java b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileSearchControllerTest.java
index cc67215..185672f 100644 (file)
--- a/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileSearchControllerTest.java
+++ b/ecomp-sdk/epsdk-app-common/src/test/java/org/onap/portalapp/controller/core/ProfileSearchControllerTest.java
@@ -119,31 +119,6 @@ public class ProfileSearchControllerTest {
                profileSearchController.profileSearch(mockedRequest);
        }
        
-       @Test
-       public void getUserTest() throws IOException, PortalAPIException{
-               List<User> profileList = new ArrayList<>();
-               User user = new User();
-               user.setOrgUserId("test");
-               StringWriter sw = new StringWriter();
-               PrintWriter writer = new PrintWriter(sw);
-               Mockito.when(loginStrategy.getUserId(mockedRequest)).thenReturn("test");
-               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
-               Mockito.when(service.findAll()).thenReturn(profileList);
-               profileSearchController.getUser(mockedRequest, mockedResponse);
-       }
-       
-       @Test
-       public void getUserExceptionTest() throws IOException, PortalAPIException{
-               List<User> profileList = null;
-               User user = new User();
-               user.setOrgUserId("test");
-               StringWriter sw = new StringWriter();
-               PrintWriter writer = new PrintWriter(sw);
-               Mockito.when(loginStrategy.getUserId(mockedRequest)).thenReturn("test");
-               Mockito.when(mockedResponse.getWriter()).thenReturn(writer);
-               Mockito.when(service.findAll()).thenReturn(profileList);
-               profileSearchController.getUser(mockedRequest, mockedResponse);
-       }
        
        @Test
        public void getUserPaginationTest() throws IOException{

diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html
index b774579..ea801ae 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngsamplePage.html
@@ -17,12 +17,12 @@
        
        <!-- Common scripts -->
 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
index 4de3e64..2288e98 100644 (file)
--- a/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
+++ b/ecomp-sdk/epsdk-app-os/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/samplePage.html
@@ -17,12 +17,12 @@
        
        <!-- Common scripts -->
 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp
index afb4c8e..2ee07ae 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/WEB-INF/fusion/jsp/ds2/template.jsp
@@ -69,12 +69,12 @@
        <script src="app/fusion/external/angular-1.5/angular-sanitize.js"></script>     
        <script src="app/fusion/external/angular-1.5/angular-route.min.js"></script>
        <script src="app/fusion/external/angular-1.5/angular-cookies.min.js"></script>-->
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/ds2/js/digital-ng-library/digital-design-library.js"></script> 
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/ngworkflow-landing.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/ngworkflow-landing.html
index 07d50af..44339b3 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/ngworkflow-landing.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/ngworkflow-landing.html
@@ -18,12 +18,12 @@
 
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
        
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/workflow-landing.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/workflow-landing.html
index b3526e3..7bcd9a8 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/workflow-landing.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/DS2-workflows-page/workflow-landing.html
@@ -18,12 +18,12 @@
 
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
        
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html
index 779b2c5..6a3660d 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/bootstrap-sample-page.html
@@ -24,12 +24,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/external/bootstrap-3.3.7/css/bootstrap.min.css">
        <link rel="stylesheet" type="text/css" href="app/fusion/external/ds2-bootstrap/b2b-bootstrap-common.css">
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>
        <script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html
index ecab06a..1c623af 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/admin.html
@@ -20,12 +20,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
        
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.js"></script>    
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.js"></script>   
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html
index f2bd0bc..619dec2 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/collaboration.html
@@ -111,12 +111,12 @@
     <script type="text/javascript" src="app/fusion/scripts/socket/peerBroadcast.js"></script>
        <script type="text/javascript" src="app/fusion/scripts/layout/debug.js"></script>
        
-               <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+               <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/ds2/js/appDS2.js"></script>    
  
        

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/ngadmin.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/ngadmin.html
index ad0ee46..32ce58b 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/ngadmin.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/ngadmin.html
@@ -18,12 +18,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
        
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.js"></script>    
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.js"></script>   
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html
index 37729dd..028793c 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/ngprofile.html
@@ -20,12 +20,12 @@
        
        <!-- Common scripts -->
        
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <!-- B2b Library -->
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html
index 8aade05..8190f3b 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-profile/profile.html
@@ -20,12 +20,12 @@
        
        <!-- Common scripts -->
        
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <!-- B2b Library -->
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
index ce70dc5..fcad9de 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/all-reports.html
@@ -24,12 +24,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
 
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/ngall-reports.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/ngall-reports.html
index bad0aeb..b026ac8 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/ngall-reports.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-reports/ngall-reports.html
@@ -24,12 +24,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
 
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html
index 7813b0c..0ec9e94 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/ngnotebook-frame.html
@@ -12,12 +12,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
        <!-- Common scripts -->
 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html
index c9bcc27..815ea4b 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-samplePages/notebook-frame.html
@@ -12,12 +12,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
        <!-- Common scripts -->
 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <script src="app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome-sample.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome-sample.html
index 52305d5..6200985 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome-sample.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome-sample.html
@@ -59,12 +59,12 @@
        
        <!-- Common scripts -->
        
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
                
        <script src="app/fusion/external/ds2/js/b2b-angular/b2b-library.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
index 0733e4e..bbaaf96 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/welcome.html
@@ -23,12 +23,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
 
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>
        <script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html
index ecdccb6..408ceaa 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/view-models/reportdashboard-page/src/report-dashboard.html
@@ -62,11 +62,11 @@
     <script src="app/fusion/scripts/view-models/reportdashboard-page/bower_components/angular-markdown-directive/markdown.js"></script>    
  -->
     <script src="app/fusion/ase/scripts/dependencies/jquery-2.1.4.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular.js"></script> 
-    <script src="app/fusion/external/angular-1.4.8/angular-cookies.js"></script>
-    <script src="app/fusion/external/angular-1.4.8/angular-mocks.js"></script>
-    <script src="app/fusion/external/angular-1.4.8/angular-route.js"></script>
-    <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.js"></script> 
+    <script src="app/fusion/external/angular-1.4.13/angular-cookies.js"></script>
+    <script src="app/fusion/external/angular-1.4.13/angular-mocks.js"></script>
+    <script src="app/fusion/external/angular-1.4.13/angular-route.js"></script>
+    <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>
     <script src="app/fusion/external/angular-ui/ui-bootstrap-tpls-1.2.4.min.js"></script>
        <script src="app/fusion/ase/scripts/menus/jquery-ui.min.js"></script>
     <script src="app/fusion/ase/scripts/menus/bootstrap.min.js"></script>

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/ngwelcome.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/ngwelcome.html
index 63217b9..71aa415 100644 (file)
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/ngwelcome.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/ngapp/src/ngwelcome.html
@@ -22,12 +22,12 @@
        <link rel="stylesheet" type="text/css" href="app/fusion/styles/ecomp.css">
 
        <!-- Common scripts --> 
-       <script src="app/fusion/external/angular-1.4.8/angular.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-messages.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-touch.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-sanitize.js"></script>   
-       <script src="app/fusion/external/angular-1.4.8/angular-route.min.js"></script>
-       <script src="app/fusion/external/angular-1.4.8/angular-cookies.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-messages.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-touch.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-sanitize.js"></script>  
+       <script src="app/fusion/external/angular-1.4.13/angular-route.min.js"></script>
+       <script src="app/fusion/external/angular-1.4.13/angular-cookies.min.js"></script>
        <script src="app/fusion/external/jquery/dist/jquery.min.js"></script>
        <script src="app/fusion/external/javascript-detect-element-resize/jquery.resize.js"></script>
        <script src="app/fusion/external/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>

diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java
index bb58e64..f69a6dd 100644 (file)
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/web/support/UserUtils.java
@@ -56,6 +56,7 @@ import javax.servlet.http.HttpSession;
 import org.onap.portalsdk.core.domain.Role;
 import org.onap.portalsdk.core.domain.RoleFunction;
 import org.onap.portalsdk.core.domain.User;
+import org.onap.portalsdk.core.domain.UserApp;
 import org.onap.portalsdk.core.exception.SessionExpiredException;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.menu.MenuBuilder;
@@ -72,6 +73,8 @@ public class UserUtils {
        private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(UserUtils.class);
 
        public static final String KEY_USER_ROLES_CACHE = "userRoles";
+       
+       private static final String DISPLAY_TEXT = "*******";
 
        public static void setUserSession(HttpServletRequest request, User user, Set applicationMenuData,
                        Set businessDirectMenuData, String loginMethod, List<RoleFunction> roleFunctionList) {
@@ -393,5 +396,20 @@ public class UserUtils {
         ecompRoleFunction.setAction(rolefun.getAction());
         return ecompRoleFunction;
  }
-
+ public static Set<UserApp> getUserApps(Set<UserApp> userCurrentApps)
+       {
+               Set<UserApp> userapplications = new HashSet<>();
+               for (UserApp userApp : userCurrentApps) {
+                       obfuscateSensitiveDataUserApps(userApp);
+                       userapplications.add(userApp);
+               }
+               return userapplications;
+       }
+ 
+ private static void obfuscateSensitiveDataUserApps(UserApp userApp)
+       {
+               userApp.getApp().setAppPassword(DISPLAY_TEXT);
+               userApp.getApp().setUebKey(DISPLAY_TEXT);
+               userApp.getApp().setUebSecret(DISPLAY_TEXT);
+       }
 }

diff --git a/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/core/onboarding/util/AuthUtilTest.java b/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/core/onboarding/util/AuthUtilTest.java
index 35f0b02..0074592 100644 (file)
--- a/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/core/onboarding/util/AuthUtilTest.java
+++ b/ecomp-sdk/epsdk-fw/src/test/java/org/onap/portalsdk/core/onboarding/util/AuthUtilTest.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START==========================================
  * ONAP Portal SDK
  * ===================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2019 AT&T Intellectual Property. All rights reserved.
  * ===================================================================
  *
  * Unless otherwise specified, all software contained herein is licensed

diff --git a/ecomp-sdk/epsdk-logger/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java b/ecomp-sdk/epsdk-logger/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java
index c204dbb..a67b979 100644 (file)
--- a/ecomp-sdk/epsdk-logger/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java
+++ b/ecomp-sdk/epsdk-logger/src/main/java/org/onap/portalsdk/core/logging/logic/EELFLoggerDelegate.java
@@ -423,7 +423,7 @@ public class EELFLoggerDelegate extends SLF4jWrapper implements EELFLogger {
         */
        private void setGlobalLoggingContext() {
                MDC.put(MDC_SERVICE_INSTANCE_ID, "");
-               MDC.put(MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.toString());
+               MDC.put(MDC_ALERT_SEVERITY, AlarmSeverityEnum.INFORMATIONAL.severity());
                try {
                        MDC.put(MDC_SERVER_FQDN, InetAddress.getLocalHost().getHostName());
                        MDC.put(MDC_SERVER_IP_ADDRESS, InetAddress.getLocalHost().getHostAddress());