Page MenuHomePhabricator
Differential D11340

[web/native] Add getUserPublicKey to olmAPI
ClosedPublic
Actions

Authored by michal on Mar 15 2024, 10:33 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Mar 25, 6:49 PM
Unknown Object (File)
Sun, Mar 23, 10:43 AM
Unknown Object (File)
Thu, Mar 6, 2:48 AM
Unknown Object (File)
Wed, Mar 5, 8:10 AM
Unknown Object (File)
Feb 22 2025, 3:43 AM
Unknown Object (File)
Feb 22 2025, 3:43 AM
Unknown Object (File)
Feb 22 2025, 3:42 AM
Unknown Object (File)
Feb 22 2025, 3:42 AM
View All 79 Files
Subscribers
ashoat

Details

Reviewers
kamil
tomek
Commits
rCOMMaa155a4a7e69: [web/native] Add getUserPublicKey to olmAPI
Summary

ENG-6654 : Migrate getUserPublicKey to shared worker

Continuing the unification effort between web and native APIs this diff adds getUserPublicKey to the OlmAPI. It will be used in the later diffs.

Depends on D11339

Test Plan

Run this function on native. Pickled the crypto account from native and unpickled it on web. Run this function on web. Checked that the returned value on web is identical to the one from native.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
types/
14 lines
utils/
__mocks__/
1 line
native/
crypto/
3 lines
schema/
19 lines
web/
crypto/
1 line
shared-worker/
worker/
17 lines

Diff 38424

View Options

lib/types/crypto-types.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,
}; };
View Options

lib/utils/__mocks__/config.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,
}; };
View Options

native/crypto/olm-api.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,
}; };
View Options

native/schema/CommCoreModuleSchema.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,
}; };
View Options

web/crypto/olm-api.js

Loading...
View Options

web/shared-worker/worker/worker-crypto.js

Loading...