dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix shared folder password change with the cache

This commit is contained in:
yflory 2021-01-07 17:55:41 +01:00
parent 1f7aca39ab
commit d12603c50a
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/common/outer/sharedfolder.js
View File

@ -197,7 +197,12 @@ define([
// 1. addProxy won't re-add the same folder twice on 'ready'
// 2. obj.cb is using Util.once
rt.cache = true;
obj.store.manager.addProxy(obj.id, rt, leave, obj.secondaryKey);
// If we're updating the password of an existing folder, force the creation
// of a new userobject in proxy-manager. Once it's done, remove this flag
// to make sure we won't create a second new userobject on 'ready'
obj.store.manager.addProxy(obj.id, rt, leave, obj.secondaryKey, config.updatePassword);
config.updatePassword = false;
obj.cb(sf.rt);
});
sf.ready = true;
@ -220,7 +225,7 @@ define([
});
*/
rt.cache = false;
obj.store.manager.addProxy(obj.id, rt, leave, obj.secondaryKey);
obj.store.manager.addProxy(obj.id, rt, leave, obj.secondaryKey, config.updatePassword);
obj.cb(sf.rt);
});
sf.ready = true;
@ -324,6 +329,7 @@ define([
SF.load({
network: network,
store: s,
updatePassword: true,
isNewChannel: Store.isNewChannel
}, sfId, sf, waitFor());
if (!s.rpc) { return; }

4
www/common/proxy-manager.js
View File

@ -16,8 +16,8 @@ define([
};
// Add a shared folder to the list
var addProxy = function (Env, id, lm, leave, editKey) {
if (Env.folders[id]) {
var addProxy = function (Env, id, lm, leave, editKey, force) {
if (Env.folders[id] && !force) {
// Shared folder already added to the proxy-manager, probably
// a cached version
if (Env.folders[id].offline && !lm.cache) {