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

derive block URI and URL in dedicated functions

Browse Source
This commit is contained in:
ansuz 2018-07-02 11:11:50 +02:00
parent 12cf1993b9
commit a3e0e765b5
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,14 +105,18 @@ define([
return Nacl.util.encodeBase64(u8).replace(/\//g, '-'); return Nacl.util.encodeBase64(u8).replace(/\//g, '-');
}; };
Block.getBlockHash = function (keys) { Block.getBlockUrl = function (keys) {
var publicKey = urlSafeB64(keys.sign.publicKey); var publicKey = urlSafeB64(keys.sign.publicKey);
// 'block/' here is hardcoded because it's hardcoded on the server // 'block/' here is hardcoded because it's hardcoded on the server
// if we want to make CryptPad work in server subfolders, we'll need // if we want to make CryptPad work in server subfolders, we'll need
// to update this path derivation // to update this path derivation
var relative = 'block/' + publicKey.slice(0, 2) + '/' + publicKey; return ApiConfig.httpUnsafeOrigin + 'block/' + publicKey.slice(0, 2) + '/' + publicKey;
};
Block.getBlockHash = function (keys) {
var absolute = Block.getBlockUrl(keys);
var symmetric = urlSafeB64(keys.symmetric); var symmetric = urlSafeB64(keys.symmetric);
return ApiConfig.httpUnsafeOrigin + relative + '#' + symmetric; return absolute + '#' + symmetric;
}; };
/* /*