diff --git a/www/common/common-hash.js b/www/common/common-hash.js index fb5f0d99c..401291d6c 100644 --- a/www/common/common-hash.js +++ b/www/common/common-hash.js @@ -39,9 +39,16 @@ define([ return s.replace(/\/+/g, '/'); }; +/* +Version 0 + /pad/#67b8385b07352be53e40746d2be6ccd7XAYSuJYYqa9NfmInyHci7LNy +Version 1 + /code/#/1/edit/3Ujt4F2Sjnjbis6CoYWpoQ/usn4+9CqVja8Q7RZOGTfRgqI +*/ + var parseTypeHash = Hash.parseTypeHash = function (type, hash) { if (!hash) { return; } - var parsed = {} + var parsed = {}; var hashArr = fixDuplicateSlashes(hash).split('/'); if (['media', 'file', 'user'].indexOf(type) === -1) { parsed.type = 'pad'; @@ -147,7 +154,6 @@ define([ } //var parsed = parsePadUrl(window.location.href); //var hash = secretHash || window.location.hash.slice(1); - console.log(hash, parsed); if (hash.length === 0) { generate(); return secret; @@ -164,7 +170,6 @@ define([ if (parsed.type === "pad") { secret.channel = base64ToHex(parsed.channel); if (parsed.mode === 'edit') { - console.log(parsed.key); secret.keys = Crypto.createEditCryptor(parsed.key); secret.key = secret.keys.editKeyStr; if (secret.channel.length !== 32 || secret.key.length !== 24) { @@ -219,43 +224,6 @@ define([ return '/1/edit/' + [channelId, key].join('/') + '/'; }; -/* -Version 0 - /pad/#67b8385b07352be53e40746d2be6ccd7XAYSuJYYqa9NfmInyHci7LNy -Version 1 - /code/#/1/edit/3Ujt4F2Sjnjbis6CoYWpoQ/usn4+9CqVja8Q7RZOGTfRgqI -Version 2 - /file/#/2/// - /file/#/2/K6xWU-LT9BJHCQcDCT-DcQ/ajExFODrFH4lVBwxxsrOKw/image-png -*/ - var parseHash = Hash.parseHash = function (hash) { - throw new Error('parseHash deprecated'); - var parsed = {}; - if (hash.slice(0,1) !== '/' && hash.length >= 56) { - // Old hash - parsed.channel = hash.slice(0, 32); - parsed.key = hash.slice(32); - parsed.version = 0; - return parsed; - } - var hashArr = fixDuplicateSlashes(hash).split('/'); - if (hashArr[1] && hashArr[1] === '1') { - parsed.version = 1; - parsed.mode = hashArr[2]; - parsed.channel = hashArr[3]; - parsed.key = hashArr[4]; - parsed.present = typeof(hashArr[5]) === "string" && hashArr[5] === 'present'; - return parsed; - } - if (hashArr[1] && hashArr[1] === '2') { - parsed.version = 2; - parsed.channel = hashArr[2].replace(/-/g, '/'); - parsed.key = hashArr[3].replace(/-/g, '/'); - return parsed; - } - return; - }; - // STORAGE Hash.findWeaker = function (href, recents) { var rHref = href || getRelativeHref(window.location.href); diff --git a/www/common/cryptpad-common.js b/www/common/cryptpad-common.js index ca8de5a08..6b042df41 100644 --- a/www/common/cryptpad-common.js +++ b/www/common/cryptpad-common.js @@ -75,7 +75,7 @@ define([ // import hash utilities for export var createRandomHash = common.createRandomHash = Hash.createRandomHash; - var parseTypeHash = common.parseTypeHash = Hash.parseTypeHash; + common.parseTypeHash = Hash.parseTypeHash; var parsePadUrl = common.parsePadUrl = Hash.parsePadUrl; var isNotStrongestStored = common.isNotStrongestStored = Hash.isNotStrongestStored; var hrefToHexChannelId = common.hrefToHexChannelId = Hash.hrefToHexChannelId; @@ -293,15 +293,10 @@ define([ return pads.map(function (pad) { var parsedHash; if (Array.isArray(pad)) { // TODO DEPRECATE_F - var href = pad[0]; - href.replace(/\#(.*)$/, function (a, h) { - hash = h; - }); - return { href: pad[0], atime: pad[1], - title: pad[2] || hash && hash.slice(0,8), + title: pad[2] || '', ctime: pad[1], }; } else if (pad && typeof(pad) === 'object') { diff --git a/www/drive/main.js b/www/drive/main.js index 10921e20c..bf853b443 100644 --- a/www/drive/main.js +++ b/www/drive/main.js @@ -2155,7 +2155,7 @@ define([ var getReadOnlyUrl = APP.getRO = function (href) { if (!filesOp.isFile(href)) { return; } var i = href.indexOf('#') + 1; - var parsed = Cryptpad.parsePadUrl(href);; + var parsed = Cryptpad.parsePadUrl(href); var base = href.slice(0, i); var hrefsecret = Cryptpad.getSecrets(parsed.type, parsed.hash); if (!hrefsecret.keys) { return; }