Fix an issue causing a user object to be turned into a pad
This commit is contained in:
parent
51a2cfa141
commit
3f1e287811
@ -138,7 +138,10 @@ define([
|
|||||||
var init = function (f, Cryptpad) {
|
var init = function (f, Cryptpad) {
|
||||||
if (!Cryptpad || initialized) { return; }
|
if (!Cryptpad || initialized) { return; }
|
||||||
initialized = true;
|
initialized = true;
|
||||||
var hash = Cryptpad.getUserHash() || localStorage.FS_hash;
|
var hash = Cryptpad.getUserHash() || localStorage.FS_hash || Cryptpad.createRandomHash();
|
||||||
|
if (!hash) {
|
||||||
|
throw new Error('[Store.init] Unable to find or create a drive hash. Aborting...');
|
||||||
|
}
|
||||||
var secret = Cryptpad.getSecrets(hash);
|
var secret = Cryptpad.getSecrets(hash);
|
||||||
var listmapConfig = {
|
var listmapConfig = {
|
||||||
data: {},
|
data: {},
|
||||||
|
|||||||
@ -171,12 +171,20 @@ define([
|
|||||||
var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys;
|
var getHashFromKeys = common.getHashFromKeys = getEditHashFromKeys;
|
||||||
|
|
||||||
var specialHashes = common.specialHashes = ['iframe'];
|
var specialHashes = common.specialHashes = ['iframe'];
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Returns all needed keys for a realtime channel
|
||||||
|
* - no argument: use the URL hash or create one if it doesn't exist
|
||||||
|
* - secretHash provided: use secretHash to find the keys
|
||||||
|
*/
|
||||||
var getSecrets = common.getSecrets = function (secretHash) {
|
var getSecrets = common.getSecrets = function (secretHash) {
|
||||||
var secret = {};
|
var secret = {};
|
||||||
var generate = function () {
|
var generate = function () {
|
||||||
secret.keys = Crypto.createEditCryptor();
|
secret.keys = Crypto.createEditCryptor();
|
||||||
secret.key = Crypto.createEditCryptor().editKeyStr;
|
secret.key = Crypto.createEditCryptor().editKeyStr;
|
||||||
};
|
};
|
||||||
|
// If we have a hash in the URL specifying a path, it means the document was created from
|
||||||
|
// the drive and should be stored at the selected path.
|
||||||
if (/#\?path=/.test(window.location.href)) {
|
if (/#\?path=/.test(window.location.href)) {
|
||||||
var arr = window.location.hash.match(/\?path=(.+)/);
|
var arr = window.location.hash.match(/\?path=(.+)/);
|
||||||
common.initialPath = arr[1] || undefined;
|
common.initialPath = arr[1] || undefined;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user