web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Load shared folder when not logged in

Browse Source
This commit is contained in:
yflory 2018-09-28 15:06:24 +02:00
parent 0e04c4392c
commit 17bc1ee703
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/cryptpad-common.js
View File

@ -89,6 +89,12 @@ define([
cb(obj); cb(obj);
}); });
}; };
common.loadSharedFolder = function (id, data, cb) {
postMessage("LOAD_SHARED_FOLDER", {
id: id,
data: data
}, cb);
};
// Settings and ready // Settings and ready
common.mergeAnonDrive = function (cb) { common.mergeAnonDrive = function (cb) {
var data = { var data = {

3
www/common/outer/async-store.js
View File

@ -1239,6 +1239,9 @@ define([
} }
return rt; return rt;
}; };
Store.loadSharedFolderAnon = function (clientId, data, cb) {
loadSharedFolder(data.id, data.data, cb);
};
Store.addSharedFolder = function (clientId, data, cb) { Store.addSharedFolder = function (clientId, data, cb) {
Store.userObjectCommand(clientId, { Store.userObjectCommand(clientId, {
cmd: 'addSharedFolder', cmd: 'addSharedFolder',

1
www/common/outer/store-rpc.js
View File

@ -56,6 +56,7 @@ define([
INCREMENT_TEMPLATE_USE: Store.incrementTemplateUse, INCREMENT_TEMPLATE_USE: Store.incrementTemplateUse,
GET_SHARED_FOLDER: Store.getSharedFolder, GET_SHARED_FOLDER: Store.getSharedFolder,
ADD_SHARED_FOLDER: Store.addSharedFolder, ADD_SHARED_FOLDER: Store.addSharedFolder,
LOAD_SHARED_FOLDER: Store.loadSharedFolderAnon,
// Messaging // Messaging
INVITE_FROM_USERLIST: Store.inviteFromUserlist, INVITE_FROM_USERLIST: Store.inviteFromUserlist,
ADD_DIRECT_MESSAGE_HANDLERS: Store.addDirectMessageHandlers, ADD_DIRECT_MESSAGE_HANDLERS: Store.addDirectMessageHandlers,

12
www/drive/main.js
View File

@ -39,7 +39,7 @@ define([
var getSecrets = function (Cryptpad, Utils, cb) { var getSecrets = function (Cryptpad, Utils, cb) {
var hash = window.location.hash.slice(1); var hash = window.location.hash.slice(1);
var secret = Utils.Hash.getSecrets('drive', hash); var secret = Utils.Hash.getSecrets('drive', hash);
if (hash) { if (hash && Utils.LocalStore.isLoggedIn()) {
// Add a shared folder! // Add a shared folder!
// TODO password? // TODO password?
Cryptpad.addSharedFolder(secret, function (id) { Cryptpad.addSharedFolder(secret, function (id) {
@ -53,6 +53,16 @@ define([
cb(null, secret); cb(null, secret);
}); });
return; return;
} else if (hash) {
var id = Utils.Util.createRandomInteger();
window.CryptPad_newSharedFolder = id;
var data = {
href: Utils.Hash.getRelativeHref(window.location.href),
};
Cryptpad.loadSharedFolder(id, data, function () {
cb(null, secret);
});
return;
} }
// No password for drive // No password for drive
cb(null, secret); cb(null, secret);