From c7e63f63fdbba2673dbb127c6c010fbe90f8fc69 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 20 Dec 2016 11:30:04 +0100
Subject: [PATCH] Use the user object in file manager if it exists

---
 customize.dist/fsStore.js | 6 ++++--
 www/file/main.js          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/customize.dist/fsStore.js b/customize.dist/fsStore.js
index 19a7e9de3..c031cba21 100644
--- a/customize.dist/fsStore.js
+++ b/customize.dist/fsStore.js
@@ -122,7 +122,7 @@ define([
 
     var init = function (f, Cryptpad) {
         if (!Cryptpad) { return; }
-        var hash = localStorage.FS_hash;
+        var hash = Cryptpad.getUserHash() || localStorage.FS_hash;
         var secret = Cryptpad.getSecrets(hash);
         var listmapConfig = {
             data: {},
@@ -136,7 +136,9 @@ define([
         var rt = window.rt = Listmap.create(listmapConfig);
         rt.proxy.on('create', function (info) {
             var realtime = info.realtime;
-            localStorage.FS_hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+            if (!Cryptpad.getUserHash()) {
+                localStorage.FS_hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
+            }
             window.patchText = TextPatcher.create({
                 realtime: realtime,
                 logging: true,
diff --git a/www/file/main.js b/www/file/main.js
index e35bb2c2d..79f2aa8fb 100644
--- a/www/file/main.js
+++ b/www/file/main.js
@@ -1444,7 +1444,7 @@ define([
             APP.homePageIframe = true;
         }
 
-        var hash = window.location.hash.slice(1) || localStorage.FS_hash;
+        var hash = Cryptpad.getUserHash() || window.location.hash.slice(1) || localStorage.FS_hash;
         var secret = Cryptpad.getSecrets(hash);
         var readOnly = APP.readOnly = secret.keys && !secret.keys.editKeyStr;