NKDAV

Sources/NextcloudKit/NKCommon.swift

@@ -407,11 +407,6 @@ public struct NKCommon: Sendable {
         return 0
     }
 
-    public func returnPathfromServerUrl(_ serverUrl: String, urlBase: String, userId: String) -> String {
-        let home = urlBase + "/remote.php/dav/files/" + userId
-        return serverUrl.replacingOccurrences(of: home, with: "")
-    }
-
     public func getSessionErrorFromAFError(_ afError: AFError?) -> NSError? {
         if let afError = afError?.asAFError {
             switch afError {

Sources/NextcloudKit/NKDav.swift

@@ -0,0 +1,38 @@
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2026 Marino Faggiana
+// SPDX-License-Identifier: GPL-3.0-or-later
+
+/// Utility namespace for constructing Nextcloud WebDAV (DAV) endpoint paths.
+///
+/// The standard DAV structure in Nextcloud is:
+/// `<baseURL>/remote.php/dav/files/<userId>/`
+public enum NKDav {
+
+    // Base DAV endpoint used by Nextcloud
+    public static let basePath = "/remote.php/dav/"
+
+    // Files namespace within DAV
+    public static let filesPath = "files/"
+
+    /// Builds the user DAV path with trailing slash
+    /// Example: /remote.php/dav/files/<userId>/
+    public static func userPath(userId: String) -> String {
+        basePath + filesPath + userId + "/"
+    }
+
+    /// Builds the user DAV path without trailing slash
+    /// Example: /remote.php/dav/files/<userId>
+    public static func userPathNoSlash(userId: String) -> String {
+        basePath + filesPath + userId
+    }
+
+    /// Full DAV URL (with trailing slash)
+    public static func homeURLString(urlBase: String, userId: String) -> String {
+        urlBase + userPath(userId: userId)
+    }
+
+    /// Full DAV URL (without trailing slash)
+    public static func homeURLStringNoSlash(urlBase: String, userId: String) -> String {
+        urlBase + userPathNoSlash(userId: userId)
+    }
+}

Sources/NextcloudKit/NextcloudKit+Upload.swift

@@ -250,9 +250,10 @@ public extension NextcloudKit {
         // Build endpoints and headers
         let totalFileSize = self.nkCommonInstance.getFileSize(filePath: directory + "/" + fileName)
         let serverUrlChunkFolder = nkSession.urlBase + "/" + nkSession.dav + "/uploads/" + nkSession.userId + "/" + chunkFolder
-        let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId
-            + self.nkCommonInstance.returnPathfromServerUrl(serverUrl, urlBase: nkSession.urlBase, userId: nkSession.userId)
-            + "/" + (destinationFileName ?? fileName)
+        let serverUrlFileName = NKDav.homeURLString(urlBase: nkSession.urlBase, userId: nkSession.userId)
+            + serverUrl.replacingOccurrences(of: NKDav.homeURLStringNoSlash(urlBase: nkSession.urlBase, userId: nkSession.userId), with: "")
+            + "/"
+            + (destinationFileName ?? fileName)
 
         if options.customHeader == nil { options.customHeader = [:] }
         options.customHeader?["Destination"] = serverUrlFileName.urlEncoded