Page MenuHomePhabricator
Differential D12232

[lib] Pass userStateBeforeRecovery to setNewSession call in resolveKeyserverSessionInvalidation
ClosedPublic
Actions

Authored by ashoat on May 28 2024, 10:17 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 13, 10:32 AM
Unknown Object (File)
Feb 28 2025, 3:02 PM
Unknown Object (File)
Feb 28 2025, 3:02 PM
Unknown Object (File)
Feb 3 2025, 12:05 PM
Unknown Object (File)
Feb 3 2025, 11:10 AM
Unknown Object (File)
Jan 30 2025, 2:55 PM
Unknown Object (File)
Jan 30 2025, 2:55 PM
Unknown Object (File)
Dec 31 2024, 11:16 AM
View All 70 Files
Subscribers
None

Details

Reviewers
inka
tomek
Commits
rCOMMa2a2d84a9b90: [lib] Pass userStateBeforeRecovery to setNewSession call in…
Summary

This resolves ENG-8244. This was an oversight... we should be passing userStateBeforeRecovery to setNewSession here in order to avoid triggering invalidSessionRecovery.

Test Plan
  1. Log in a test user in a multi-keyserver environment
  2. Delete the user's cookie in MariaDB
  3. Background and foreground the app
  4. Confirm that we no longer trigger a loop of the error mentioned in the Linear task

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
keyserver-conn/
4 lines

Diff 40756

View Options

lib/keyserver-conn/recovery-utils.js

Show All 13 Linesimport {
useSearchMessages as useSearchMessagesAction, useSearchMessages as useSearchMessagesAction,
} from '../actions/message-actions.js'; } from '../actions/message-actions.js';
import { import {
searchUsers, searchUsers,
searchUsersActionTypes, searchUsersActionTypes,
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { ENSCacheContext } from '../components/ens-cache-provider.react.js'; import { ENSCacheContext } from '../components/ens-cache-provider.react.js';
import genesis from '../facts/genesis.js'; import genesis from '../facts/genesis.js';
import { useIdentitySearch } from '../identity-search/identity-search-context.js';
import type { import type {
ChatMessageInfoItem, ChatMessageInfoItem,
MessageListData, MessageListData,
} from '../selectors/chat-selectors.js'; } from '../selectors/chat-selectors.js';
import { useUserSearchIndex } from '../selectors/nav-selectors.js'; import { useUserSearchIndex } from '../selectors/nav-selectors.js';
import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js'; import { relationshipBlockedInEitherDirection } from '../shared/relationship-utils.js';
import type { User } from '../types/identity-search/search-response-types.js';
import type { MessageInfo, RawMessageInfo } from '../types/message-types.js'; import type { MessageInfo, RawMessageInfo } from '../types/message-types.js';
import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js'; import type { ThreadInfo } from '../types/minimally-encoded-thread-permissions-types.js';
import { userRelationshipStatus } from '../types/relationship-types.js'; import { userRelationshipStatus } from '../types/relationship-types.js';
import { threadPermissions } from '../types/thread-permission-types.js'; import { threadPermissions } from '../types/thread-permission-types.js';
import { type ThreadType, threadTypes } from '../types/thread-types-enum.js'; import { type ThreadType, threadTypes } from '../types/thread-types-enum.js';
import type { import type {
AccountUserInfo, AccountUserInfo,
GlobalAccountUserInfo, GlobalAccountUserInfo,
▲ Show 20 Lines • Show All 328 Lines • ▼ Show 20 Lines void (async () => {
setUsernameToSearch(lowercaseText); setUsernameToSearch(lowercaseText);
} }
})(); })();
}, [ensCache, lowercaseText]); }, [ensCache, lowercaseText]);
return usernameToSearch; return usernameToSearch;
} }
function useSearchIdentityUsers(
usernameInputText: string,
): $ReadOnlyArray<User> {
const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
);
const { sendPrefixQuery } = useIdentitySearch();
const [searchResults, setSearchResults] = React.useState(
ashoatUnsubmitted
Not Done
Inline Actions

Same comment here... please move the typehint

ashoat: Same comment here... please move the typehint
ashoatUnsubmitted
Not Done
Inline Actions

Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping responding to the feedback here.

In the future, I'd suggest responding to the feedback, even if it gets removed in a later diff. It saves your diff reviewer from dealing with confusion. If rebasing is a headache right now, that is probably a skill that will get improved over time... eventually, it should be really easy for you to directly address feedback, and not something that you avoid.

Okay to skip it this time I guess

ashoat: Oh, I see what's going on... you're replacing this line in a later diff, so you're skipping…
willAuthorUnsubmitted
Done
Inline Actions

Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback going forward.

will: Got it. Wasn't sure of best practice at the time but will now immediately respond to feedback…
([]: $ReadOnlyArray<User>),
);
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
React.useEffect(() => {
if (forwardLookupSearchText.length === 0) {
setSearchResults([]);
return;
}
void (async () => {
try {
const result = await sendPrefixQuery(forwardLookupSearchText);
setSearchResults(
result.filter(({ userID }) => userID !== currentUserID),
);
} catch (err) {
console.error(err);
setSearchResults([]);
}
})();
}, [currentUserID, forwardLookupSearchText, sendPrefixQuery]);
return searchResults;
}
function useSearchUsers( function useSearchUsers(
usernameInputText: string, usernameInputText: string,
): $ReadOnlyArray<GlobalAccountUserInfo> { ): $ReadOnlyArray<GlobalAccountUserInfo> {
const currentUserID = useSelector( const currentUserID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id, state => state.currentUserInfo && state.currentUserInfo.id,
); );
const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText); const forwardLookupSearchText = useForwardLookupSearchText(usernameInputText);
▲ Show 20 Lines • Show All 61 Lines • ▼ Show 20 Lines): ?(ChatMessageInfoItem[]) {
return sortedChatMessageInfoItems; return sortedChatMessageInfoItems;
} }
export { export {
usePotentialMemberItems, usePotentialMemberItems,
notFriendNotice, notFriendNotice,
useSearchMessages, useSearchMessages,
useSearchUsers, useSearchUsers,
useSearchIdentityUsers,
filterChatMessageInfosForSearch, filterChatMessageInfosForSearch,
useForwardLookupSearchText, useForwardLookupSearchText,
}; };