Update webdav, support auto auth detection

buttercup · Mar 18, 2024 · 015fa9c · 015fa9c
1 parent cc95904
commit 015fa9c
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 56 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -101,7 +101,7 @@
     "pify": "^6.1.0",
     "url-join": "^5.0.0",
     "uuid": "^9.0.1",
-    "webdav": "^5.3.1"
+    "webdav": "^5.5.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",

diff --git a/source/datasources/WebDAVDatasource.ts b/source/datasources/WebDAVDatasource.ts
@@ -1,4 +1,5 @@
-import { WebDAVClient } from "webdav";
+import { AuthType, WebDAVClient } from "webdav";
+import type { createClient as createWebDAVClient } from "webdav";
 import pathPosix from "path-posix";
 import { TextDatasource } from "./TextDatasource.js";
 import { fireInstantiationHandlers, registerDatasource } from "./register.js";
@@ -39,9 +40,12 @@ export default class WebDAVDatasource extends TextDatasource {
         };
         const { endpoint, password, path, username } = (this._config = datasourceConfig);
         this._path = path;
-        const createClient = getSharedAppEnv().getProperty("net/webdav/v1/newClient");
+        const createClient = getSharedAppEnv().getProperty(
+            "net/webdav/v1/newClient"
+        ) as typeof createWebDAVClient;
         if (typeof username === "string" && typeof password === "string") {
             this._client = createClient(endpoint, {
+                authType: AuthType.Auto,
                 username,
                 password,
                 maxBodyLength: MAX_DATA_SIZE,

diff --git a/source/facades/tools.ts b/source/facades/tools.ts
@@ -50,8 +50,8 @@ export function createFieldDescriptor(
         valueType: valueType
             ? valueType
             : entryPropertyType === "attribute"
-            ? null
-            : getEntryPropertyValueType(entry, entryPropertyName),
+              ? null
+              : getEntryPropertyValueType(entry, entryPropertyName),
         formatting,
         removeable
     };

diff --git a/source/io/VaultFormatA.ts b/source/io/VaultFormatA.ts
@@ -349,8 +349,8 @@ export class VaultFormatA extends VaultFormat {
                 const type = !item.originalValue
                     ? EntryChangeType.Created
                     : typeof item.newValue === "string"
-                    ? EntryChangeType.Modified
-                    : EntryChangeType.Deleted;
+                      ? EntryChangeType.Modified
+                      : EntryChangeType.Deleted;
                 const change: EntryChange = {
                     property: item.property,
                     type,