From 36fd7b78deba96b0e52913105d93e1503d16bac6 Mon Sep 17 00:00:00 2001
From: Nilansh Bansal <nilansh@appsmith.com>
Date: Wed, 26 Jul 2023 21:36:00 +0530
Subject: [PATCH] fix: createdAt npe fixed (#25754)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

## Description
> This PR fixes the NPE for anonymous user in userSessionDTO
#### PR fixes following issue(s)
Fixes #25753

#### Media
> A video or a GIF is preferred. when using Loom, don’t embed because it
looks like it’s a GIF. instead, just link to the video
>
>
#### Type of change
> Please delete options that are not relevant.
- Bug fix (non-breaking change which fixes an issue)

>
>
>
## Testing
>
#### How Has This Been Tested?
> Please describe the tests that you ran to verify your changes. Also
list any relevant details for your test configuration.
> Delete anything that is not relevant
- [ ] Manual
- [ ] Jest
- [ ] Cypress
>
>
#### Test Plan
> Add Testsmith test cases links that relate to this PR
>
>
#### Issues raised during DP testing
> Link issues raised during DP testing for better visiblity and tracking
(copy link from comments dropped on this PR)
>
>
>
## Checklist:
#### Dev activity
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my
feature works
- [x] New and existing unit tests pass locally with my changes
- [ ] PR is being merged under a feature flag


#### QA activity:
- [ ] [Speedbreak
features](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#speedbreakers-)
have been covered
- [ ] Test plan covers all impacted features and [areas of
interest](https://github.com/appsmithorg/TestSmith/wiki/Guidelines-for-test-plans#areas-of-interest-)
- [ ] Test plan has been peer reviewed by project stakeholders and other
QA members
- [ ] Manually tested functionality on DP
- [ ] We had an implementation alignment call with stakeholders post QA
Round 2
- [ ] Cypress test cases have been added and approved by SDET/manual QA
- [ ] Added `Test Plan Approved` label after Cypress tests were reviewed
- [ ] Added `Test Plan Approved` label after JUnit tests were reviewed
---
 .../java/com/appsmith/server/dtos/UserSessionDTO.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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);