Page MenuHomePhabricator
Differential D11958

[lib][keyserver] Move output validators tests to lib
ClosedPublic
Actions

Authored by inka on May 9 2024, 2:58 AM.
Tags
None
Referenced Files
F5479073: D11958.diff
Thu, Apr 10, 10:55 PM
Unknown Object (File)
Feb 28 2025, 4:54 PM
Unknown Object (File)
Feb 28 2025, 4:53 PM
Unknown Object (File)
Jan 24 2025, 8:42 PM
Unknown Object (File)
Jan 24 2025, 8:42 PM
Unknown Object (File)
Jan 9 2025, 4:09 AM
Unknown Object (File)
Jan 9 2025, 4:09 AM
Unknown Object (File)
Jan 9 2025, 4:08 AM
View All 58 Files
Subscribers
ashoat

Details

Reviewers
tomek
kamil
bartek
Commits
rCOMM6a537802336e: [lib][keyserver] Move output validators tests to lib
Summary

issue: ENG-8060
in stack ending with D11945 I moved all output validators to lib. We can also move their tests now

Test Plan

Run yarn jest in keyserver/ and lib/

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
keyserver/
src/
responders/
929 lines
lib/
types/
validators/
keyserver/
src/
responders/
validators.test.js
responder-validators.test.js
43 lines

Diff 39986

View Options

keyserver/src/responders/responder-validators.test.js

