Page MenuHomePhabricator
Differential D11181

[lib] Use keyserverID when generating initial message using socket
ClosedPublic
Actions

Authored by tomek on Feb 27 2024, 1:38 AM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 17, 6:59 AM
Unknown Object (File)
Thu, Apr 17, 4:36 AM
Unknown Object (File)
Thu, Apr 17, 12:56 AM
Unknown Object (File)
Wed, Apr 16, 4:57 AM
Unknown Object (File)
Mon, Apr 14, 11:06 AM
Unknown Object (File)
Wed, Apr 9, 5:01 PM
Unknown Object (File)
Feb 16 2025, 12:18 AM
Unknown Object (File)
Feb 16 2025, 12:18 AM
View All 99 Files
Subscribers
ashoat

Details

Reviewers
michal
atul
marcin
kamil
Commits
rCOMM6123d12b7b83: [lib] Use keyserverID when generating initial message using socket
Summary

Use the actual keyserverID.

https://linear.app/comm/issue/ENG-6523/use-keyserver-id-when-generating-a-response-to

Depends on D11177

Test Plan

Delete a session on keyserver, restart the native client and verify that the code handling INITIAL_NOTIFICATIONS_ENCRYPTED_MESSAGE was called. Send a message from web client and verify that a notification was delivered without a warning about missing session.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
selectors/
6 lines

Diff 37702

View Options

lib/selectors/socket-selectors.js

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { useModalContext } from 'lib/components/modal-provider.react.js'; import { useModalContext } from 'lib/components/modal-provider.react.js';
import { primaryInviteLinksSelector } from 'lib/selectors/invite-links-selectors.js'; import { useAddUsersPermissions } from 'lib/permissions/add-users-permissions.js';
import { useUserSearchIndex } from 'lib/selectors/nav-selectors.js'; import { useUserSearchIndex } from 'lib/selectors/nav-selectors.js';
import { threadInfoSelector } from 'lib/selectors/thread-selectors.js'; import { threadInfoSelector } from 'lib/selectors/thread-selectors.js';
import { import { roleIsAdminRole } from 'lib/shared/thread-utils.js';
roleIsAdminRole,
useThreadHasPermission,
} from 'lib/shared/thread-utils.js';
import type { RelativeMemberInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js'; import type { RelativeMemberInfo } from 'lib/types/minimally-encoded-thread-permissions-types.js';
import { threadPermissions } from 'lib/types/thread-permission-types.js';
import { threadTypeIsCommunityRoot } from 'lib/types/thread-types-enum.js';
import { useRolesFromCommunityThreadInfo } from 'lib/utils/role-utils.js'; import { useRolesFromCommunityThreadInfo } from 'lib/utils/role-utils.js';
import { AddMembersModal } from './add-members-modal.react.js'; import { AddMembersModal } from './add-members-modal.react.js';
import ThreadMembersList from './members-list.react.js'; import ThreadMembersList from './members-list.react.js';
import css from './members-modal.css'; import css from './members-modal.css';
import Button from '../../../components/button.react.js'; import Button from '../../../components/button.react.js';
import Tabs, { type TabData } from '../../../components/tabs.react.js'; import Tabs, { type TabData } from '../../../components/tabs.react.js';
import ManageInviteLinksModal from '../../../invite-links/manage-invite-links-modal.react.js'; import ManageInviteLinksModal from '../../../invite-links/manage-invite-links-modal.react.js';
▲ Show 20 Lines • Show All 92 Lines • ▼ Show 20 Lines const renderModalContent = React.useCallback(
), ),
[threadID], [threadID],
); );
const { pushModal, popModal } = useModalContext(); const { pushModal, popModal } = useModalContext();
const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]); const threadInfo = useSelector(state => threadInfoSelector(state)[threadID]);
const inviteLink = useSelector(primaryInviteLinksSelector)[threadID]; const { inviteLink, canManageLinks, canAddMembers, isCommunityRoot } =
const canManageLinks = useThreadHasPermission( useAddUsersPermissions(threadInfo);
threadInfo,
threadPermissions.MANAGE_INVITE_LINKS,
);
const isCommunityRoot = threadTypeIsCommunityRoot(threadInfo.type);
const onClickAddMembers = React.useCallback(() => { const onClickAddMembers = React.useCallback(() => {
if (!isCommunityRoot) { if (!isCommunityRoot) {
pushModal(<AddMembersModal onClose={popModal} threadID={threadID} />); pushModal(<AddMembersModal onClose={popModal} threadID={threadID} />);
} else if (inviteLink) { } else if (inviteLink) {
pushModal(<ViewInviteLinkModal inviteLink={inviteLink} />); pushModal(<ViewInviteLinkModal inviteLink={inviteLink} />);
} else if (canManageLinks) { } else if (canManageLinks) {
pushModal(<ManageInviteLinksModal communityID={threadID} />); pushModal(<ManageInviteLinksModal communityID={threadID} />);
} }
}, [ }, [
canManageLinks, canManageLinks,
inviteLink, inviteLink,
isCommunityRoot, isCommunityRoot,
popModal, popModal,
pushModal, pushModal,
threadID, threadID,
]); ]);
const canAddMembersViaInviteLink =
isCommunityRoot && (inviteLink || canManageLinks);
const hasAddMembersPermission = useThreadHasPermission(
threadInfo,
threadPermissions.ADD_MEMBERS,
);
const canAddMembersManually = hasAddMembersPermission && !isCommunityRoot;
const canAddMembers = canAddMembersManually || canAddMembersViaInviteLink;
const addMembersButton = React.useMemo(() => { const addMembersButton = React.useMemo(() => {
if (!canAddMembers) { if (!canAddMembers) {
return null; return null;
} }
return ( return (
<div className={css.addNewMembers}> <div className={css.addNewMembers}>
<Button variant="filled" onClick={onClickAddMembers}> <Button variant="filled" onClick={onClickAddMembers}>
Add members Add members
Show All 19 Lines