CONNECTION_FAILED error as object

Gradually, we exploded the error of CONNECTION_FAILED in multiple redux state properties. The explosion makes maintenance harder because the properties have to be updated in sync. Collect them in an object resembling an Error instance.
2017-09-24 16:51:43 -05:00
parent f8b607e92e
commit 4e0761a46a
9 changed files with 89 additions and 85 deletions
@@ -127,10 +127,25 @@ export function stopWaitForOwner() {
 * @private
 * @returns {{
 *     type: UPGRADE_ROLE_FINISHED,
- *     error: Object
+ *     error: ?Object
 * }}
 */
-function _upgradeRoleFinished(error) {
+function _upgradeRoleFinished(error: ?Object) {
+    if (error) {
+        // Make the specified error object resemble an Error instance (to the
+        // extent that jitsi-meet needs it).
+        const {
+            authenticationError,
+            connectionError,
+            ...other
+        } = error;
+
+        error = { // eslint-disable-line no-param-reassign
+            name: authenticationError || connectionError,
+            ...other
+        };
+    }
+
    return {
        type: UPGRADE_ROLE_FINISHED,
        error
@@ -64,17 +64,7 @@ class LoginDialog extends Component {
        /**
         * The error which occurred during login/authentication.
         */
-        _error: PropTypes.string,
-
-        /**
-         * The credential that the user has failed to authenticate with.
-         */
-        _errorCredentials: PropTypes.object,
-
-        /**
-         * Any extra details about the error provided by lib-jitsi-meet.
-         */
-        _errorDetails: PropTypes.string,
+        _error: PropTypes.object,

        /**
         * Redux store dispatch method.
@@ -118,24 +108,34 @@ class LoginDialog extends Component {
        const {
            _connecting: connecting,
            _error: error,
-            _errorCredentials: errorCredentials,
-            _errorDetails: errorDetails,
            t
        } = this.props;

-        let messageKey = '';
-        const messageOptions = {};
+        let messageKey;
+        let messageOptions;

-        if (error === JitsiConnectionErrors.PASSWORD_REQUIRED) {
-            // Show the message if there's been a user ID or password provided.
-            messageKey
-                = errorCredentials
-                        && (errorCredentials.jid || errorCredentials.password)
-                    ? 'dialog.incorrectPassword'
-                    : null;
-        } else if (error) {
-            messageKey = 'dialog.connectErrorWithMsg';
-            messageOptions.msg = `${error} ${errorDetails}`;
+        if (error) {
+            const { name } = error;
+
+            if (name === JitsiConnectionErrors.PASSWORD_REQUIRED) {
+                // Show a message that the credentials are incorrect only if the
+                // credentials which have caused the connection to fail are the
+                // ones which the user sees.
+                const { credentials } = error;
+
+                if (credentials
+                        && credentials.jid
+                            === toJid(
+                                this.state.username,
+                                this.props._configHosts)
+                        && credentials.password === this.state.password) {
+                    messageKey = 'dialog.incorrectPassword';
+                }
+            } else if (name) {
+                messageKey = 'dialog.connectErrorWithMsg';
+                messageOptions || (messageOptions = {});
+                messageOptions.msg = `${name} ${error.message}`;
+            }
        }

        return (
@@ -146,6 +146,8 @@ class LoginDialog extends Component {
                titleKey = 'dialog.passwordRequired'>
                <View style = { styles.loginDialog }>
                    <TextInput
+                        autoCapitalize = { 'none' }
+                        autoCorrect = { false }
                        onChangeText = { this._onUsernameChange }
                        placeholder = { 'user@domain.com' }
                        style = { styles.loginDialogTextInput }
@@ -159,7 +161,7 @@ class LoginDialog extends Component {
                    <Text style = { styles.loginDialogText }>
                        {
                            messageKey
-                                ? t(messageKey, messageOptions)
+                                ? t(messageKey, messageOptions || {})
                                : connecting
                                    ? t('connection.CONNECTING')
                                    : ''
@@ -239,9 +241,7 @@ class LoginDialog extends Component {
 *     _conference: JitsiConference,
 *     _configHosts: Object,
 *     _connecting: boolean,
- *     _error: string,
- *     _errorCredentials: Object,
- *     _errorDetails: string
+ *     _error: Object
 * }}
 */
 function _mapStateToProps(state) {
@@ -253,34 +253,14 @@ function _mapStateToProps(state) {
    const { hosts: configHosts } = state['features/base/config'];
    const {
        connecting,
-        credentials,
-        error: connectionError,
-        errorMessage: connectionErrorMessage
+        error: connectionError
    } = state['features/base/connection'];

-    let error;
-    let errorCredentials;
-    let errorDetails;
-
-    if (connectionError) {
-        error = connectionError;
-        errorCredentials = credentials;
-        errorDetails = connectionErrorMessage;
-    } else if (upgradeRoleError) {
-        error
-            = upgradeRoleError.connectionError
-                || upgradeRoleError.authenticationError;
-        errorCredentials = upgradeRoleError.credentials;
-        errorDetails = upgradeRoleError.message;
-    }
-
    return {
        _conference: authRequired,
        _configHosts: configHosts,
        _connecting: Boolean(connecting) || Boolean(upgradeRoleInProgress),
-        _error: error,
-        _errorCredentials: errorCredentials,
-        _errorDetails: errorDetails
+        _error: connectionError || upgradeRoleError
    };
 }

@@ -95,10 +95,14 @@ MiddlewareRegistry.register(store => next => action => {
        _hideLoginDialog(store);
        break;

-    case CONNECTION_FAILED:
-        action.error === JitsiConnectionErrors.PASSWORD_REQUIRED
+    case CONNECTION_FAILED: {
+        const { error } = action;
+
+        error
+            && error.name === JitsiConnectionErrors.PASSWORD_REQUIRED
            && store.dispatch(_openLoginDialog());
        break;
+    }

    case STOP_WAIT_FOR_OWNER:
        _clearExistingWaitForOwnerTimeout(store);