Skip to content

Commit a9cd33b

Browse files
fix: Fix login info (#1231)
* Fix login info * checking UTC failure * fixing prettier * reverting the change for utc failure * fix logic * prettier formatted --------- Co-authored-by: nikhila-aot <nikhila.pankaj@aot-technologies.com>
1 parent 0e9dd3b commit a9cd33b

File tree

1 file changed

+9
-18
lines changed

1 file changed

+9
-18
lines changed

cats-frontend/src/app/components/account/UserAccount.tsx

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,12 @@ const UserAccount = (props: any) => {
1717
auth.signinRedirect({ extraQueryParams: { kc_idp_hint: 'idir' } });
1818
}
1919

20-
const userObj = {
21-
firstname: auth.user?.profile.given_name,
22-
lastName: auth.user?.profile.family_name,
23-
};
24-
25-
const [user, setUser] = useState(userObj);
2620
const [dropdownArrow, setDropdownArrow] = useState(false);
2721
const toggleButton = (event: any) => {
2822
event.stopPropagation();
2923
setDropdownArrow(!dropdownArrow);
3024
};
3125

32-
useEffect(() => {
33-
setUser({
34-
firstname: auth.user?.profile.given_name,
35-
lastName: auth.user?.profile.family_name,
36-
});
37-
}, []);
38-
3926
const signOut = () => {
4027
auth.removeUser();
4128
auth.signoutRedirect({
@@ -44,6 +31,10 @@ const UserAccount = (props: any) => {
4431
auth.clearStaleState();
4532
};
4633

34+
// Access user data directly from auth.user
35+
const firstName = auth.user?.profile?.given_name;
36+
const lastName = auth.user?.profile?.family_name;
37+
4738
if (props.mobileView) {
4839
return (
4940
<>
@@ -64,10 +55,10 @@ const UserAccount = (props: any) => {
6455
onClick={toggleButton}
6556
>
6657
{/* Profile image */}
67-
<Avatar firstName={user.firstname} lastName={user.lastName} />
58+
<Avatar firstName={firstName} lastName={lastName} />
6859
{/* User name */}
6960
<div id="user-name" className="p-3">
70-
{user.firstname}
61+
{firstName}
7162
</div>
7263
<div
7364
id="account-dropdown"
@@ -121,7 +112,7 @@ const UserAccount = (props: any) => {
121112
className="d-flex align-items-center "
122113
onClick={() => setDropdownArrow(!dropdownArrow)}
123114
>
124-
<Avatar firstName={user.firstname} lastName={user.lastName} />
115+
<Avatar firstName={firstName} lastName={lastName} />
125116
<div
126117
id="account-dropdown"
127118
className="ps-2"
@@ -148,9 +139,9 @@ const UserAccount = (props: any) => {
148139
<div className="account-custom-label">Logged in as:</div>
149140
<div className="d-flex align-items-center account-username py-3 ">
150141
{/* Profile image */}
151-
<Avatar firstName={user.firstname} lastName={user.lastName} />
142+
<Avatar firstName={firstName} lastName={lastName} />
152143
{/* User name */}
153-
<span className="px-2">{user.firstname}</span>
144+
<span className="px-2">{firstName}</span>
154145
</div>
155146
</Dropdown.Item>
156147
<div className="pt-3">

0 commit comments

Comments
 (0)