Page MenuHomePhabricator
Differential D12489

[keyserver][lib] Update thread type assertion functions for thick/thread distinction
ClosedPublic
Actions

Authored by ashoat on Jun 19 2024, 5:10 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Apr 16, 10:35 AM
Unknown Object (File)
Wed, Apr 16, 8:59 AM
Unknown Object (File)
Wed, Apr 16, 6:02 AM
Unknown Object (File)
Tue, Apr 15, 6:00 AM
Unknown Object (File)
Thu, Apr 3, 10:00 PM
Unknown Object (File)
Mar 5 2025, 6:06 AM
Unknown Object (File)
Feb 21 2025, 3:58 PM
Unknown Object (File)
Feb 1 2025, 5:36 AM
View All 98 Files
Subscribers
tomek

Details

Reviewers
kamil
marcin
Commits
rCOMM468aaa0278a5: [keyserver][lib] Update thread type assertion functions for thick/thread…
Summary

Depends on D12488

Test Plan

Flow

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
updaters/
20 lines
lib/
types/
35 lines

Diff 41726

View Options

keyserver/src/updaters/thread-permission-updaters.js

Show All 15 Linesimport {
cookieSelector, cookieSelector,
deviceTokenSelector, deviceTokenSelector,
} from '../selectors/keyserver-selectors.js'; } from '../selectors/keyserver-selectors.js';
import { isLoggedInToKeyserver } from '../selectors/user-selectors.js'; import { isLoggedInToKeyserver } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js'; import { IdentityClientContext } from '../shared/identity-client-context.js';
import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js'; import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js';
import type { BaseSocketProps } from '../socket/socket.react.js'; import type { BaseSocketProps } from '../socket/socket.react.js';
import { logInActionSources } from '../types/account-types.js'; import { logInActionSources } from '../types/account-types.js';
import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
import { usingCommServicesAccessToken } from '../utils/services-utils.js'; import { usingCommServicesAccessToken } from '../utils/services-utils.js';
import sleep from '../utils/sleep.js'; import sleep from '../utils/sleep.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js';
type Props = { type Props = {
...BaseSocketProps, ...BaseSocketProps,
+socketComponent: React.ComponentType<BaseSocketProps>, +socketComponent: React.ComponentType<BaseSocketProps>,
}; };
const AUTH_RETRY_DELAY_MS = 60000; const AUTH_RETRY_DELAY_MS = 60000;
const CANCELLED_ERROR = 'cancelled'; const CANCELLED_ERROR = 'cancelled';
Show All 13 Linesfunction KeyserverConnectionHandler(props: Props) {
const dataLoaded = useSelector(state => state.dataLoaded); const dataLoaded = useSelector(state => state.dataLoaded);
const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID)); const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID));
// We have an assumption that we should be always connected to Ashoat's // We have an assumption that we should be always connected to Ashoat's
// keyserver. It is possible that a token which it has is correct, so we can // keyserver. It is possible that a token which it has is correct, so we can
// try to use it. In worst case it is invalid and our push-handler will try // try to use it. In worst case it is invalid and our push-handler will try
// to fix it. // to fix it.
const ashoatKeyserverDeviceToken = useSelector( const ashoatKeyserverDeviceToken = useSelector(
deviceTokenSelector(ashoatKeyserverID), deviceTokenSelector(authoritativeKeyserverID()),
); );
const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken; const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken;
const navInfo = useSelector(state => state.navInfo); const navInfo = useSelector(state => state.navInfo);
const calendarFilters = useSelector(state => state.calendarFilters); const calendarFilters = useSelector(state => state.calendarFilters);
const calendarQuery = React.useMemo(() => { const calendarQuery = React.useMemo(() => {
const filters = filterThreadIDsInFilterList( const filters = filterThreadIDsInFilterList(
calendarFilters, calendarFilters,
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Lines const promise = (async () => {
return; return;
} }
console.log( console.log(
`Error while authenticating to keyserver with id ${keyserverID}`, `Error while authenticating to keyserver with id ${keyserverID}`,
e, e,
); );
if (!dataLoaded && keyserverID === ashoatKeyserverID) { if (!dataLoaded && keyserverID === authoritativeKeyserverID()) {
await dispatchActionPromise(logOutActionTypes, callLogOut()); await dispatchActionPromise(logOutActionTypes, callLogOut());
} }
} finally { } finally {
if (!cancelled) { if (!cancelled) {
await sleep(AUTH_RETRY_DELAY_MS); await sleep(AUTH_RETRY_DELAY_MS);
setAuthInProgress(false); setAuthInProgress(false);
} }
} }
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines React.useEffect(() => {
if (authInProgress) { if (authInProgress) {
return; return;
} }
const [, cancel] = performAuth(); const [, cancel] = performAuth();
cancelPendingAuth.current = cancel; cancelPendingAuth.current = cancel;
}, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]); }, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]);
if (keyserverID !== ashoatKeyserverID) { if (keyserverID !== authoritativeKeyserverID()) {
return null; return null;
} }
return <Socket {...socketProps} />; return <Socket {...socketProps} />;
} }
const Handler: React.ComponentType<Props> = React.memo<Props>( const Handler: React.ComponentType<Props> = React.memo<Props>(
KeyserverConnectionHandler, KeyserverConnectionHandler,
); );
export default Handler; export default Handler;
View Options

