Page MenuHomePhabricator
Differential D12092

[commtest] Add test for initial device list
ClosedPublic
Actions

Authored by bartek on May 17 2024, 1:44 AM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Mar 28, 1:25 AM
Unknown Object (File)
Feb 21 2025, 6:44 AM
Unknown Object (File)
Jan 28 2025, 7:08 PM
Unknown Object (File)
Jan 28 2025, 7:08 PM
Unknown Object (File)
Jan 28 2025, 7:08 PM
Unknown Object (File)
Jan 28 2025, 7:07 PM
Unknown Object (File)
Jan 28 2025, 7:07 PM
Unknown Object (File)
Jan 25 2025, 1:01 PM
View All Files
Subscribers
ashoat
tomek

Details

Reviewers
kamil
will
varun
Commits
rCOMMd3b9774af2c0: [commtest] Add test for initial device list
Summary

Added a commtest test for initial device list.

Depends on D12091

Test Plan

Commtest

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

bartek created this revision.May 17 2024, 1:44 AM
bartek held this revision as a draft.
Herald added subscribers: tomek, ashoat. · View Herald TranscriptMay 17 2024, 1:44 AM
bartek published this revision for review.May 17 2024, 1:59 AM
Harbormaster completed remote builds in B29012: Diff 40321.May 17 2024, 2:00 AM
bartek added a reviewer: varun.May 20 2024, 1:15 AM
kamil accepted this revision.May 23 2024, 6:36 AM
This revision is now accepted and ready to land.May 23 2024, 6:36 AM
kamil added inline comments.May 23 2024, 6:37 AM
services/commtest/tests/identity_device_list_tests.rs
425 ↗(On Diff #40321)

worth adding check that history is empty

bartek updated this revision to Diff 40600.May 23 2024, 10:49 PM

Add assertion for history. Rebase before landing

Harbormaster completed remote builds in B29218: Diff 40600.May 23 2024, 11:04 PM
Closed by commit rCOMMd3b9774af2c0: [commtest] Add test for initial device list (authored by bartek). · Explain WhyMay 23 2024, 11:08 PM
This revision was automatically updated to reflect the committed changes.
bartek added a commit: rCOMMd3b9774af2c0: [commtest] Add test for initial device list.

Revision Contents
Changeset List

PathSize
services/
commtest/
src/
identity/
12 lines
tests/
91 lines

Diff 40604

View Options

services/commtest/src/identity/device.rs

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

services/commtest/tests/identity_device_list_tests.rs

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;