Use the new getCryptoManager when editing journals/userInfos.

This also fixes an issue when editing and deleting journals after an encryption
password change.

src/Journals/JournalMembers.tsx

@@ -155,15 +155,8 @@ class JournalMembers extends React.PureComponent<PropsTypeInner> {
     const journal = syncJournal.journal;
     const derived = this.props.etesync.encryptionKey;
 
-    const keyPair = userInfo.getKeyPair(new EteSync.CryptoManager(derived, 'userInfo', userInfo.version));
+    const keyPair = userInfo.getKeyPair(userInfo.getCryptoManager(derived));
-    let cryptoManager: EteSync.CryptoManager;
+    const cryptoManager = journal.getCryptoManager(derived, keyPair);
-    if (journal.key) {
-      const asymmetricCryptoManager = new EteSync.AsymmetricCryptoManager(keyPair);
-      const derivedJournalKey = asymmetricCryptoManager.decryptBytes(journal.key);
-      cryptoManager = EteSync.CryptoManager.fromDerivedKey(derivedJournalKey, journal.version);
-    } else {
-      cryptoManager = new EteSync.CryptoManager(derived, journal.uid, journal.version);
-    }
 
     const pubkeyBytes = sjcl.codec.bytes.fromBits(sjcl.codec.base64.toBits(publicKey));
     const encryptedKey = sjcl.codec.base64.fromBits(sjcl.codec.bytes.toBits(cryptoManager.getEncryptedKey(keyPair, pubkeyBytes)));

src/Journals/JournalsList.tsx

@@ -11,8 +11,6 @@ import { List, ListItem } from '../widgets/List';
 import AppBarOverride from '../widgets/AppBarOverride';
 import Container from '../widgets/Container';
 
-import * as EteSync from '../api/EteSync';
-
 import { routeResolver } from '../App';
 
 import { JournalsData, UserInfoData, CredentialsData } from '../store';
@@ -32,21 +30,11 @@ class JournalsList extends React.PureComponent {
 
   public render() {
     const derived = this.props.etesync.encryptionKey;
-    let asymmetricCryptoManager: EteSync.AsymmetricCryptoManager;
     const journalMap = this.props.journals.reduce(
       (ret, journal) => {
-        let cryptoManager: EteSync.CryptoManager;
+        const userInfo = this.props.userInfo;
-        if (journal.key) {
+        const keyPair = userInfo.getKeyPair(userInfo.getCryptoManager(derived));
-          if (!asymmetricCryptoManager) {
+        const cryptoManager = journal.getCryptoManager(derived, keyPair);
-            const userInfo = this.props.userInfo;
-            const keyPair = userInfo.getKeyPair(new EteSync.CryptoManager(derived, 'userInfo', userInfo.version));
-            asymmetricCryptoManager = new EteSync.AsymmetricCryptoManager(keyPair);
-          }
-          const derivedJournalKey = asymmetricCryptoManager.decryptBytes(journal.key);
-          cryptoManager = EteSync.CryptoManager.fromDerivedKey(derivedJournalKey, journal.version);
-        } else {
-          cryptoManager = new EteSync.CryptoManager(derived, journal.uid, journal.version);
-        }
         const info = journal.getInfo(cryptoManager);
         ret[info.type] = ret[info.type] || [];
         ret[info.type].push(

src/Journals/index.tsx

@@ -118,8 +118,14 @@ class Journals extends React.PureComponent {
   }
 
   public onItemSave(info: EteSync.CollectionInfo, originalInfo?: EteSync.CollectionInfo) {
-    const journal = new EteSync.Journal();
+    const syncJournal = this.props.syncInfo.get(info.uid);
-    const cryptoManager = new EteSync.CryptoManager(this.props.etesync.encryptionKey, info.uid);
+
+    const derived = this.props.etesync.encryptionKey;
+    const userInfo = this.props.userInfo;
+    const existingJournal = (syncJournal) ? syncJournal.journal.serialize() : { uid: info.uid };
+    const journal = new EteSync.Journal(existingJournal);
+    const keyPair = userInfo.getKeyPair(userInfo.getCryptoManager(derived));
+    const cryptoManager = journal.getCryptoManager(derived, keyPair);
     journal.setInfo(cryptoManager, info);
 
     if (originalInfo) {
@@ -134,8 +140,14 @@ class Journals extends React.PureComponent {
   }
 
   public onItemDelete(info: EteSync.CollectionInfo) {
-    const journal = new EteSync.Journal();
+    const syncJournal = this.props.syncInfo.get(info.uid);
-    const cryptoManager = new EteSync.CryptoManager(this.props.etesync.encryptionKey, info.uid);
+
+    const derived = this.props.etesync.encryptionKey;
+    const userInfo = this.props.userInfo;
+    const existingJournal = (syncJournal) ? syncJournal.journal.serialize() : { uid: info.uid };
+    const journal = new EteSync.Journal(existingJournal);
+    const keyPair = userInfo.getKeyPair(userInfo.getCryptoManager(derived));
+    const cryptoManager = journal.getCryptoManager(derived, keyPair);
     journal.setInfo(cryptoManager, info);
 
     store.dispatch<any>(deleteJournal(this.props.etesync, journal)).then(() =>

src/SyncGate.tsx

@@ -53,9 +53,8 @@ const syncInfoSelector = createSelector(
   (props: PropsTypeInner) => props.userInfo.value!,
   (etesync, journals, entries, userInfo) => {
     const derived = etesync.encryptionKey;
-    let asymmetricCryptoManager: EteSync.AsymmetricCryptoManager;
+    const userInfoCryptoManager = userInfo.getCryptoManager(etesync.encryptionKey);
     try {
-      const userInfoCryptoManager = new EteSync.CryptoManager(etesync.encryptionKey, 'userInfo');
       userInfo.verify(userInfoCryptoManager);
     } catch (error) {
       if (error instanceof EteSync.IntegrityError) {
@@ -74,17 +73,8 @@ const syncInfoSelector = createSelector(
           return ret;
         }
 
-        let cryptoManager: EteSync.CryptoManager;
+        const keyPair = userInfo.getKeyPair(userInfoCryptoManager);
-        if (journal.key) {
+        const cryptoManager = journal.getCryptoManager(derived, keyPair);
-          if (!asymmetricCryptoManager) {
-            const keyPair = userInfo.getKeyPair(new EteSync.CryptoManager(derived, 'userInfo', userInfo.version));
-            asymmetricCryptoManager = new EteSync.AsymmetricCryptoManager(keyPair);
-          }
-          const derivedJournalKey = asymmetricCryptoManager.decryptBytes(journal.key);
-          cryptoManager = EteSync.CryptoManager.fromDerivedKey(derivedJournalKey, journal.version);
-        } else {
-          cryptoManager = new EteSync.CryptoManager(derived, journal.uid, journal.version);
-        }
 
         const collectionInfo = journal.getInfo(cryptoManager);
 
@@ -124,7 +114,7 @@ class SyncGate extends React.PureComponent<PropsTypeInner> {
           collection.type = collectionType;
           collection.displayName = 'Default';
 
-          const journal = new EteSync.Journal();
+          const journal = new EteSync.Journal({ uid: collection.uid });
           const cryptoManager = new EteSync.CryptoManager(this.props.etesync.encryptionKey, collection.uid);
           journal.setInfo(cryptoManager, collection);
           store.dispatch<any>(addJournal(this.props.etesync, journal)).then(
@@ -144,7 +134,7 @@ class SyncGate extends React.PureComponent<PropsTypeInner> {
       } else {
         const userInfo = new EteSync.UserInfo(me, CURRENT_VERSION);
         const keyPair = EteSync.AsymmetricCryptoManager.generateKeyPair();
-        const cryptoManager = new EteSync.CryptoManager(this.props.etesync.encryptionKey, 'userInfo');
+        const cryptoManager = userInfo.getCryptoManager(this.props.etesync.encryptionKey);
 
         userInfo.setKeyPair(cryptoManager, keyPair);
 

src/etesync-helpers.ts

@@ -27,15 +27,8 @@ export function createJournalEntryFromSyncEntry(
 
   const derived = etesync.encryptionKey;
 
-  let cryptoManager: EteSync.CryptoManager;
+  const keyPair = userInfo.getKeyPair(userInfo.getCryptoManager(derived));
-  if (journal.key) {
+  const cryptoManager = journal.getCryptoManager(derived, keyPair);
-    const keyPair = userInfo.getKeyPair(new EteSync.CryptoManager(derived, 'userInfo', userInfo.version));
-    const asymmetricCryptoManager = new EteSync.AsymmetricCryptoManager(keyPair);
-    const derivedJournalKey = asymmetricCryptoManager.decryptBytes(journal.key);
-    cryptoManager = EteSync.CryptoManager.fromDerivedKey(derivedJournalKey, journal.version);
-  } else {
-    cryptoManager = new EteSync.CryptoManager(derived, journal.uid, journal.version);
-  }
   const entry = new EteSync.Entry();
   entry.setSyncEntry(cryptoManager, syncEntry, prevUid);
 

src/store/construct.ts

@@ -56,7 +56,7 @@ const journalsDeserialize = (state: {}) => {
   const newState = new Map<string, EteSync.Journal>();
   Object.keys(state).forEach((uid) => {
     const x = state[uid];
-    const ret = new EteSync.Journal(uid, x.version);
+    const ret = new EteSync.Journal({ uid }, x.version);
     ret.deserialize(x);
     newState.set(uid, ret);
   });