mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix port issue - options.host already has the port attached

This commit is contained in:
Thomas Müller 2015-11-17 13:37:13 +01:00 committed by Lukas Reschke
parent 240ae46265
commit ab1d786d87
3 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files_sharing/tests/js/publicAppSpec.js
View File

@ -21,13 +21,12 @@
describe('OCA.Sharing.PublicApp tests', function() {
var App = OCA.Sharing.PublicApp;
var hostStub, portStub, protocolStub, webrootStub;
var hostStub, protocolStub, webrootStub;
var $preview;
beforeEach(function() {
protocolStub = sinon.stub(OC, 'getProtocol').returns('https');
hostStub = sinon.stub(OC, 'getHost').returns('example.com');
portStub = sinon.stub(OC, 'getPort').returns(8080);
webrootStub = sinon.stub(OC, 'getRootPath').returns('/owncloud');
$preview = $('<div id="preview"></div>');
$('#testArea').append($preview);
@ -41,7 +40,6 @@ describe('OCA.Sharing.PublicApp tests', function() {
afterEach(function() {
protocolStub.restore();
hostStub.restore();
portStub.restore();
webrootStub.restore();
});
@ -91,7 +89,7 @@ describe('OCA.Sharing.PublicApp tests', function() {
it('Uses public webdav endpoint', function() {
expect(fakeServer.requests.length).toEqual(1);
expect(fakeServer.requests[0].method).toEqual('PROPFIND');
expect(fakeServer.requests[0].url).toEqual('https://sh4tok@example.com:8080/owncloud/public.php/webdav/subdir');
expect(fakeServer.requests[0].url).toEqual('https://sh4tok@example.com/owncloud/public.php/webdav/subdir');
});
describe('Download Url', function() {

19
core/js/files/client.js
View File

@ -31,22 +31,9 @@
this._root = this._root.substr(0, this._root.length - 1);
}
if (!options.port) {
// workaround in case port is null or empty
options.port = undefined;
}
var url = '';
var port = '';
var url = 'http://';
if (options.useHTTPS) {
url += 'https://';
if (options.port && options.port !== 443) {
port = ':' + options.port;
}
} else {
url += 'http://';
if (options.port && options.port !== 80) {
port = ':' + options.port;
}
url = 'https://';
}
var credentials = '';
if (options.userName) {
@ -59,7 +46,7 @@
url += credentials + '@';
}
url += options.host + port + this._root;
url += options.host + this._root;
this._defaultHeaders = options.defaultHeaders || {'X-Requested-With': 'XMLHttpRequest'};
this._baseUrl = url;
this._client = new dav.Client({

3
core/js/tests/specs/files/clientSpec.js
View File

@ -25,11 +25,10 @@ describe('OC.Files.Client tests', function() {
var client;
beforeEach(function() {
baseUrl = 'https://testhost:999/owncloud/remote.php/webdav/';
baseUrl = 'https://testhost/owncloud/remote.php/webdav/';
client = new Client({
host: 'testhost',
port: 999,
root: '/owncloud/remote.php/webdav',
useHTTPS: true
});