diff --git a/app/client/src/pages/UserProfile/General.tsx b/app/client/src/pages/UserProfile/General.tsx index 25539d40daab..5a960c1798ee 100644 --- a/app/client/src/pages/UserProfile/General.tsx +++ b/app/client/src/pages/UserProfile/General.tsx @@ -1,4 +1,4 @@ -import React from "react"; +import React, { useEffect } from "react"; import styled from "styled-components"; import Text, { TextType } from "components/ads/Text"; import { debounce } from "lodash"; @@ -20,6 +20,7 @@ import { Loader, TextLoader, } from "./StyledComponents"; +import { getCurrentUser as refreshCurrentUser } from "actions/authActions"; const ForgotPassword = styled.a` margin-top: 12px; @@ -63,6 +64,10 @@ function General() { (state: AppState) => state.ui.users.loadingStates.fetchingUser, ); + useEffect(() => { + dispatch(refreshCurrentUser()); + }, []); + return ( diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java index 0e7d633c31bf..ec866087c076 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/UserServiceImpl.java @@ -873,14 +873,14 @@ public Mono buildUserProfileDTO(User user) { final UserProfileDTO profile = new UserProfileDTO(); - profile.setEmail(user.getEmail()); - profile.setOrganizationIds(user.getOrganizationIds()); - profile.setUsername(user.getUsername()); - profile.setName(user.getName()); - profile.setGender(user.getGender()); + profile.setEmail(userFromDb.getEmail()); + profile.setOrganizationIds(userFromDb.getOrganizationIds()); + profile.setUsername(userFromDb.getUsername()); + profile.setName(userFromDb.getName()); + profile.setGender(userFromDb.getGender()); profile.setEmptyInstance(isUsersEmpty); - profile.setAnonymous(user.isAnonymous()); - profile.setEnabled(user.isEnabled()); + profile.setAnonymous(userFromDb.isAnonymous()); + profile.setEnabled(userFromDb.isEnabled()); profile.setCommentOnboardingState(userData.getCommentOnboardingState()); profile.setSuperUser(policyUtils.isPermissionPresentForUser(