lib/types/thread-types-enum.js

Show All 15 Linesimport {
cookieSelector, cookieSelector,
deviceTokenSelector, deviceTokenSelector,
} from '../selectors/keyserver-selectors.js'; } from '../selectors/keyserver-selectors.js';
import { isLoggedInToKeyserver } from '../selectors/user-selectors.js'; import { isLoggedInToKeyserver } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js'; import { IdentityClientContext } from '../shared/identity-client-context.js';
import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js'; import { OlmSessionCreatorContext } from '../shared/olm-session-creator-context.js';
import type { BaseSocketProps } from '../socket/socket.react.js'; import type { BaseSocketProps } from '../socket/socket.react.js';
import { logInActionSources } from '../types/account-types.js'; import { logInActionSources } from '../types/account-types.js';
import { authoritativeKeyserverID } from '../utils/authoritative-keyserver.js';
import { useDispatchActionPromise } from '../utils/redux-promise-utils.js'; import { useDispatchActionPromise } from '../utils/redux-promise-utils.js';
import { useSelector } from '../utils/redux-utils.js'; import { useSelector } from '../utils/redux-utils.js';
import { usingCommServicesAccessToken } from '../utils/services-utils.js'; import { usingCommServicesAccessToken } from '../utils/services-utils.js';
import sleep from '../utils/sleep.js'; import sleep from '../utils/sleep.js';
import { ashoatKeyserverID } from '../utils/validation-utils.js';
type Props = { type Props = {
...BaseSocketProps, ...BaseSocketProps,
+socketComponent: React.ComponentType<BaseSocketProps>, +socketComponent: React.ComponentType<BaseSocketProps>,
}; };
const AUTH_RETRY_DELAY_MS = 60000; const AUTH_RETRY_DELAY_MS = 60000;
const CANCELLED_ERROR = 'cancelled'; const CANCELLED_ERROR = 'cancelled';
Show All 13 Linesfunction KeyserverConnectionHandler(props: Props) {
const dataLoaded = useSelector(state => state.dataLoaded); const dataLoaded = useSelector(state => state.dataLoaded);
const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID)); const keyserverDeviceToken = useSelector(deviceTokenSelector(keyserverID));
// We have an assumption that we should be always connected to Ashoat's // We have an assumption that we should be always connected to Ashoat's
// keyserver. It is possible that a token which it has is correct, so we can // keyserver. It is possible that a token which it has is correct, so we can
// try to use it. In worst case it is invalid and our push-handler will try // try to use it. In worst case it is invalid and our push-handler will try
// to fix it. // to fix it.
const ashoatKeyserverDeviceToken = useSelector( const ashoatKeyserverDeviceToken = useSelector(
deviceTokenSelector(ashoatKeyserverID), deviceTokenSelector(authoritativeKeyserverID()),
); );
const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken; const deviceToken = keyserverDeviceToken ?? ashoatKeyserverDeviceToken;
const navInfo = useSelector(state => state.navInfo); const navInfo = useSelector(state => state.navInfo);
const calendarFilters = useSelector(state => state.calendarFilters); const calendarFilters = useSelector(state => state.calendarFilters);
const calendarQuery = React.useMemo(() => { const calendarQuery = React.useMemo(() => {
const filters = filterThreadIDsInFilterList( const filters = filterThreadIDsInFilterList(
calendarFilters, calendarFilters,
▲ Show 20 Lines • Show All 94 Lines • ▼ Show 20 Lines const promise = (async () => {
return; return;
} }
console.log( console.log(
`Error while authenticating to keyserver with id ${keyserverID}`, `Error while authenticating to keyserver with id ${keyserverID}`,
e, e,
); );
if (!dataLoaded && keyserverID === ashoatKeyserverID) { if (!dataLoaded && keyserverID === authoritativeKeyserverID()) {
await dispatchActionPromise(logOutActionTypes, callLogOut()); await dispatchActionPromise(logOutActionTypes, callLogOut());
} }
} finally { } finally {
if (!cancelled) { if (!cancelled) {
await sleep(AUTH_RETRY_DELAY_MS); await sleep(AUTH_RETRY_DELAY_MS);
setAuthInProgress(false); setAuthInProgress(false);
} }
} }
▲ Show 20 Lines • Show All 41 Lines • ▼ Show 20 Lines React.useEffect(() => {
if (authInProgress) { if (authInProgress) {
return; return;
} }
const [, cancel] = performAuth(); const [, cancel] = performAuth();
cancelPendingAuth.current = cancel; cancelPendingAuth.current = cancel;
}, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]); }, [authInProgress, hasAccessToken, isUserAuthenticated, performAuth]);
if (keyserverID !== ashoatKeyserverID) { if (keyserverID !== authoritativeKeyserverID()) {
return null; return null;
} }
return <Socket {...socketProps} />; return <Socket {...socketProps} />;
} }
const Handler: React.ComponentType<Props> = React.memo<Props>( const Handler: React.ComponentType<Props> = React.memo<Props>(
KeyserverConnectionHandler, KeyserverConnectionHandler,
); );
export default Handler; export default Handler;