From 92904f00ebf62b8ba146fb7874a9309a8e2a32a7 Mon Sep 17 00:00:00 2001
From: jkoschke <jkoschke.dev@gmail.com>
Date: Mon, 22 Feb 2021 23:11:11 +0100
Subject: [PATCH] switched to buffer input for uploading

---
 nextcloud.html | 15 +++++++--------
 nextcloud.js   | 28 +++++++++++++++++-----------
 package.json   |  3 ++-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/nextcloud.html b/nextcloud.html
index 4a932b6..68d1e3a 100644
--- a/nextcloud.html
+++ b/nextcloud.html
@@ -34,7 +34,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="nextcloud-webdav-list">
-	<p>Connects to a Nextcloud server and lists directory content of a given path)</p>
+	<p>Connects to a Nextcloud/WebDav server and lists directory content of a given path)</p>
 
 	<h3>Inputs</h3>
     <dl class="message-properties">
@@ -106,7 +106,7 @@
 </script>
 
 <script type="text/x-red" data-help-name="nextcloud-webdav-out">
-	<p>Connects to a Nextcloud server and downloads a file and sends it to the output</p>
+	<p>Connects to a Nextcloud/WebDav server and downloads a file and sends it to the output</p>
 
 	<h3>Inputs</h3>
     <dl class="message-properties">
@@ -173,18 +173,17 @@
 </script>
 
 <script type="text/x-red" data-help-name="nextcloud-webdav-in">
-	<p>Connects to a Nextcloud server and uploads a file to a given directory</p>
+	<p>Connects to a Nextcloud/WebDav server and uploads a file to a given directory</p>
 
 	<h3>Inputs</h3>
     <dl class="message-properties">
         <dt>payload
-            <span class="property-type">any</span>
+            <span class="property-type">Binary buffer</span>
         </dt>
-        <dd> Incoming message triggers receiving a list containing a directory content. Any payload
-        is possible. </dd>
+        <dd> The payload should contain the file which should be uploaded in a binary buffer </dd>
         <dt class="optional">filename <span class="property-type">string</span></dt>
-        <dd> The filename should be an absolute path, otherwise it will be relative to the working
-        directory of the Node-RED process.</dd>
+        <dd> A filename can be specified on incoming message or in nodes properties. 
+            Saves the uploaded file with the given name. The property should also include the file extension.</dd>
         <dt class="optional">directory <span class="property-type">string</span></dt>
         <dd> A directory can be specified on incoming message or in nodes properties. Uploads the
         file to the users root directory if not set.</dd>
diff --git a/nextcloud.js b/nextcloud.js
index 7fa5510..83eb41b 100644
--- a/nextcloud.js
+++ b/nextcloud.js
@@ -2,13 +2,14 @@ module.exports = function (RED) {
   const dav = require('dav')
   const webdav = require('webdav')
   const fs = require('fs')
-  const IcalExpander = require('ical-expander')
-  const moment = require('moment')
   const https = require('https')
+  const rootCas = require('ssl-root-cas').create();
+
+  process.env['NODE_TLS_REJECT_UNAUTHORIZED'] = '0';
 
 
 
-  function NextcloudWebDavList (config) {
+  function NextcloudWebDavList(config) {
     RED.nodes.createNode(this, config)
     this.server = RED.nodes.getNode(config.server)
     this.directory = config.directory
@@ -40,7 +41,7 @@ module.exports = function (RED) {
   }
   RED.nodes.registerType('nextcloud-webdav-list', NextcloudWebDavList)
 
-  function NextcloudWebDavOut (config) {
+  function NextcloudWebDavOut(config) {
     RED.nodes.createNode(this, config)
     this.server = RED.nodes.getNode(config.server)
     this.filename = config.filename
@@ -75,7 +76,7 @@ module.exports = function (RED) {
   }
   RED.nodes.registerType('nextcloud-webdav-out', NextcloudWebDavOut)
 
-  function NextcloudWebDavIn (config) {
+  function NextcloudWebDavIn(config) {
     RED.nodes.createNode(this, config)
     this.server = RED.nodes.getNode(config.server)
     this.directory = config.directory
@@ -83,14 +84,16 @@ module.exports = function (RED) {
     const node = this
 
     node.on('input', (msg) => {
+
       // Read upload file
       let filename = node.filename
       if (msg.filename) {
-        filename = msg.filename
+        filename = msg.filename;
       }
       const name = filename.substr((filename.lastIndexOf('/') + 1), filename.length)
-      const file = fs.readFileSync(filename)
+      const file = msg.payload;
       // Set upload directory
+
       let directory = '/'
       if (msg.directory) {
         directory += msg.directory + '/'
@@ -99,20 +102,23 @@ module.exports = function (RED) {
       }
       directory = directory.replace('//', '/')
 
-      const webDavUri = node.server.address + '/remote.php/webdav/'
-      const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
-
       // check option for self signed certs
       const option = {}
       if (node.server.insecure) {
         option.agent = new https.Agent({ rejectUnauthorized: false })
       }
 
+      const webDavUri = node.server.address + '/remote.php/webdav/'
+      const client = webdav(webDavUri, node.server.credentials.user, node.server.credentials.pass)
+
+
+
       client.putFileContents(directory + name, file, { format: 'binary' }, option)
         .then(function (contents) {
           console.log(contents)
           node.send({ 'payload': JSON.parse(contents) })
-        }, function () {
+        }, function (e) {
+          console.error(e);
           node.error('Nextcloud:WebDAV -> send file went wrong.')
         })
     })
diff --git a/package.json b/package.json
index c96ad59..f3d2956 100644
--- a/package.json
+++ b/package.json
@@ -23,6 +23,7 @@
     "dav": "^1.8.0",
     "ical-expander": "^2.0.0",
     "moment": "^2.24.0",
+    "ssl-root-cas": "^1.3.1",
     "webdav": "^1.6.1"
   },
   "devDependencies": {
@@ -49,4 +50,4 @@
     "type": "git",
     "url": "https://github.com/kuehnelbs/node-red-contrib-nextcloud"
   }
-}
\ No newline at end of file
+}