Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions packages/react/src/contexts/user.context.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,23 @@ export function UserContextProvider(props: PropsWithChildren): JSX.Element {

const updateMail = useCallback(
async (mail: string): Promise<void> => {
return updateMailApi(mail);
// The endpoint returns an empty body, so the refreshed user has to be fetched. The refresh is
// best-effort, and keeps the previous object when the address did not move — a change pending
// mail verification (202) leaves it untouched, and a fresh identity there would re-trigger
// effects that watch `user` and re-submit endlessly. A cleared state stays cleared: a refresh
// landing after a logout must not put the signed-out user back.
setIsUserUpdating(true);
return updateMailApi(mail)
.then(() =>
getUser()
.then((refreshed) =>
setUser((prev) => (prev && refreshed && refreshed.mail !== prev.mail ? refreshed : prev)),
)
.catch(() => undefined),
)
.finally(() => setIsUserUpdating(false));
},
[updateMailApi],
[getUser, updateMailApi],
);

const verifyMail = useCallback(
Expand Down
Loading