Added a new function and change some es6 features to es5 #86

yoeven · 2018-03-21T14:39:34Z

1. I've added getFileUploadLink which works like getFileDownloadLink. Similarly, it also allows users to use the request module to process the upload from their end.

A simple example:
var link = client.getFileUploadLink(RemoteDirToUploadTo + "/" + filename);

A simple example with the request and process-request modules:

    var data = fs.createReadStream(LocalDirFile);
    var options = {
        url: link,
        body: data,
    };

    var r =  request.put(options);

    progress(r, {})
        .on('error', function (err) {
            progressUpdateFunction("Error");
        })
        .on('end', function () {
            progressUpdateFunction("Done");
        });

    var amountdone= 0;
    data.on('data', function (data) {
        amountdone+= data.length;
        progressUpdateFunction((amountdone/ filesize) * 100);
    })

2. I've changed few es6 features to es5 features as react building process takes any node modules with es6 syntax as an error and breaks the build.

Update

- getFileUploadLink function - changed es6 syntax to es5 for electron-builder support

perry-mitchell

Addition looks good, but could you please revert the ES5 changes? They're not required.

perry-mitchell · 2018-03-23T18:11:43Z

source/auth.js

@@ -4,10 +4,10 @@ function generateBasicAuthHeader(username, password) {
    return "Basic " + Buffer.from(username + ":" + password).toString("base64");
 }
 function generateTokenAuthHeader(tokenInfo) {
-    return `${tokenInfo.token_type} ${tokenInfo.access_token}`;
+    return tokenInfo.token_type + " " + tokenInfo.access_token;


No need for this - Babel is used before publishing, so this will be transpiled. The tests pass for node 4, which is my earliest support version:

Anything outside of this is not currently in scope.

perry-mitchell · 2018-03-23T18:12:03Z

source/auth.js

-    generateBasicAuthHeader,
-    generateTokenAuthHeader
+    generateBasicAuthHeader: generateBasicAuthHeader,
+    generateTokenAuthHeader: generateTokenAuthHeader


This can be reverted due to it not being required.

perry-mitchell · 2018-03-23T18:12:13Z

source/factory.js

@@ -226,5 +239,5 @@ function createClient(remoteURL, username, password) {
 }

 module.exports = {
-    createClient
+    createClient: createClient


Same here..

perry-mitchell · 2018-03-23T18:12:20Z

source/interface/createStream.js

-    createReadStream,
-    createWriteStream
+    createReadStream: createReadStream,
+    createWriteStream: createWriteStream


Same here..

perry-mitchell · 2018-03-23T18:12:27Z

source/interface/directoryContents.js

@@ -70,5 +70,5 @@ function getDirectoryFiles(result, serverBasePath, requestPath) {
 }

 module.exports = {
-    getDirectoryContents
+    getDirectoryContents: getDirectoryContents


perry-mitchell · 2018-03-23T18:12:38Z

source/interface/getFile.js

@@ -36,7 +36,7 @@ function getFileLink(filePath, options) {
        }
        const authPart = options.headers.Authorization.replace(/^Basic /i, "").trim();
        const authContents = Buffer.from(authPart, "base64").toString("utf8");
-        fetchURL = fetchURL.replace(/^https?:\/\//, `${protocol}://${authContents}@`);
+        fetchURL = fetchURL.replace(/^https?:\/\//, protocol + "://" + authContents + "@");


And here 😊

perry-mitchell · 2018-03-23T18:13:06Z

source/interface/putFile.js

+            throw new Error("Failed retrieving download link: Invalid authorisation method");
+        }
+        var authPart = options.headers.Authorization.replace(/^Basic /i, "").trim();
+        var authContents = Buffer.from(authPart, "base64").toString("utf8");


Please use const/let (stylistic choice, to match rest of repo).

perry-mitchell · 2018-03-23T18:13:31Z

source/interface/putFile.js

 module.exports = {
-    putFileContents: putFileContents
+    putFileContents: putFileContents,
+    getFileUploadLink: getFileUploadLink


Same here..

@yoeven These can still be changed..

perry-mitchell · 2018-03-23T18:13:37Z

source/merge.js

@@ -5,5 +5,5 @@ function merge(...args) {
 }

 module.exports = {
-    merge
+    merge: merge


yoeven · 2018-03-24T12:33:41Z

Hi, @perry-mitchell I've reverted the es5 changes as stated. I seem to get a minifying file error from building a react project if I use the es6 features for this module. Based on few threads that I read online, it seems like es6 is an issue even though the oldest nodejs supports it (thread links here & here).

perry-mitchell · 2018-03-24T15:38:12Z

source/interface/putFile.js

 module.exports = {
-    putFileContents: putFileContents
+    putFileContents: putFileContents,
+    getFileUploadLink: getFileUploadLink


@yoeven These can still be changed..

perry-mitchell · 2018-03-24T15:43:04Z

That sounds strange @yoeven - What version of node are you running? You can see here that webdav uses the built version of this library when required by other libraries. The code that is seen externally should be Node v4 compatible, so it shouldn't cause any issues. At this stage I would suggest that it's a configuration issue in your react app and not something to do with this library.

If you disagree or find an issue, definitely feel free to open a separate issue so we can debug it.

yoeven · 2018-03-24T16:22:31Z

I'm using version 9.8.0 and Yeah, it could possibly be something with the configuration, I'll do a bit more research and if anything I'll post an issue. For now, we can stick with just the new function for this PR. Thanks @perry-mitchell

perry-mitchell · 2018-03-24T18:06:32Z

Thanks! And thanks for the submission. I’ll merge soon.

perry-mitchell · 2018-03-24T21:45:01Z

Just to remind: I'll merge after the latest changes are made. Thanks!

yoeven added 5 commits March 21, 2018 17:10

Merge pull request #2 from perry-mitchell/master

9a24e05

Update

New function & es5 friendly

35cbf36

- getFileUploadLink function - changed es6 syntax to es5 for electron-builder support

Fixed

e2db503

build

120ce46

fixed getFile.js

1f9ae6d

perry-mitchell requested changes Mar 23, 2018

View reviewed changes

Reverted Back to es6 features

f24e6e7

perry-mitchell requested changes Mar 24, 2018

View reviewed changes

Change exports back to single tokens

9756e36

perry-mitchell approved these changes Mar 25, 2018

View reviewed changes

perry-mitchell merged commit 589ca32 into perry-mitchell:master Mar 27, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added a new function and change some es6 features to es5 #86

Added a new function and change some es6 features to es5 #86

yoeven commented Mar 21, 2018

perry-mitchell left a comment

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 23, 2018

perry-mitchell Mar 24, 2018

perry-mitchell Mar 23, 2018

yoeven commented Mar 24, 2018

perry-mitchell Mar 24, 2018

perry-mitchell commented Mar 24, 2018

yoeven commented Mar 24, 2018

perry-mitchell commented Mar 24, 2018 via email

perry-mitchell commented Mar 24, 2018

Added a new function and change some es6 features to es5 #86

Added a new function and change some es6 features to es5 #86

Conversation

yoeven commented Mar 21, 2018

perry-mitchell left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

yoeven commented Mar 24, 2018

Choose a reason for hiding this comment

perry-mitchell commented Mar 24, 2018

yoeven commented Mar 24, 2018

perry-mitchell commented Mar 24, 2018 via email

perry-mitchell commented Mar 24, 2018