Page MenuHomePhabricator
Differential D11837

[lib] Propagate exceptions in keyserverAuth to callers
ClosedPublic
Actions

Authored by ashoat on Apr 29 2024, 6:29 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 8, 2:15 AM
Unknown Object (File)
Thu, Apr 3, 12:09 PM
Unknown Object (File)
Thu, Apr 3, 9:54 AM
Unknown Object (File)
Thu, Apr 3, 9:30 AM
Unknown Object (File)
Thu, Apr 3, 2:42 AM
Unknown Object (File)
Wed, Apr 2, 5:41 AM
Unknown Object (File)
Feb 18 2025, 6:35 PM
Unknown Object (File)
Feb 18 2025, 6:35 PM
View All 64 Files
Subscribers
None

Details

Reviewers
tomek
inka
Commits
rCOMM5750fe91839a: [lib] Propagate exceptions in keyserverAuth to callers
Summary

I had made this change initially in D11500, but I forget why so I undid it.

The reason for the change is that dispatchActionPromise will not reject if the promise passed to it rejects.

We want failures in keyserverAuth to propagate to callers. At all of its callsites, keyserverAuth calls are wrapped in a try-catch where we need to do something on failure:

  1. In KeyserverConnectionHandler here
  2. In useLogIn here
  3. In useRegistrationServerCall here
Test Plan
  1. Force keyserver auth to fail with this patch
  2. Make sure LOG_OUT_STARTED and LOG_OUT_SUCCESS are dispatched when keyserver auth fails

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Revision Contents
Changeset List

PathSize
lib/
keyserver-conn/
3 lines

Diff 39691

View Options

lib/keyserver-conn/keyserver-auth.js

Show All 31 Lines
import { TextInput } from './modal-components.react.js'; import { TextInput } from './modal-components.react.js';
import { setNativeCredentials } from './native-credentials.js'; import { setNativeCredentials } from './native-credentials.js';
import { PanelButton, Panel } from './panel-components.react.js'; import { PanelButton, Panel } from './panel-components.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js'; import SWMansionIcon from '../components/swmansion-icon.react.js';
import { NavContext } from '../navigation/navigation-context.js'; import { NavContext } from '../navigation/navigation-context.js';
import { useSelector } from '../redux/redux-utils.js'; import { useSelector } from '../redux/redux-utils.js';
import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js'; import { nativeLogInExtraInfoSelector } from '../selectors/account-selectors.js';
import type { KeyPressEvent } from '../types/react-native.js'; import type { KeyPressEvent } from '../types/react-native.js';
import { useInitialNotificationsEncryptedMessage } from '../utils/crypto-utils.js';
import { type StateContainer } from '../utils/state-container.js'; import { type StateContainer } from '../utils/state-container.js';
export type RegisterState = { export type RegisterState = {
+usernameInputText: string, +usernameInputText: string,
+passwordInputText: string, +passwordInputText: string,
+confirmPasswordInputText: string, +confirmPasswordInputText: string,
}; };
type BaseProps = { type BaseProps = {
+setActiveAlert: (activeAlert: boolean) => void, +setActiveAlert: (activeAlert: boolean) => void,
+opacityValue: Animated.Node, +opacityValue: Animated.Node,
+registerState: StateContainer<RegisterState>, +registerState: StateContainer<RegisterState>,
}; };
type Props = { type Props = {
...BaseProps, ...BaseProps,
+loadingStatus: LoadingStatus, +loadingStatus: LoadingStatus,
+logInExtraInfo: () => Promise<LogInExtraInfo>, +logInExtraInfo: () => Promise<LogInExtraInfo>,
+dispatchActionPromise: DispatchActionPromise, +dispatchActionPromise: DispatchActionPromise,
+register: (registerInfo: RegisterInfo) => Promise<RegisterResult>, +register: (registerInfo: RegisterInfo) => Promise<RegisterResult>,
+getInitialNotificationsEncryptedMessage: () => Promise<string>,
}; };
type State = { type State = {
+confirmPasswordFocused: boolean, +confirmPasswordFocused: boolean,
}; };
class RegisterPanel extends React.PureComponent<Props, State> { class RegisterPanel extends React.PureComponent<Props, State> {
state: State = { state: State = {
confirmPasswordFocused: false, confirmPasswordFocused: false,
}; };
▲ Show 20 Lines • Show All 218 Lines • ▼ Show 20 Lines ) {
'letter or a number, and may contain only letters, numbers, or the ' + 'letter or a number, and may contain only letters, numbers, or the ' +
'characters “-” and “_”', 'characters “-” and “_”',
[{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }], [{ text: 'OK', onPress: this.onUsernameAlertAcknowledged }],
{ cancelable: false }, { cancelable: false },
); );
} else { } else {
Keyboard.dismiss(); Keyboard.dismiss();
const extraInfo = await this.props.logInExtraInfo(); const extraInfo = await this.props.logInExtraInfo();
const initialNotificationsEncryptedMessage =
await this.props.getInitialNotificationsEncryptedMessage();
this.props.dispatchActionPromise( this.props.dispatchActionPromise(
registerActionTypes, registerActionTypes,
this.registerAction(extraInfo), this.registerAction({
...extraInfo,
initialNotificationsEncryptedMessage,
}),
undefined, undefined,
({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload), ({ calendarQuery: extraInfo.calendarQuery }: LogInStartingPayload),
); );
} }
}; };
onPasswordAlertAcknowledged = () => { onPasswordAlertAcknowledged = () => {
this.props.setActiveAlert(false); this.props.setActiveAlert(false);
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Lines const logInExtraInfo = useSelector(state =>
nativeLogInExtraInfoSelector({ nativeLogInExtraInfoSelector({
redux: state, redux: state,
navContext, navContext,
}), }),
); );
const dispatchActionPromise = useDispatchActionPromise(); const dispatchActionPromise = useDispatchActionPromise();
const callRegister = useServerCall(register); const callRegister = useServerCall(register);
const getInitialNotificationsEncryptedMessage =
useInitialNotificationsEncryptedMessage();
return ( return (
<RegisterPanel <RegisterPanel
{...props} {...props}
loadingStatus={loadingStatus} loadingStatus={loadingStatus}
logInExtraInfo={logInExtraInfo} logInExtraInfo={logInExtraInfo}
dispatchActionPromise={dispatchActionPromise} dispatchActionPromise={dispatchActionPromise}
register={callRegister} register={callRegister}
getInitialNotificationsEncryptedMessage={
getInitialNotificationsEncryptedMessage
}
/> />
); );
}); });
export default ConnectedRegisterPanel; export default ConnectedRegisterPanel;