From e3636b96e9938cb89bb90672cf70fff3ae790186 Mon Sep 17 00:00:00 2001
From: Muni Mohan Kunchi <munmohan@att.com>
Date: Thu, 6 Feb 2020 13:51:45 -0500
Subject: adding sdk changes

adding sdk changes

Issue-ID: PORTAL-830
Signed-off-by: Muni Mohan Kunchi <munmohan@att.com>
Change-Id: I0c99d3ab15fcf4c3b34d84658b64114dadbe2577
---
 ecomp-sdk/epsdk-core/pom.xml                                          | 2 +-
 .../src/main/java/org/onap/portalsdk/core/auth/LoginStrategy.java     | 4 ++--
 .../org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java  | 4 +---
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'ecomp-sdk/epsdk-core')

diff --git a/ecomp-sdk/epsdk-core/pom.xml b/ecomp-sdk/epsdk-core/pom.xml
index 565867dd..1e8bca6a 100644
--- a/ecomp-sdk/epsdk-core/pom.xml
+++ b/ecomp-sdk/epsdk-core/pom.xml
@@ -324,7 +324,7 @@
 		<dependency>
 			<groupId>org.quartz-scheduler</groupId>
 			<artifactId>quartz</artifactId>
-			<version>2.2.1</version>
+			<version>2.3.2</version>
 			<exclusions>
 				<!-- exclude 0.9.1.1 to avoid dupe of com.mchange:c3p0:0.9.2.1 -->
 				<exclusion>
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/auth/LoginStrategy.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/auth/LoginStrategy.java
index 6a643eac..a1a415c0 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/auth/LoginStrategy.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/auth/LoginStrategy.java
@@ -62,7 +62,7 @@ import org.springframework.web.util.WebUtils;
 
 public abstract class LoginStrategy {
 
-	public static final String DEFAULT_SUCCESS_VIEW = "welcome";
+	public static final String DEFAULT_SUCCESS_VIEW = "v2";
 	public static final String DEFAULT_FAILURE_VIEW = "login";
 	private static final String JSESSIONID = "JSESSIONID";
 
@@ -137,4 +137,4 @@ public abstract class LoginStrategy {
 		this.loginService = loginService;
 	}
 
-}
+}
\ No newline at end of file
diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java
index 95ca3de7..09fb374a 100644
--- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java
+++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/LoginServiceCentralizedImpl.java
@@ -127,9 +127,7 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS
 				if (appuser == null && userHasRoleFunctions(user)) {
 					createUserIfNecessary(user);
 				} else {
-				    if(appuser != null) {
-				        appuser.setLastLoginDate(new Date());
-				    }
+					appuser.setLastLoginDate(new Date());
 
 					// update the last logged in date for the user
 					dataAccessService.saveDomainObject(appuser, additionalParams);
-- 
cgit 1.2.3-korg