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

Load only one network to get history keeper ID from cryptget

Browse Source
This commit is contained in:
yflory
2019-12-04 11:13:05 +01:00
parent ba74fc8d4f
commit 187eb4afde
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
www/auth/main.js
View File

@@ -38,6 +38,16 @@ define([
var loadProxy = function (hash) { var loadProxy = function (hash) {
nThen(function (waitFor) { nThen(function (waitFor) {
var wsUrl = NetConfig.getWebsocketURL();
var w = waitFor();
Netflux.connect(wsUrl).then(function (_network) {
network = _network;
w();
}, function (err) {
rpcError = err;
console.error(err);
});
}).nThen(function (waitFor) {
Crypt.get(hash, waitFor(function (err, val) { Crypt.get(hash, waitFor(function (err, val) {
if (err) { if (err) {
waitFor.abort(); waitFor.abort();
@@ -50,19 +60,11 @@ define([
} catch (e) { } catch (e) {
console.log("Can't parse user drive", e); console.log("Can't parse user drive", e);
} }
})); }), {
}).nThen(function (waitFor) { network: network
var wsUrl = NetConfig.getWebsocketURL();
var w = waitFor();
Netflux.connect(wsUrl).then(function (_network) {
network = _network;
w();
}, function (err) {
rpcError = err;
console.error(err);
waitFor.abort();
}); });
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
if (!network) { return void waitFor.abort(); }
Pinpad.create(network, proxy, waitFor(function (e, call) { Pinpad.create(network, proxy, waitFor(function (e, call) {
if (e) { if (e) {
rpcError = e; rpcError = e;
@@ -97,9 +99,9 @@ define([
if (data.cmd === 'PING') { if (data.cmd === 'PING') {
ret.res = 'PONG'; ret.res = 'PONG';
} else if (data.cmd === 'LOGIN') { } else if (data.cmd === 'LOGIN') {
Login.loginOrRegister(data.data.name, data.data.password, false, false, function (err, res) { Login.loginOrRegister(data.data.name, data.data.password, false, false, function (err) {
if (err) { if (err) {
ret.error = 'LOGIN_ERROR' ret.error = 'LOGIN_ERROR';
srcWindow.postMessage(JSON.stringify(ret), domain); srcWindow.postMessage(JSON.stringify(ret), domain);
return; return;
} }
@@ -128,6 +130,8 @@ define([
if (rpcError) { if (rpcError) {
// Tell the user on accounts that there was an issue and they need to wait maximum 24h or contact an admin // Tell the user on accounts that there was an issue and they need to wait maximum 24h or contact an admin
ret.warning = true; ret.warning = true;
srcWindow.postMessage(JSON.stringify(ret), domain);
return;
} }
rpc.updatePinLimits(function (e, limit, plan, note) { rpc.updatePinLimits(function (e, limit, plan, note) {
if (e) { if (e) {