refactor

js/models/messages.js

@@ -12,7 +12,6 @@
   Whisper,
   clipboard,
   libloki,
-  lokiFileServerAPI,
 */
 
 /* eslint-disable more/no-then */

libloki/storage.js

@@ -114,31 +114,40 @@
   }
 
   // fetches device mappings from server.
-  // if the device is a secondary device,
+  async function getPrimaryDeviceMapping(pubKey) {
-  // fetch the device mappings for its primary device
-  async function saveAllPairingAuthorisationsFor(pubKey) {
     const deviceMapping = await lokiFileServerAPI.getUserDeviceMapping(pubKey);
-    let { authorisations } = deviceMapping || {};
+    if (!deviceMapping) {
-    if (deviceMapping) {
+      return [];
+    }
+    let { authorisations } = deviceMapping;
+    if (!authorisations) {
+      return [];
+    }
     if (deviceMapping.isPrimary !== '1') {
-        const { primaryDevicePubKey } =
+      const { primaryDevicePubKey } = authorisations.find(
-          authorisations.find(
         authorisation => authorisation.secondaryDevicePubKey === pubKey
-          ) || {};
+      );
       if (primaryDevicePubKey) {
-          ({ authorisations } =
+        // do NOT call getprimaryDeviceMapping recursively
-            (await lokiFileServerAPI.getUserDeviceMapping(
+        // in case both devices are out of sync and think they are
+        // each others' secondary pubkey.
+        ({ authorisations } = await lokiFileServerAPI.getUserDeviceMapping(
           primaryDevicePubKey
-            )) || {});
+        ));
+      }
     }
+    return authorisations || [];
+  }
+  // if the device is a secondary device,
+  // fetch the device mappings for its primary device
+  async function saveAllPairingAuthorisationsFor(pubKey) {
+    const authorisations = await getPrimaryDeviceMapping(pubKey);
     await Promise.all(
       authorisations.map(authorisation =>
         savePairingAuthorisation(authorisation)
       )
     );
   }
-    }
-  }
 
   function savePairingAuthorisation(authorisation) {
     return window.Signal.Data.createOrUpdatePairingAuthorisation(authorisation);