Page MenuHomePhabricator
Differential D11497

[lib] Don't invalidate a session if the recovery is cancelled
ClosedPublic
Actions

Authored by ashoat on Mar 31 2024, 7:40 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Apr 3, 6:12 AM
Unknown Object (File)
Thu, Apr 3, 3:17 AM
Unknown Object (File)
Wed, Apr 2, 1:31 PM
Unknown Object (File)
Tue, Apr 1, 2:42 AM
Unknown Object (File)
Thu, Mar 27, 3:26 AM
Unknown Object (File)
Feb 18 2025, 6:51 PM
Unknown Object (File)
Feb 18 2025, 6:51 PM
Unknown Object (File)
Feb 18 2025, 6:51 PM
View All 67 Files
Subscribers
None

Details

Reviewers
tomek
inka
Commits
rCOMMb709bb0f1743: [lib] Don't invalidate a session if the recovery is cancelled
Summary

Discovered this issue while testing keyserverAuth-based recovery. We should wait until a non-cancelled recovery fails in order to invalidate the session.

I suspect I hadn't encountered it in prior testing because before introducing keyserverAuth to the dep list, the recovery was unlikely to get cancelled before it ran its course.

Test Plan

Confirm that a cancelled keyserver session recovery doesn't invalidate the session

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
keyserver-conn/
6 lines

Diff 38668

View Options

lib/keyserver-conn/recovery-utils.js

// @flow // @flow
import invariant from 'invariant';
import * as React from 'react'; import * as React from 'react';
import { Text, View, FlatList } from 'react-native';
import {
getOwnPeerDevices,
type DeviceIDAndPlatformDetails,
} from 'lib/selectors/user-selectors.js';
import { IdentityClientContext } from 'lib/shared/identity-client-context.js';
import LinkedDevicesListItem from './linked-devices-list-item.react.js';
import type { ProfileNavigationProp } from './profile.react.js'; import type { ProfileNavigationProp } from './profile.react.js';
import type { NavigationRoute } from '../navigation/route-names.js'; import type { NavigationRoute } from '../navigation/route-names.js';
import { useSelector } from '../redux/redux-utils.js';
import { useStyles } from '../themes/colors.js';
function keyExtractor(item: DeviceIDAndPlatformDetails) {
return item.deviceID;
}
function renderDeviceListItem({
item,
index,
thisDeviceID,
}: {
+item: DeviceIDAndPlatformDetails,
+index: number,
+thisDeviceID: ?string,
...
}) {
return (
<LinkedDevicesListItem
{...item}
isPrimary={index === 0}
isThisDevice={item.deviceID === thisDeviceID}
/>
);
}
type Props = { type Props = {
+navigation: ProfileNavigationProp<'LinkedDevices'>, +navigation: ProfileNavigationProp<'LinkedDevices'>,
+route: NavigationRoute<'LinkedDevices'>, +route: NavigationRoute<'LinkedDevices'>,
}; };
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
function LinkedDevices(props: Props): React.Node { function LinkedDevices(props: Props): React.Node {
return null; const styles = useStyles(unboundStyles);
const userDevicesInfos: $ReadOnlyArray<DeviceIDAndPlatformDetails> =
useSelector(getOwnPeerDevices);
const identityContext = React.useContext(IdentityClientContext);
invariant(identityContext, 'identity context not set');
const { getAuthMetadata } = identityContext;
const [thisDeviceID, setThisDeviceID] = React.useState<?string>(null);
React.useEffect(() => {
void (async () => {
const { deviceID } = await getAuthMetadata();
setThisDeviceID(deviceID);
})();
}, [getAuthMetadata]);
const separatorComponent = React.useCallback(
() => <View style={styles.separator} />,
[styles.separator],
);
const userDeviceList = React.useMemo(
() => (
<View style={styles.container}>
<Text style={styles.header}>USER DEVICES</Text>
<FlatList
data={userDevicesInfos}
renderItem={({ item, index }) =>
renderDeviceListItem({ item, index, thisDeviceID })
}
keyExtractor={keyExtractor}
contentContainerStyle={styles.deviceListContentContainer}
ItemSeparatorComponent={separatorComponent}
/>
</View>
),
[
separatorComponent,
userDevicesInfos,
styles.container,
styles.header,
styles.deviceListContentContainer,
thisDeviceID,
],
);
return userDeviceList;
} }
const unboundStyles = {
container: {
flex: 1,
backgroundColor: 'panelBackground',
paddingTop: 24,
},
header: {
color: 'panelBackgroundLabel',
fontSize: 12,
fontWeight: '400',
paddingBottom: 3,
paddingHorizontal: 24,
},
deviceListContentContainer: {
backgroundColor: 'panelForeground',
borderBottomWidth: 1,
borderColor: 'panelForegroundBorder',
borderTopWidth: 1,
marginBottom: 24,
paddingVertical: 2,
},
separator: {
backgroundColor: 'panelForegroundBorder',
height: 1,
marginHorizontal: 16,
},
};
export default LinkedDevices; export default LinkedDevices;