Refactor

Signed-off-by: Milen Pivchev <milen.pivchev@gmail.com>

Author: mpivchev

…tiveUI/NKDeclarativeUICapabilities.swift …/DeclarativeUI/NKClientIntegration.swiftSources/NextcloudKit/Models/DeclarativeUI/NKDeclarativeUICapabilities.swift renamed to Sources/NextcloudKit/Models/DeclarativeUI/NKClientIntegration.swift Sources/NextcloudKit/Models/DeclarativeUI/NKDeclarativeUICapabilities.swift renamed to Sources/NextcloudKit/Models/DeclarativeUI/NKClientIntegration.swift

@@ -1,46 +1,11 @@
-//
-//  File.swift
-//  NextcloudKit
-//
-//  Created by Milen Pivchev on 10.07.25.
-//
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2025 Milen Pivchev
+// SPDX-License-Identifier: GPL-3.0-or-later
 
 import Foundation
 import Alamofire
-//
-//public struct NKDeclarativeUI {
-//    public struct ContextMenu: Codable {
-//        let title: String
-//        let url: String
-//    }
-//}
-//
-//public struct DeclarativeUI: Codable {
-//    public let contextMenu: [ContextMenuItem]
-//
-//    enum CodingKeys: String, CodingKey {
-//        case contextMenu = "context-menu"
-//    }
-//}
-//
-//public struct ContextMenuItem: Codable {
-//    public let title: String
-//    public let endpoint: String
-//
-//    public init(from decoder: Decoder) throws {
-//        var container = try decoder.unkeyedContainer()
-//        title = try container.decode(String.self)
-//        endpoint = try container.decode(String.self)
-//    }
-//
-//    public func encode(to encoder: Encoder) throws {
-//        var container = encoder.unkeyedContainer()
-//        try container.encode(title)
-//        try container.encode(endpoint)
-//    }
-//}
 
