infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'staging' into rebrand

Browse Source
pull/1/head
yflory 4 years ago
parent 63dbd62d30 b1f29678ca
commit 4ff146a286
6 changed files with 48 additions and 15 deletions
Show Stats Download Patch File Download Diff File

4
customize.dist/pages/index.js
Unescape Escape View File

@ -47,8 +47,8 @@ define([
var href = '/'+ x[0] +'/';
var attr = isEnabled ? { href: href } : {
onclick: function () {
var href = Hash.hashToHref('', 'login');
var url = Hash.getNewPadURL(href, { href: href });
var loginURL = Hash.hashToHref('', 'login');
var url = Hash.getNewPadURL(loginURL, { href: href });
window.location.href = url;
}
};

23
www/common/common-hash.js
Unescape Escape View File

@ -165,8 +165,15 @@ var factory = function (Util, Crypto, Keys, Nacl) {
/*
Version 0
/pad/#67b8385b07352be53e40746d2be6ccd7XAYSuJYYqa9NfmInyHci7LNy
Version 1
Version 1: Add support for read-only access
/code/#/1/edit/3Ujt4F2Sjnjbis6CoYWpoQ/usn4+9CqVja8Q7RZOGTfRgqI
Version 2: Add support for password-protection
/code/#/2/code/edit/u5ACvxAYmhvG0FtrNn9FJQcf/p/
Version 3: Safe links
/code/#/3/code/edit/f0d8055aa640a97e7fd25020ca4e93b3/
Version 4: Data URL when not a realtime link yet (new pad or "static" app)
/login/#/4/login/newpad=eyJocmVmIjoiaHR0cDovL2xvY2FsaG9zdDozMDAwL2NvZGUvIy8yL2NvZGUvZWRpdC91NUFDdnhBWW1odkcwRnRyTm45RklRY2YvIn0%3D/
/drive/#/4/drive/login=e30%3D/
*/
var getLoginOpts = function (hashArr) {
@ -229,11 +236,11 @@ Version 1
parsed.ownerKey = getOwnerKey(options);
};
// Version 4: only login or newpad options, smae for all the apps
// Version 4: only login or newpad options, same for all the apps
if (hashArr[1] && hashArr[1] === '4') {
parsed.getHash = function (opts) {
if (!opts || !Object.keys(opts).length) { return ''; }
var hash = '/4/';
var hash = '/4/' + type + '/';
if (opts.newPadOpts) { hash += 'newpad=' + opts.newPadOpts + '/'; }
if (opts.loginOpts) { hash += 'login=' + opts.loginOpts + '/'; }
return hash;
@ -246,7 +253,8 @@ Version 1
};
parsed.version = 4;
options = hashArr.slice(2);
parsed.app = hashArr[2];
options = hashArr.slice(3);
addOptions();
return parsed;
@ -429,7 +437,7 @@ Version 1
// When we start without a hash, use version 4 links to add login or newpad options
var getHash = function (opts) {
if (!opts || !Object.keys(opts).length) { return ''; }
var hash = '/4/';
var hash = '/4/' + ret.type + '/';
if (opts.newPadOpts) { hash += 'newpad=' + opts.newPadOpts + '/'; }
if (opts.loginOpts) { hash += 'login=' + opts.loginOpts + '/'; }
return hash;
@ -645,9 +653,6 @@ Version 1
// Valid hash?
if (parsed.hash) {
if (!parsed.hashData) { return; }
// New pad: only newPadOpts allowed
if (Object.keys(parsed.hashData).length === 1 &&
parsed.hashData.newPadOpts) { return true; }
// Version should be a number
if (typeof(parsed.hashData.version) === "undefined") { return; }
// pads and files should have a base64 (or hex) key
@ -662,7 +667,7 @@ Version 1
Hash.decodeDataOptions = function (opts) {
var b64 = decodeURIComponent(opts);
var str = Nacl.util.encodeUTF8(Nacl.util.decodeBase64(b64));
return JSON.parse(str);
return Util.tryParse(str) || {};
};
Hash.encodeDataOptions = function (opts) {
var str = JSON.stringify(opts);

26
www/common/cryptpad-common.js
Unescape Escape View File

@ -2107,6 +2107,28 @@ define([
driveEvents: true //rdyCfg.driveEvents // Boolean
};
// FIXME Backward compatibility
if (sessionStorage.newPadFileData) {
common.fromFileData = JSON.parse(sessionStorage.newPadFileData);
var _parsed1 = Hash.parsePadUrl(common.fromFileData.href);
var _parsed2 = Hash.parsePadUrl(window.location.href);
if (_parsed1.hashData.type === 'pad') {
if (_parsed1.type !== _parsed2.type) { delete common.fromFileData; }
}
delete sessionStorage.newPadFileData;
}
if (sessionStorage.newPadPath) {
common.initialPath = sessionStorage.newPadPath;
delete sessionStorage.newPadPath;
}
if (sessionStorage.newPadTeam) {
common.initialTeam = sessionStorage.newPadTeam;
delete sessionStorage.newPadTeam;
}
var channelIsReady = waitFor();
var msgEv = Util.mkEvent();
@ -2332,7 +2354,7 @@ define([
postMessage("DISCONNECT");
});
}).nThen(function (waitFor) {
if (common.createReadme) {
if (common.createReadme || sessionStorage.createReadme) {
var data = {
driveReadme: Messages.driveReadme,
driveReadmeTitle: Messages.driveReadmeTitle,
@ -2342,7 +2364,7 @@ define([
}));
}
}).nThen(function (waitFor) {
if (common.migrateAnonDrive) {
if (common.migrateAnonDrive || sessionStorage.migrateAnonDrive) {
common.mergeAnonDrive(waitFor());
}
}).nThen(function (waitFor) {

1
www/common/outer/local-store.js
Unescape Escape View File

@ -94,6 +94,7 @@ define([
localStorage.removeItem(k);
delete localStorage[k];
});
sessionStorage.clear();
try {
Object.keys(localStorage || {}).forEach(function (k) {
// Remvoe everything in localStorage except CACHE and FS_hash

7
www/common/sframe-common-outer.js
Unescape Escape View File

@ -124,7 +124,7 @@ define([
SFrameChannel.create(msgEv, postMsg, waitFor(function (sfc) {
Utils.sframeChan = sframeChan = sfc;
window.CryptPad_loadingError = function (e) {
sfc.event('EV_LOADING_ERROR', e)
sfc.event('EV_LOADING_ERROR', e);
};
}));
});
@ -260,6 +260,11 @@ define([
}
// Otherwise, continue
}
// FIXME Backward compatibility
if (sessionStorage.newPadPassword && !newPadPassword) {
newPadPassword = sessionStorage.newPadPassword;
delete sessionStorage.newPadPassword;
}
if (!parsed.hashData) { // No hash, no need to check for a password

2
www/register/main.js
Unescape Escape View File

@ -39,7 +39,7 @@ define([
if (localStorage.login_user) {
$uname.val(localStorage.login_user);
delete loginStorage.login_user;
delete localStorage.login_user;
}
[ $uname, $passwd, $confirm]

Write Preview
Loading…
Cancel
Save