anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

make it work with ssl insight

Browse source
This commit is contained in:
Manuel Araoz 2014-08-25 18:26:26 -03:00
commit 342a69d737
4 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/controllers/settings.js
View file

@ -52,10 +52,9 @@ angular.module('copayApp.controllers').controller('SettingsController', function
$scope.save = function() {
var network = config.network;
network.key = $scope.networkKey;
network.host = $scope.networkHost;
network.port = $scope.networkPort;
network.secure = $scope.networkSecure;
network.host = $scope.insightHost;
network.port = $scope.insightPort;
network.schema = $scope.insightSecure ? 'https' : 'http';
localStorage.setItem('config', JSON.stringify({
networkName: $scope.networkName,

10
js/models/network/Async.js
View file

@ -28,6 +28,7 @@ function Network(opts) {
this.maxPeers = opts.maxPeers || 12;
this.host = opts.host || 'localhost';
this.port = opts.port || 3001;
this.schema = opts.schema || 'https';
this.cleanUp();
}
@ -293,7 +294,7 @@ Network.prototype.start = function(opts, openCallback) {
this.setCopayerId(opts.copayerId);
this.maxPeers = opts.maxPeers || this.maxPeers;
this.socket = this.createSocket(this.host, this.port);
this.socket = this.createSocket();
this._setupConnectionHandlers(openCallback);
this.socket.emit('subscribe', pubkey);
this.socket.emit('sync', opts.lastTimestamp);
@ -301,11 +302,12 @@ Network.prototype.start = function(opts, openCallback) {
};
Network.prototype.createSocket = function(host, port) {
var hostPort = host + ':' + port;
Network.prototype.createSocket = function() {
var hostPort = this.schema + '://' + this.host + ':' + this.port;
return io.connect(hostPort, {
reconnection: true,
'force new connection': true
'force new connection': true,
'secure': this.schema === 'https',
});
};