From 714bff1ec2bc4a4d25a25bee18e446ecfbff8bf6 Mon Sep 17 00:00:00 2001 From: Maxime LUCE Date: Wed, 18 Sep 2013 03:33:13 +0200 Subject: [PATCH 1/6] Fix Windows 8 HTMLAnchorElement return host:80 which force Basic Auth Header to replace options Auth Header --- www/windows8/FileTransferProxy.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js index dd8ff62..cbfcfd7 100644 --- a/www/windows8/FileTransferProxy.js +++ b/www/windows8/FileTransferProxy.js @@ -73,6 +73,7 @@ module.exports = { download:function(win, error, options) { var source = options[0]; var target = options[1]; + var headers = options[4] || {}; if (target === null || typeof target === undefined) { @@ -96,6 +97,13 @@ module.exports = { storageFolder.createFileAsync(fileName, Windows.Storage.CreationCollisionOption.generateUniqueName).then(function (storageFile) { var uri = Windows.Foundation.Uri(source); var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader(); + + if (headers) { + for (var header in headers) { + downloader.setRequestHeader(header, headers[header]); + } + } + download = downloader.createDownload(uri, storageFile); download.startAsync().then(function () { win(new FileEntry(storageFile.name, storageFile.path)); From e80d0788a61d6150487416369ba5aa1bd4a44e7e Mon Sep 17 00:00:00 2001 From: Maxime LUCE Date: Wed, 18 Sep 2013 03:33:58 +0200 Subject: [PATCH 2/6] Fix missing headers in Windows 8 Proxy --- www/FileTransfer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/FileTransfer.js b/www/FileTransfer.js index 6eb9d74..57c9821 100644 --- a/www/FileTransfer.js +++ b/www/FileTransfer.js @@ -42,7 +42,7 @@ function getBasicAuthHeader(urlString) { var credentials = null; var protocol = url.protocol + "//"; - var origin = protocol + url.host; + var origin = protocol + url.host.replace(":" + url.port, ""); // Windows 8 (IE10) append :80 or :443 to url.host // check whether there are the username:password credentials in the url if (url.href.indexOf(origin) !== 0) { // credentials found From 02afbec042f76fab8e6fc23825a913d69aa2b23c Mon Sep 17 00:00:00 2001 From: Maxime LUCE Date: Wed, 18 Sep 2013 03:43:14 +0200 Subject: [PATCH 3/6] Fix missing headers in Windows 8 upload proxy --- www/windows8/FileTransferProxy.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js index cbfcfd7..036b948 100644 --- a/www/windows8/FileTransferProxy.js +++ b/www/windows8/FileTransferProxy.js @@ -29,6 +29,7 @@ module.exports = { upload:function(successCallback, error, options) { var filePath = options[0]; var server = options[1]; + var headers = options[8] || {}; var win = function (fileUploadResult) { @@ -49,7 +50,7 @@ module.exports = { var blob = MSApp.createBlobFromRandomAccessStream(storageFile.contentType, stream); var formData = new FormData(); formData.append("source\";filename=\"" + storageFile.name + "\"", blob); - WinJS.xhr({ type: "POST", url: server, data: formData }).then(function (response) { + WinJS.xhr({ type: "POST", url: server, data: formData, headers: headers }).then(function (response) { var code = response.status; storageFile.getBasicPropertiesAsync().done(function (basicProperties) { From cf9b9fece6a20325614ecf8a8da0c8dd9a356d90 Mon Sep 17 00:00:00 2001 From: Steven Gill Date: Wed, 25 Sep 2013 18:34:13 -0700 Subject: [PATCH 4/6] [CB-4915] Incremented plugin version on dev branch. --- plugin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.xml b/plugin.xml index 6b40bd0..659fb89 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="0.3.3-dev"> File Transfer Cordova File Transfer Plugin Apache 2.0 From 318f5433739b73fe33f79ba5281e443e98c96bb3 Mon Sep 17 00:00:00 2001 From: purplecabbage Date: Mon, 30 Sep 2013 14:19:42 -0700 Subject: [PATCH 5/6] removed un-needed undef check --- www/windows8/FileTransferProxy.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/www/windows8/FileTransferProxy.js b/www/windows8/FileTransferProxy.js index 4ca88fc..6f5c0f9 100644 --- a/www/windows8/FileTransferProxy.js +++ b/www/windows8/FileTransferProxy.js @@ -99,12 +99,11 @@ module.exports = { var uri = Windows.Foundation.Uri(source); var downloader = new Windows.Networking.BackgroundTransfer.BackgroundDownloader(); - if (headers) { - for (var header in headers) { - downloader.setRequestHeader(header, headers[header]); - } + for (var header in headers) { + downloader.setRequestHeader(header, headers[header]); } + download = downloader.createDownload(uri, storageFile); download.startAsync().then(function () { win(new FileEntry(storageFile.name, storageFile.path)); From 9d2246e85c7f4b002218e6d231c0d452a9650cf7 Mon Sep 17 00:00:00 2001 From: Steven Gill Date: Wed, 9 Oct 2013 15:22:38 -0700 Subject: [PATCH 6/6] [CB-5010] Updated version and RELEASENOTES.md for release 0.3.3 --- RELEASENOTES.md | 7 +++++++ plugin.xml | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 8e3e721..f51b327 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -26,3 +26,10 @@ * CB-4889 updating core references * CB-4889 renaming org.apache.cordova.core.file-transfer to org.apache.cordova.file-transfer and updating dependency * Rename CHANGELOG.md -> RELEASENOTES.md + +### 0.3.3 (Oct 9, 2013) +* removed un-needed undef check +* Fix missing headers in Windows 8 upload proxy +* Fix missing headers in Windows 8 Proxy +* Fix Windows 8 HTMLAnchorElement return host:80 which force Basic Auth Header to replace options Auth Header +* [CB-4915] Incremented plugin version on dev branch. diff --git a/plugin.xml b/plugin.xml index 659fb89..deb8dae 100644 --- a/plugin.xml +++ b/plugin.xml @@ -2,7 +2,7 @@ + version="0.3.3"> File Transfer Cordova File Transfer Plugin Apache 2.0