grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cater for home.parity hostname in dappsUrl (#3341)

Browse Source 
* Cater for home.parity hostname

* Cater for 0.0.0.0 & default dappsInterface

* Extra check
This commit is contained in:
Jaco Greeff 2016-11-10 20:45:03 +01:00 committed by Gav Wood
parent 0456d4e5d0
commit 0b176e7013
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/src/secureApi.js
View File

@ -26,6 +26,7 @@ export default class SecureApi extends Api {
this._connectState = sysuiToken === 'initial' ? 1 : 0; this._connectState = sysuiToken === 'initial' ? 1 : 0;
this._needsToken = false; this._needsToken = false;
this._dappsPort = 8080; this._dappsPort = 8080;
this._dappsInterface = null;
this._signerPort = 8180; this._signerPort = 8180;
console.log('SecureApi:constructor', sysuiToken); console.log('SecureApi:constructor', sysuiToken);
@ -100,10 +101,12 @@ export default class SecureApi extends Api {
Promise Promise
.all([ .all([
this.parity.dappsPort(), this.parity.dappsPort(),
this.parity.dappsInterface(),
this.parity.signerPort() this.parity.signerPort()
]) ])
.then(([dappsPort, signerPort]) => { .then(([dappsPort, dappsInterface, signerPort]) => {
this._dappsPort = dappsPort.toNumber(); this._dappsPort = dappsPort.toNumber();
this._dappsInterface = dappsInterface;
this._signerPort = signerPort.toNumber(); this._signerPort = signerPort.toNumber();
}); });
@ -122,7 +125,17 @@ export default class SecureApi extends Api {
} }
get dappsUrl () { get dappsUrl () {
return `http://${window.location.hostname}:${this._dappsPort}`; let hostname;
if (window.location.hostname === 'home.parity') {
hostname = 'dapps.parity';
} else if (!this._dappsInterface || this._dappsInterface === '0.0.0.0') {
hostname = window.location.hostname;
} else {
hostname = this._dappsInterface;
}
return `http://${hostname}:${this._dappsPort}`;
} }
get signerPort () { get signerPort () {