BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #183 from matiu/bug/signout 

Bug/signout
This commit is contained in:
Mario Colque 2014-04-24 17:57:18 -03:00
parent 9acff3db3f 5fc4ab5101
commit bea2d6cf78
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config.template.js
View File

@ -3,14 +3,19 @@
var config = { var config = {
networkName: 'testnet', networkName: 'testnet',
network: { network: {
key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server // key: 'lwjd5qra8257b9', //Copay API key for public PeerJS server
// This is for running local peerJs with params: ./peerjs -p 10009 -k 'sdfjhwefh' // This is for running local peerJs with params: ./peerjs -p 10009 -k 'sdfjhwefh'
//key: 'sdfjhwefh', //key: 'sdfjhwefh',
//host: 'localhost', //host: 'localhost',
//port: 10009, //port: 10009,
//path: '/', //path: '/',
maxPeers: 3, //
debug: 3, key: 'g23ihfh82h35rf',
host:'162.242.219.26',
port:10009,
path: '/',
maxPeers: 15,
debug: 3
}, },
limits: { limits: {
totalCopayers: 10, totalCopayers: 10,

10
js/models/network/WebRTC.js
View File

@ -258,8 +258,8 @@ Network.prototype._setupPeerHandlers = function(openCallback) {
self._checkAnyPeer(); self._checkAnyPeer();
}); });
p.on('connection', function(dataConn) {
p.on('connection', function(dataConn) {
console.log('### NEW INBOUND CONNECTION %d/%d', self.connectedPeers.length, self.maxPeers); console.log('### NEW INBOUND CONNECTION %d/%d', self.connectedPeers.length, self.maxPeers);
if (self.connectedPeers.length >= self.maxPeers) { if (self.connectedPeers.length >= self.maxPeers) {
console.log('### PEER REJECTED. PEER MAX LIMIT REACHED'); console.log('### PEER REJECTED. PEER MAX LIMIT REACHED');
@ -403,6 +403,7 @@ Network.prototype.connectTo = function(copayerId) {
}; };
Network.prototype._cleanUp = function() { Network.prototype._cleanUp = function() {
var self = this;
self.connectedPeers = []; self.connectedPeers = [];
self.started = false; self.started = false;
self.peerId = null; self.peerId = null;
@ -421,9 +422,10 @@ Network.prototype._cleanUp = function() {
Network.prototype.disconnect = function(cb, forced) { Network.prototype.disconnect = function(cb, forced) {
var self = this; var self = this;
self.closing = 1; self.closing = 1;
this.send(null, { type: 'disconnect' }); self.send(null, { type: 'disconnect' }, function(){
this._cleanUp(); self._cleanUp();
if (typeof cb === 'function') cb(); if (typeof cb === 'function') cb();
});
}; };
module.exports = require('soop')(Network); module.exports = require('soop')(Network);

2
js/services/controllerUtils.js
View File

@ -4,6 +4,8 @@ angular.module('copay.controllerUtils').factory('controllerUtils', function ($ro
var root = {}; var root = {};
root.logout = function() { root.logout = function() {
console.log('### DELETING WALLET'); //TODO
$rootScope.wallet = null;
delete $rootScope['wallet']; delete $rootScope['wallet'];
$rootScope.totalBalance = 0; $rootScope.totalBalance = 0;
$location.path('signin'); $location.path('signin');