Skip to content

InternalType #172

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marinofaggiana merged 6 commits into from
Jul 25, 2025
Merged

InternalType #172

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
345e8ce
fix put ( application/octet-stream )
marinofaggiana Jul 24, 2025
0d4be15
remove old options
marinofaggiana Jul 24, 2025
fb55cd7
Merge branch 'main' into getInternalType
marinofaggiana Jul 24, 2025
4c4da38
fix
marinofaggiana Jul 24, 2025
3f07a39
Merge branch 'getInternalType' of https://github.com/nextcloud/Nextcl…
marinofaggiana Jul 24, 2025
a88e0bb
remove old code
marinofaggiana Jul 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 5 additions & 13 deletions Sources/NextcloudKit/NKCommon.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,9 @@ public struct NKCommon: Sendable {
return "\(identifier).\(account)"
}

public func getStandardHeaders(account: String, options: NKRequestOptions? = nil) -> HTTPHeaders? {
public func getStandardHeaders(account: String,
options: NKRequestOptions? = nil,
contentType: String = "application/x-www-form-urlencoded") -> HTTPHeaders? {
guard let session = nksessions.session(forAccount: account) else {
return nil
}
Expand All @@ -294,14 +296,7 @@ public struct NKCommon: Sendable {
if let customUserAgent = options?.customUserAgent {
headers.update(.userAgent(customUserAgent))
}
if let contentType = options?.contentType {
headers.update(.contentType(contentType))
} else {
headers.update(.contentType("application/x-www-form-urlencoded"))
}
if options?.contentType != "application/xml" {
headers.update(name: "Accept", value: "application/json")
}
headers.update(.contentType(contentType))
headers.update(name: "OCS-APIRequest", value: "true")
for (key, value) in options?.customHeader ?? [:] {
headers.update(name: key, value: value)
Expand All @@ -328,10 +323,7 @@ public struct NKCommon: Sendable {
return headers
}

public func createStandardUrl(serverUrl: String, endpoint: String, options: NKRequestOptions) -> URLConvertible? {
if let endpoint = options.endpoint {
return URL(string: endpoint)
}
public func createStandardUrl(serverUrl: String, endpoint: String) -> URLConvertible? {
guard var serverUrl = serverUrl.urlEncoded else { return nil }

if serverUrl.last != "/" { serverUrl = serverUrl + "/" }
Expand Down
66 changes: 29 additions & 37 deletions Sources/NextcloudKit/NextcloudKit+API.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, .urlError) }
}
Expand Down Expand Up @@ -169,7 +169,7 @@ public extension NextcloudKit {
var externalSites: [NKExternalSite] = []
let endpoint = "ocs/v2.php/apps/external/api/v1"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, externalSites, nil, .urlError) }
}
Expand Down Expand Up @@ -261,7 +261,7 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ responseData: AFDataResponse<Data>?, ServerInfoResult) -> Void) {
let endpoint = "status.php"
guard let url = nkCommonInstance.createStandardUrl(serverUrl: serverUrl, endpoint: endpoint, options: options) else {
guard let url = nkCommonInstance.createStandardUrl(serverUrl: serverUrl, endpoint: endpoint) else {
return options.queue.async { completion(nil, ServerInfoResult.failure(.urlError)) }
}
var headers: HTTPHeaders?
Expand Down Expand Up @@ -438,7 +438,7 @@ public extension NextcloudKit {
//
let endpoint = "index.php/core/preview?fileId=\(fileId)&x=\(width)&y=\(height)&a=\(crop)&mode=\(cropMode)&forceIcon=\(forceIcon)&mimeFallback=\(mimeFallback)&etag=\(etag)"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, width, height, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -550,7 +550,7 @@ public extension NextcloudKit {
let endpoint = "index.php/apps/files_trashbin/preview?fileId=\(fileId)&x=\(width)&y=\(height)&a=\(crop)&mode=\(cropMode)&forceIcon=\(forceIcon)&mimeFallback=\(mimeFallback)"

guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, width, height, nil, .urlError) }
}
Expand Down Expand Up @@ -644,7 +644,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ imageAvatar: UIImage?, _ imageOriginal: UIImage?, _ etag: String?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "index.php/avatar/\(user)/\(sizeImage)"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -861,12 +861,10 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ userProfile: NKUserProfile?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "ocs/v2.php/cloud/users/\(userId)"
///
options.contentType = "application/json"
///

guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/json") else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}

Expand Down Expand Up @@ -934,12 +932,9 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ userProfile: NKUserProfile?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "ocs/v2.php/cloud/user"
///
options.contentType = "application/json"
///
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/json") else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}

Expand Down Expand Up @@ -1055,15 +1050,15 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ wipe: Bool, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "index.php/core/wipe/check"
let parameters: [String: Any] = ["token": token]
///
options.contentType = "application/json"
///
guard let url = nkCommonInstance.createStandardUrl(serverUrl: serverUrl, endpoint: endpoint, options: options) else {

guard let url = nkCommonInstance.createStandardUrl(serverUrl: serverUrl, endpoint: endpoint) else {
return options.queue.async { completion(account, false, nil, .urlError) }
}
var headers: HTTPHeaders?
var headers: HTTPHeaders = [
"Content-Type": "application/json",
]
if let userAgent = options.customUserAgent {
headers = [HTTPHeader.userAgent(userAgent)]
headers.add(.userAgent(userAgent))
}

unauthorizedSession.request(url, method: .post, parameters: parameters, encoding: URLEncoding.default, headers: headers).validate(statusCode: 200..<300).onURLSessionTaskCreation { task in
Expand Down Expand Up @@ -1134,15 +1129,14 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "index.php/core/wipe/success"
let parameters: [String: Any] = ["token": token]
///
options.contentType = "application/json"
///
guard let url = nkCommonInstance.createStandardUrl(serverUrl: serverUrl, endpoint: endpoint, options: options) else {
guard let url = nkCommonInstance.createStandardUrl(serverUrl: serverUrl, endpoint: endpoint) else {
return options.queue.async { completion(account, nil, .urlError) }
}
var headers: HTTPHeaders?
var headers: HTTPHeaders = [
"Content-Type": "application/json",
]
if let userAgent = options.customUserAgent {
headers = [HTTPHeader.userAgent(userAgent)]
headers.add(.userAgent(userAgent))
}

unauthorizedSession.request(url, method: .post, parameters: parameters, encoding: URLEncoding.default, headers: headers).validate(statusCode: 200..<300).onURLSessionTaskCreation { task in
Expand Down Expand Up @@ -1238,7 +1232,7 @@ public extension NextcloudKit {
}

guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, activities, activityFirstKnown, activityLastGiven, nil, .urlError) }
}
Expand Down Expand Up @@ -1366,7 +1360,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ notifications: [NKNotifications]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "ocs/v2.php/apps/notifications/api/v2/notifications"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -1481,7 +1475,7 @@ public extension NextcloudKit {
var url: URLConvertible?
if serverUrl == nil {
let endpoint = "ocs/v2.php/apps/notifications/api/v2/notifications/\(idNotification)"
url = self.nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options)
url = self.nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint)
} else {
url = serverUrl?.asUrl
}
Expand Down Expand Up @@ -1562,7 +1556,7 @@ public extension NextcloudKit {
"format": "json"
]
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -1633,12 +1627,10 @@ public extension NextcloudKit {
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "ocs/v2.php/apps/security_guard/diagnostics"
///
options.contentType = "application/json"
///

guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/json") else {
return options.queue.async { completion(account, nil, .urlError) }
}
var urlRequest: URLRequest
Expand Down
10 changes: 5 additions & 5 deletions Sources/NextcloudKit/NextcloudKit+Assistant.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ types: [NKTextProcessingTaskType]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "ocs/v2.php/textprocessing/tasktypes"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -99,7 +99,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ task: NKTextProcessingTask?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "/ocs/v2.php/textprocessing/schedule"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -184,7 +184,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ task: NKTextProcessingTask?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "/ocs/v2.php/textprocessing/task/\(taskId)"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -259,7 +259,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ task: NKTextProcessingTask?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "/ocs/v2.php/textprocessing/task/\(taskId)"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down Expand Up @@ -334,7 +334,7 @@ public extension NextcloudKit {
completion: @escaping (_ account: String, _ task: [NKTextProcessingTask]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
let endpoint = "/ocs/v2.php/textprocessing/tasks/app/\(appId)"
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint, options: options),
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
return options.queue.async { completion(account, nil, nil, .urlError) }
}
Expand Down
Loading
Loading