Improve migration script

2019-11-07 17:02:22 +01:00
parent 96968f2076
commit 039ab83440
2 changed files with 17 additions and 8 deletions
--- a/www/common/outer/userObject.js
+++ b/www/common/outer/userObject.js
@@ -480,13 +480,19 @@ define([
            var next = function () {
                var copy = JSON.parse(JSON.stringify(files));
                exp.reencrypt(config.editKey, config.editKey, copy);
-                Object.keys(copy).forEach(function (k) {
-                    files[k] = copy[k];
-                });
-                files.version = 2;
-                delete files.migrateRo;
+                setTimeout(function () {
+                    if (files.version >= 2) {
+                        // Already migrated by another user while we were re-encrypting
+                        return void cb();
+                    }
+                    Object.keys(copy).forEach(function (k) {
+                        files[k] = copy[k];
+                    });
+                    files.version = 2;
+                    delete files.migrateRo;

-                onSync(cb);
+                    onSync(cb);
+                }, 1000);
            };
            onSync(next);
        };