Skip to content

Commit b266408

Browse files
author
fzanaroli
committed
Bugfix on StreamDataEventSource when URL contains a port number
fix unit tests
1 parent 51080d0 commit b266408

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

src/StreamdataEventSource.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ function StreamdataEventSource(url, appToken, headers, authStrategy) {
118118
var endIndex = url.indexOf(parser.hostname);
119119
var userInfo = url.substring(parser.protocol.length + 2, endIndex);
120120

121-
var urlToEncode = parser.protocol + '//' + userInfo + parser.hostname + ((parser.port === "") ? '' : ':' + parser.port) + ((parser.pathname.indexOf('/') == 0) ? '' : '/') + parser.pathname + parser.search;
121+
//var urlToEncode = parser.protocol + '//' + userInfo + parser.hostname + ((parser.port === "") ? '' : ':' + parser.port) + ((parser.pathname.indexOf('/') == 0) ? '' : '/') + parser.pathname + parser.search;
122+
var urlToEncode = parser.protocol + '//' + userInfo + parser.hostname + ((parser.port != '0' && parser.port != '' && parser.port != '80' && parser.port != '443' ) ? ':' + parser.port : '') + ((parser.pathname.indexOf('/') == 0) ? '' : '/') + parser.pathname + parser.search;
123+
122124
var signedUrl = authStrategy === null ? urlToEncode : authStrategy['signUrl'](urlToEncode);
123125

124126
var streamDataQueryParams = self._buildStreamDataQueryParams(headers);

test/spec/streamdataEventSourceSpec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ describe('StreamdataEventSource.', function () {
6161
it('should decorate a url with port', function () {
6262
//GIVEN
6363
var e = new StreamdataEventSource("http://www.toto.com:3009/api?q=knicks&start=1&length=10&l=en&src=news&f=json&key=gbnEDrs@SAjQd6OVhqY_", "someRandomExtraLongDummyToken");
64-
var expectedConvertedUrl = "https://streamdata.motwin.net/http://www.toto.com/api?q=knicks&start=1&length=10&l=en&src=news&f=json&key=gbnEDrs@SAjQd6OVhqY_&X-Sd-Token=someRandomExtraLongDummyToken";
64+
var expectedConvertedUrl = "https://streamdata.motwin.net/http://www.toto.com:3009/api?q=knicks&start=1&length=10&l=en&src=news&f=json&key=gbnEDrs@SAjQd6OVhqY_&X-Sd-Token=someRandomExtraLongDummyToken";
6565

6666
var convertedUrl = e._decorate(e._url);
6767

0 commit comments

Comments
 (0)