Revert "User created and last login"

nls-oskari · Sep 15, 2023 · 6f4a2aa · 6f4a2aa
1 parent 136d62e
commit 6f4a2aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 108 deletions.
diff --git a/app-resources/src/main/java/flyway/pti/V3_3_2__migrate_created_and_last_login.java b/app-resources/src/main/java/flyway/pti/V3_3_2__migrate_created_and_last_login.java
diff --git a/...ain/java/fi/nls/oskari/spring/security/preauth/OskariPreAuthenticationSuccessHandler.java b/...ain/java/fi/nls/oskari/spring/security/preauth/OskariPreAuthenticationSuccessHandler.java
@@ -18,7 +18,6 @@
 import javax.servlet.http.HttpSession;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
-import java.time.OffsetDateTime;
 import java.util.Date;
 
 public class OskariPreAuthenticationSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
@@ -64,9 +63,12 @@ public void onAuthenticationSuccess(HttpServletRequest request,
 
     private User getUser(OskariUserDetails oud) throws ServiceException {
         User user = userService.getUserByEmail(oud.getUser().getEmail());
+        // sdf is not threadsafe so create new for each login
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
         if(user == null) {
             user = oud.getUser();
             user.addRole(Role.getDefaultUserRole());
+            user.setAttribute("created", format.format(new Date()));
         } else {
             // copy data that we got from headers
             user.setFirstname(oud.getUser().getFirstname());
@@ -75,6 +77,7 @@ private User getUser(OskariUserDetails oud) throws ServiceException {
             // merge attributes
             JSONHelper.merge(user.getAttributesJSON(), oud.getUser().getAttributesJSON());
         }
+        user.setAttribute("lastLogin", format.format(new Date()));
         return user;
 
     }
@@ -87,17 +90,6 @@ protected void setupSession(User authenticatedUser, HttpServletRequest request)
         AuditLog.user(ActionParameters.getClientIp(request), authenticatedUser.getEmail())
                 .withMsg("Login")
                 .updated(AuditLog.ResourceType.USER);
-
-        // update last login
-        try {
-            User userToUpdate = userService.getUser(authenticatedUser.getId());
-            userToUpdate.setLastLogin(OffsetDateTime.now());
-            userService.modifyUser(userToUpdate);
-        } catch (Exception e) {
-
-        }
-
-
     }
 
     protected DatabaseUserService getUserService() {