-public struct NKDeclarativeUICapabilities: Codable {
+public struct NKClientIntegration: Codable {
     public let apps: [String: AppContext]
 
     public init(from decoder: Decoder) throws {
@@ -75,9 +40,11 @@ public struct NKDeclarativeUICapabilities: Codable {
  }
 
 public struct AppContext: Codable {
+    public let version: Double
     public let contextMenu: [ContextMenuAction]
 
     enum CodingKeys: String, CodingKey {
+        case version
         case contextMenu = "context-menu"
     }
 }
@@ -89,7 +56,6 @@ public struct ContextMenuAction: Codable {
     public let mimetypeFilters: String?
     public let params: [String: String]?
     public let icon: String?
-//    public let filter: String?
 
     enum CodingKeys: String, CodingKey {
         case name, url, method, icon, params

…larativeUI/NKDeclarativeUIResponse.swift …veUI/NKClientIntegrationUIResponse.swiftSources/NextcloudKit/Models/DeclarativeUI/NKDeclarativeUIResponse.swift renamed to Sources/NextcloudKit/Models/DeclarativeUI/NKClientIntegrationUIResponse.swift Sources/NextcloudKit/Models/DeclarativeUI/NKDeclarativeUIResponse.swift renamed to Sources/NextcloudKit/Models/DeclarativeUI/NKClientIntegrationUIResponse.swift

@@ -1,12 +1,8 @@
-//
-//  NKDeclarativeUIResponse.swift
-//  NextcloudKit
-//
-//  Created by Milen Pivchev on 24.09.25.
-//
+// SPDX-FileCopyrightText: Nextcloud GmbH
+// SPDX-FileCopyrightText: 2025 Milen Pivchev
+// SPDX-License-Identifier: GPL-3.0-or-later
 
-
-public struct NKDeclarativeUIResponse: Codable {
+public struct NKClientIntegrationUIResponse: Codable {
     let version: Double
     let root: RootContainer
 }

Sources/NextcloudKit/NextcloudKit+Capabilities.swift

@@ -132,7 +132,7 @@ public extension NextcloudKit {
                         let assistant: Assistant?
                         let recommendations: Recommendations?
                         let termsOfService: TermsOfService?
-                        let declarativeUI: NKDeclarativeUICapabilities?
+                        let clientIntegration: NKClientIntegration?
 
                         enum CodingKeys: String, CodingKey {
                             case downloadLimit = "downloadlimit"
@@ -146,7 +146,7 @@ public extension NextcloudKit {
                             case assistant
                             case recommendations
                             case termsOfService = "terms_of_service"
-                            case declarativeUI = "declarativeui"
+                            case clientIntegration = "client_integration"
                         }
 
                         struct DownloadLimit: Codable {
@@ -464,7 +464,7 @@ public extension NextcloudKit {
             capabilities.recommendations = json.recommendations?.enabled ?? false
             capabilities.termsOfService = json.termsOfService?.enabled ?? false
 
-            capabilities.declarativeUI = json.declarativeUI
+            capabilities.clientIntegration = json.clientIntegration
 
             // Persist capabilities in shared store
             await NKCapabilities.shared.setCapabilities(for: account, capabilities: capabilities)
@@ -562,7 +562,7 @@ final public class NKCapabilities: Sendable {
         public var termsOfService: Bool                             = false
 //        public var declarativeUIEnabled: Bool                       = false
 //        public var declarativeUIContextMenu: [ContextMenuItem]                       = []
-        public var declarativeUI: NKDeclarativeUICapabilities?                    = nil
+        public var clientIntegration: NKClientIntegration?                    = nil
         public var directEditingEditors: [NKEditorDetailsEditor]    = []
         public var directEditingCreators: [NKEditorDetailsCreator]  = []
         public var directEditingTemplates: [NKEditorTemplate]       = []

…loudKit/NextcloudKit+DeclarativeUI.swift …Kit/NextcloudKit+ClientIntegration.swiftSources/NextcloudKit/NextcloudKit+DeclarativeUI.swift renamed to Sources/NextcloudKit/NextcloudKit+ClientIntegration.swift Sources/NextcloudKit/NextcloudKit+DeclarativeUI.swift renamed to Sources/NextcloudKit/NextcloudKit+ClientIntegration.swift

@@ -27,7 +27,7 @@ public extension NextcloudKit {
                      params: [String: String]? = nil,
                      options: NKRequestOptions = NKRequestOptions(),
                      taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
-                     completion: @escaping (_ token: String?, _ uiResponse: NKDeclarativeUIResponse?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
+                     completion: @escaping (_ token: String?, _ uiResponse: NKClientIntegrationUIResponse?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
 
 //        guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
 //              let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
@@ -108,7 +108,7 @@ public extension NextcloudKit {
                           taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in }
     ) async -> (
         account: String,
-        uiResponse: NKDeclarativeUIResponse?,
+        uiResponse: NKClientIntegrationUIResponse?,
         error: NKError
     ) {
         guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
@@ -123,9 +123,9 @@ public extension NextcloudKit {
             var qp: [String: Any] = [:]
             for (key, value) in params {
                 switch key {
-                case NKDeclarativeUICapabilities.Params.fileId.rawValue:
+                case NKClientIntegration.Params.fileId.rawValue:
                     qp[key] = fileId
-                case NKDeclarativeUICapabilities.Params.filePath.rawValue:
+                case NKClientIntegration.Params.filePath.rawValue:
                     qp[key] = filePath
                 default:
                     qp[key] = value
@@ -160,7 +160,7 @@ public extension NextcloudKit {
         case .success(let data):
             do {
                 let decoder = JSONDecoder()
-                let ui = try decoder.decode(NKDeclarativeUIResponse.self, from: data)
+                let ui = try decoder.decode(NKClientIntegrationUIResponse.self, from: data)
                 return (account, ui, .success)
             } catch {
                 nkLog(debug: "Declarative UI response decoding failed: \(error)")