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

depend on main passing in the crypto module for now

Browse Source
This commit is contained in:
ansuz 2016-06-03 18:52:35 +02:00
parent f76dc615c0
commit 288b4d5b66
1 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
www/common/chainpad-listmap.js
View File

@ -1,13 +1,12 @@
require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/JSON.sortify' } });
define([
'/common/crypto.js',
'/common/realtime-input.js',
'/common/realtime-input.js', // TODO publish on bower
'/bower_components/chainpad-json-validator/json-ot.js',
'json.sortify',
'/bower_components/textpatcher/TextPatcher.amd.js',
'/bower_components/jquery/dist/jquery.min.js',
'/bower_components/proxy-polyfill/proxy.min.js', // https://github.com/GoogleChrome/proxy-polyfill
], function (Crypto, Realtime, JsonOT, Sortify, TextPatcher) {
], function (Realtime, JsonOT, Sortify, TextPatcher) {
var api = {};
// linter complains if this isn't defined
var Proxy = window.Proxy;
@ -543,13 +542,26 @@ define([
throw new Error('unsupported datatype: '+ DeepProxy.type(cfg.data));
}
if (!cfg.crypto) {
// complain and stub
console.log("[chainpad-listmap] no crypto module provided. messages will not be encrypted");
cfg.crypto = {
encrypt: function (msg) {
return msg;
},
descrypt: function (msg) {
return msg;
}
};
}
var config = {
initialState: Sortify(cfg.data),
transformFunction: JsonOT.validate,
userName: Crypto.rand64(8),
userName: cfg.crypto.rand64(8), // TODO stub this in case there is no crypto module provided?
channel: cfg.channel,
cryptKey: cfg.cryptKey,
crypto: Crypto,
cryptKey: cfg.cryptKey, // TODO make sure things work without this code
crypto: cfg.crypto, // stub if not provided
websocketURL: cfg.websocketURL,
logLevel: 0
};