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

simple one line fixes

Browse Source
This commit is contained in:
ansuz 2018-07-06 10:28:41 +02:00
parent ab04a7cb46
commit 0c3b898000
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1050,7 +1050,7 @@ define([
var blockHash = LocalStore.getBlockHash(); var blockHash = LocalStore.getBlockHash();
if (blockHash) { if (blockHash) {
console.log(blockHash); console.log(blockHash);
var parsed = Hash.parseBlockHash(blockHash); var parsed = Block.parseBlockHash(blockHash);
if (typeof(parsed) !== 'object') { if (typeof(parsed) !== 'object') {
console.error("Failed to parse blockHash"); console.error("Failed to parse blockHash");

5
www/common/outer/local-store.js
View File

@ -58,7 +58,7 @@ define([
localStorage[Constants.userHashKey] = sHash; localStorage[Constants.userHashKey] = sHash;
}; };
LocalStore.getBlockHash = function () { var getBlockHash = LocalStore.getBlockHash = function () {
return localStorage[Constants.blockHashKey]; return localStorage[Constants.blockHashKey];
}; };
@ -71,7 +71,8 @@ define([
}; };
LocalStore.isLoggedIn = function () { LocalStore.isLoggedIn = function () {
return typeof getUserHash() === "string"; return typeof getBlockHash() === 'string' ||
typeof getUserHash() === "string";
}; };

2
www/common/outer/login-block.js
View File

@ -34,8 +34,6 @@ define([
var symmetric = seed.subarray(Nacl.sign.seedLength, var symmetric = seed.subarray(Nacl.sign.seedLength,
Nacl.sign.seedLength + Nacl.secretbox.keyLength); Nacl.sign.seedLength + Nacl.secretbox.keyLength);
console.log("symmetric key: ", Nacl.util.encodeBase64(symmetric));
return { return {
sign: Nacl.sign.keyPair.fromSeed(signSeed), // 32 bytes sign: Nacl.sign.keyPair.fromSeed(signSeed), // 32 bytes
symmetric: symmetric, // 32 bytes ... symmetric: symmetric, // 32 bytes ...