Show All 12 Lines
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { useIsLoggedInToAuthoritativeKeyserver } from '../hooks/account-hooks.js'; import { useIsLoggedInToAuthoritativeKeyserver } from '../hooks/account-hooks.js';
import { useGetAndUpdateDeviceListsForUsers } from '../hooks/peer-list-hooks.js'; import { useGetAndUpdateDeviceListsForUsers } from '../hooks/peer-list-hooks.js';
import { useLegacyAshoatKeyserverCall } from '../keyserver-conn/legacy-keyserver-call.js'; import { useLegacyAshoatKeyserverCall } from '../keyserver-conn/legacy-keyserver-call.js';
import { usersWithMissingDeviceListSelector } from '../selectors/user-selectors.js'; import { usersWithMissingDeviceListSelector } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js'; import { IdentityClientContext } from '../shared/identity-client-context.js';
import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js'; import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js';
import { relationshipActions } from '../types/relationship-types.js'; import { relationshipActions } from '../types/relationship-types.js';
import { getMessageForException } from '../utils/errors.js'; import { getMessageForException, FetchTimeout } from '../utils/errors.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 { import {
relyingOnAuthoritativeKeyserver, relyingOnAuthoritativeKeyserver,
usingCommServicesAccessToken, usingCommServicesAccessToken,
} from '../utils/services-utils.js'; } from '../utils/services-utils.js';
function UserInfosHandler(): React.Node { function UserInfosHandler(): React.Node {
Show All 9 Lines const userInfosWithMissingUsernames = React.useMemo(() => {
); );
return Object.fromEntries(entriesWithoutUsernames); return Object.fromEntries(entriesWithoutUsernames);
}, [userInfos]); }, [userInfos]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const findUserIdentities = useFindUserIdentities(); const findUserIdentities = useFindUserIdentities();
const requestedIDsRef = React.useRef(new Set<string>()); const requestedIDsRef = React.useRef(new Set<string>());
const requestedAvatarsRef = React.useRef(new Set<string>());
const callUpdateRelationships = const callUpdateRelationships =
useLegacyAshoatKeyserverCall(updateRelationships); useLegacyAshoatKeyserverCall(updateRelationships);
const currentUserInfo = useSelector(state => state.currentUserInfo); const currentUserInfo = useSelector(state => state.currentUserInfo);
const loggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver(); const loggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver();
Show All 34 Lines void (async () => {
}); });
} }
return { userInfos: newUserInfos }; return { userInfos: newUserInfos };
})(); })();
void dispatchActionPromise(findUserIdentitiesActionTypes, promise); void dispatchActionPromise(findUserIdentitiesActionTypes, promise);
// 2. Fetch avatars from auth keyserver // 2. Fetch avatars from auth keyserver
if (relyingOnAuthoritativeKeyserver) { if (relyingOnAuthoritativeKeyserver) {
const userIDsWithoutOwnID = newUserIDs.filter( const userIDsWithoutOwnID = newUserIDs.filter(
id => id !== currentUserInfo?.id, id =>
id !== currentUserInfo?.id && !requestedAvatarsRef.current.has(id),
); );
if (userIDsWithoutOwnID.length === 0) { if (userIDsWithoutOwnID.length === 0) {
return; return;
} }
void dispatchActionPromise(
updateRelationshipsActionTypes, userIDsWithoutOwnID.forEach(id => requestedAvatarsRef.current.add(id));
callUpdateRelationships({
const updateRelationshipsPromise = (async () => {
try {
return await callUpdateRelationships({
action: relationshipActions.ACKNOWLEDGE, action: relationshipActions.ACKNOWLEDGE,
userIDs: userIDsWithoutOwnID, userIDs: userIDsWithoutOwnID,
}), });
} catch (e) {
if (e instanceof FetchTimeout) {
userIDsWithoutOwnID.forEach(id =>
requestedAvatarsRef.current.delete(id),
);
}
throw e;
}
})();
void dispatchActionPromise(
updateRelationshipsActionTypes,
updateRelationshipsPromise,
); );
} }
})(); })();
}, [ }, [
getAuthMetadata, getAuthMetadata,
callUpdateRelationships, callUpdateRelationships,
currentUserInfo?.id, currentUserInfo?.id,
dispatchActionPromise, dispatchActionPromise,
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines
View Options

lib/types/validators/validators.test.js

Show All 12 Lines
} from '../actions/user-actions.js'; } from '../actions/user-actions.js';
import { useIsLoggedInToAuthoritativeKeyserver } from '../hooks/account-hooks.js'; import { useIsLoggedInToAuthoritativeKeyserver } from '../hooks/account-hooks.js';
import { useGetAndUpdateDeviceListsForUsers } from '../hooks/peer-list-hooks.js'; import { useGetAndUpdateDeviceListsForUsers } from '../hooks/peer-list-hooks.js';
import { useLegacyAshoatKeyserverCall } from '../keyserver-conn/legacy-keyserver-call.js'; import { useLegacyAshoatKeyserverCall } from '../keyserver-conn/legacy-keyserver-call.js';
import { usersWithMissingDeviceListSelector } from '../selectors/user-selectors.js'; import { usersWithMissingDeviceListSelector } from '../selectors/user-selectors.js';
import { IdentityClientContext } from '../shared/identity-client-context.js'; import { IdentityClientContext } from '../shared/identity-client-context.js';
import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js'; import { useTunnelbroker } from '../tunnelbroker/tunnelbroker-context.js';
import { relationshipActions } from '../types/relationship-types.js'; import { relationshipActions } from '../types/relationship-types.js';
import { getMessageForException } from '../utils/errors.js'; import { getMessageForException, FetchTimeout } from '../utils/errors.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 { import {
relyingOnAuthoritativeKeyserver, relyingOnAuthoritativeKeyserver,
usingCommServicesAccessToken, usingCommServicesAccessToken,
} from '../utils/services-utils.js'; } from '../utils/services-utils.js';
function UserInfosHandler(): React.Node { function UserInfosHandler(): React.Node {
Show All 9 Lines const userInfosWithMissingUsernames = React.useMemo(() => {
); );
return Object.fromEntries(entriesWithoutUsernames); return Object.fromEntries(entriesWithoutUsernames);
}, [userInfos]); }, [userInfos]);
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const findUserIdentities = useFindUserIdentities(); const findUserIdentities = useFindUserIdentities();
const requestedIDsRef = React.useRef(new Set<string>()); const requestedIDsRef = React.useRef(new Set<string>());
const requestedAvatarsRef = React.useRef(new Set<string>());
const callUpdateRelationships = const callUpdateRelationships =
useLegacyAshoatKeyserverCall(updateRelationships); useLegacyAshoatKeyserverCall(updateRelationships);
const currentUserInfo = useSelector(state => state.currentUserInfo); const currentUserInfo = useSelector(state => state.currentUserInfo);
const loggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver(); const loggedInToAuthKeyserver = useIsLoggedInToAuthoritativeKeyserver();
Show All 34 Lines void (async () => {
}); });
} }
return { userInfos: newUserInfos }; return { userInfos: newUserInfos };
})(); })();
void dispatchActionPromise(findUserIdentitiesActionTypes, promise); void dispatchActionPromise(findUserIdentitiesActionTypes, promise);
// 2. Fetch avatars from auth keyserver // 2. Fetch avatars from auth keyserver
if (relyingOnAuthoritativeKeyserver) { if (relyingOnAuthoritativeKeyserver) {
const userIDsWithoutOwnID = newUserIDs.filter( const userIDsWithoutOwnID = newUserIDs.filter(
id => id !== currentUserInfo?.id, id =>
id !== currentUserInfo?.id && !requestedAvatarsRef.current.has(id),
); );
if (userIDsWithoutOwnID.length === 0) { if (userIDsWithoutOwnID.length === 0) {
return; return;
} }
void dispatchActionPromise(
updateRelationshipsActionTypes, userIDsWithoutOwnID.forEach(id => requestedAvatarsRef.current.add(id));
callUpdateRelationships({
const updateRelationshipsPromise = (async () => {
try {
return await callUpdateRelationships({
action: relationshipActions.ACKNOWLEDGE, action: relationshipActions.ACKNOWLEDGE,
userIDs: userIDsWithoutOwnID, userIDs: userIDsWithoutOwnID,
}), });
} catch (e) {
if (e instanceof FetchTimeout) {
userIDsWithoutOwnID.forEach(id =>
requestedAvatarsRef.current.delete(id),
);
}
throw e;
}
})();
void dispatchActionPromise(
updateRelationshipsActionTypes,
updateRelationshipsPromise,
); );
} }
})(); })();
}, [ }, [
getAuthMetadata, getAuthMetadata,
callUpdateRelationships, callUpdateRelationships,
currentUserInfo?.id, currentUserInfo?.id,
dispatchActionPromise, dispatchActionPromise,
▲ Show 20 Lines • Show All 60 Lines • Show Last 20 Lines