diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java index c0867a2372..857a94b71a 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/dtos/UserSessionDTO.java @@ -73,7 +73,10 @@ public class UserSessionDTO { session.email = user.getEmail(); session.hashedEmail = user.getHashedEmail(); session.name = user.getName(); - session.createdAt = user.getCreatedAt().getEpochSecond(); + // user.getCreatedAt() is null for anonymous user + if (user.getCreatedAt() != null) { + session.createdAt = user.getCreatedAt().getEpochSecond(); + } session.source = user.getSource(); session.state = user.getState(); session.isEnabled = user.isEnabled(); @@ -110,7 +113,10 @@ public class UserSessionDTO { user.setEmail(email); user.setHashedEmail(hashedEmail); user.setName(name); - user.setCreatedAt(Instant.ofEpochSecond(createdAt)); + // createdAt is null for anonymous user + if (createdAt != null) { + user.setCreatedAt(Instant.ofEpochSecond(createdAt)); + } user.setSource(source); user.setState(state); user.setIsEnabled(isEnabled);