move updating the last login after the user has been updated to session

oskariorg · Sep 6, 2023 · c3f1898 · c3f1898
1 parent 2376396
commit c3f1898
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/service-users/src/main/java/fi/nls/oskari/user/DatabaseUserService.java b/service-users/src/main/java/fi/nls/oskari/user/DatabaseUserService.java
@@ -11,9 +11,6 @@
 import org.apache.commons.codec.digest.DigestUtils;
 import org.springframework.security.crypto.bcrypt.BCrypt;
 
-import java.time.LocalDateTime;
-import java.time.OffsetDateTime;
-import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashSet;
@@ -67,16 +64,7 @@ public User login(final String user, final String pass) throws ServiceException
                 return null;
             }
 
-            User fetchedUser = getUser(username);
-            OffsetDateTime previousLastLogin = fetchedUser.getLastLogin();
-            OffsetDateTime now = LocalDateTime.now().atOffset(ZoneOffset.UTC);
-            fetchedUser.setLastLogin(now);
-            userService.updateUser(fetchedUser);
-
-            // return the previous login to front
-            fetchedUser.setLastLogin(previousLastLogin);
-            return fetchedUser;
-
+            return getUser(username);
         } catch (Exception ex) {
             throw new ServiceException("Unable to handle login", ex);
         }

diff --git a/servlet-map/src/main/java/fi/nls/oskari/spring/security/OskariUserHelper.java b/servlet-map/src/main/java/fi/nls/oskari/spring/security/OskariUserHelper.java
@@ -6,6 +6,7 @@
 import fi.nls.oskari.log.LogFactory;
 import fi.nls.oskari.log.Logger;
 import fi.nls.oskari.service.UserService;
+import fi.nls.oskari.user.MybatisUserService;
 import org.oskari.log.AuditLog;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.GrantedAuthority;
@@ -15,6 +16,7 @@
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
+import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -25,6 +27,7 @@
 public class OskariUserHelper {
 
     private static Logger log = LogFactory.getLogger(OskariUserHelper.class);
+    private MybatisUserService userService = new MybatisUserService();
 
     /**
      * Common code done for SAML and DB authentication on successful login
@@ -77,6 +80,11 @@ private void setupSession(final HttpServletRequest httpRequest, final String use
                 AuditLog.user(ActionParameters.getClientIp(httpRequest), loadedUser)
                         .withMsg("Login")
                         .updated(AuditLog.ResourceType.USER);
+
+                // update last login
+                User userToUpdate = UserService.getInstance().getUser(username);
+                userToUpdate.setLastLogin(OffsetDateTime.now());
+                userService.updateUser(userToUpdate);
             }
             else {
                 log.error("Login user check failed! Got user from principal, but can't find it in Oskari db:", username);