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

PCS with owners and password for spreadsheets

Browse Source
This commit is contained in:
yflory
2019-02-05 15:58:49 +01:00
parent a0049b360a
commit 412670c8a6
8 changed files with 77 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/sframe-common-outer.js
View File

@@ -255,6 +255,7 @@ define([
secret.keys = secret.key;
readOnly = false;
}
Utils.crypto = Utils.Crypto.createEncryptor(Utils.secret.keys);
var parsed = Utils.Hash.parsePadUrl(window.location.href);
if (!parsed.type) { throw new Error(); }
var defaultTitle = Utils.Hash.getDefaultName(parsed);
@@ -953,6 +954,7 @@ define([
password = data.password;
var newHash = Utils.Hash.createRandomHash(parsed.type, password);
secret = Utils.secret = Utils.Hash.getSecrets(parsed.type, newHash, password);
Utils.crypto = Utils.Crypto.createEncryptor(Utils.secret.keys);
// Update the hash in the address bar
var ohc = window.onhashchange;
@@ -975,6 +977,7 @@ define([
if (data.expire) {
rtConfig.expire = data.expire;
}
Utils.rtConfig = rtConfig;
nThen(function(waitFor) {
if (data.templateId) {
if (data.templateId === -1) {