Fix crash with associate accounts.

Associates accounts can't create journals, and the web client was
failing for them because the creation error wasn't being handled
correctly.
master
Tom Hacohen 5 years ago
parent e0904eea02
commit 5f78657e51

@ -1,6 +1,5 @@
import * as React from 'react'; import * as React from 'react';
import { connect } from 'react-redux'; import { connect } from 'react-redux';
import { Action } from 'redux-actions';
import { Route, Switch, Redirect, RouteComponentProps, withRouter } from 'react-router'; import { Route, Switch, Redirect, RouteComponentProps, withRouter } from 'react-router';
import moment from 'moment'; import moment from 'moment';
@ -118,13 +117,17 @@ class SyncGate extends React.PureComponent<PropsTypeInner> {
const journal = new EteSync.Journal({ uid: collection.uid }); const journal = new EteSync.Journal({ uid: collection.uid });
const cryptoManager = new EteSync.CryptoManager(this.props.etesync.encryptionKey, collection.uid); const cryptoManager = new EteSync.CryptoManager(this.props.etesync.encryptionKey, collection.uid);
journal.setInfo(cryptoManager, collection); journal.setInfo(cryptoManager, collection);
store.dispatch<any>(addJournal(this.props.etesync, journal)).then( (async () => {
(journalAction: Action<EteSync.Journal>) => { try {
// FIXME: Limit based on error code to only do it for associates. const addedJournalAction = addJournal(this.props.etesync, journal);
if (!journalAction.error) { await addedJournalAction.payload;
store.dispatch(fetchEntries(this.props.etesync, collection.uid)); store.dispatch(addedJournalAction);
} store.dispatch(fetchEntries(this.props.etesync, collection.uid));
}); } catch (e) {
// FIXME: Limit based on error code to only ignore for associates
console.warn(`Failed creating journal for ${collection.type}. Associate?`);
}
})();
}); });
}); });
}; };

Loading…
Cancel
Save