Skip to content

Commit ec9e849

Browse files
marinofaggianamarinofaggiana
committed
fix
Signed-off-by: Marino Faggiana <marino.faggiana@nextcloud.com>
1 parent 971252e commit ec9e849

7 files changed

Lines changed: 20 additions & 15 deletions

‎Sources/NextcloudKit/NKCommon.swift‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,8 @@ public struct NKCommon: Sendable {
285285

286286
public func getStandardHeaders(account: String,
287287
options: NKRequestOptions? = nil,
288-
contentType: String = "application/x-www-form-urlencoded") -> HTTPHeaders? {
288+
contentType: String? = nil,
289+
accept: String? = nil) -> HTTPHeaders? {
289290
guard let session = nksessions.session(forAccount: account) else {
290291
return nil
291292
}
@@ -296,8 +297,12 @@ public struct NKCommon: Sendable {
296297
if let customUserAgent = options?.customUserAgent {
297298
headers.update(.userAgent(customUserAgent))
298299
}
299-
headers.update(.contentType(contentType))
300-
headers.update(name: "Accept", value: contentType)
300+
if let contentType {
301+
headers.update(.contentType(contentType))
302+
}
303+
if let accept {
304+
headers.update(name: "Accept", value: accept)
305+
}
301306
headers.update(name: "OCS-APIRequest", value: "true")
302307
for (key, value) in options?.customHeader ?? [:] {
303308
headers.update(name: key, value: value)

‎Sources/NextcloudKit/NextcloudKit+API.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -864,7 +864,7 @@ public extension NextcloudKit {
864864

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

@@ -934,7 +934,7 @@ public extension NextcloudKit {
934934
let endpoint = "ocs/v2.php/cloud/user"
935935
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
936936
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
937-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/json") else {
937+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, accept: "application/json") else {
938938
return options.queue.async { completion(account, nil, nil, .urlError) }
939939
}
940940

@@ -1630,7 +1630,7 @@ public extension NextcloudKit {
16301630

16311631
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
16321632
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
1633-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/json") else {
1633+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
16341634
return options.queue.async { completion(account, nil, .urlError) }
16351635
}
16361636
var urlRequest: URLRequest

‎Sources/NextcloudKit/NextcloudKit+Capabilities.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public extension NextcloudKit {
2929
let endpoint = "ocs/v1.php/cloud/capabilities"
3030
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
3131
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
32-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/json") else {
32+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, accept: "application/json") else {
3333
return options.queue.async { completion(account, nil, nil, .urlError) }
3434
}
3535

‎Sources/NextcloudKit/NextcloudKit+Comments.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public extension NextcloudKit {
2121
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
2222
completion: @escaping (_ account: String, _ items: [NKComments]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
2323
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
24-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
24+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, accept: "application/xml") else {
2525
return options.queue.async { completion(account, nil, nil, .urlError) }
2626
}
2727
let serverUrlEndpoint = nkSession.urlBase + "/" + nkSession.dav + "/comments/files/\(fileId)"

‎Sources/NextcloudKit/NextcloudKit+NCText.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public extension NextcloudKit {
2121
let endpoint = "ocs/v2.php/apps/files/api/v1/directEditing"
2222
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
2323
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
24-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
24+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, accept: "application/json") else {
2525
return options.queue.async { completion(account, nil, nil, nil, .urlError) }
2626
}
2727

‎Sources/NextcloudKit/NextcloudKit+RecommendedFiles.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public extension NextcloudKit {
2424
let endpoint = "ocs/v2.php/apps/recommendations/api/v1/recommendations"
2525
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
2626
let url = nkCommonInstance.createStandardUrl(serverUrl: nkSession.urlBase, endpoint: endpoint),
27-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
27+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, accept: "application/xml") else {
2828
return options.queue.async { completion(account, nil, nil, .urlError) }
2929
}
3030

‎Sources/NextcloudKit/NextcloudKit+WebDAV.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ public extension NextcloudKit {
378378
var serverUrlFileName = serverUrlFileName
379379
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
380380
let url = serverUrlFileName.encodedToUrl,
381-
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
381+
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
382382
return options.queue.async { completion(account, nil, nil, .urlError) }
383383
}
384384
if depth == "0", serverUrlFileName.last == "/" {
@@ -855,7 +855,7 @@ public extension NextcloudKit {
855855
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
856856
completion: @escaping (_ account: String, _ files: [NKFile]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
857857
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
858-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
858+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
859859
return options.queue.async { completion(account, nil, nil, .urlError) }
860860
}
861861
guard let url = (serverUrl + "/" + nkSession.dav).encodedToUrl else {
@@ -958,7 +958,7 @@ public extension NextcloudKit {
958958
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
959959
completion: @escaping (_ account: String, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
960960
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
961-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
961+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
962962
return options.queue.async { completion(account, nil, .urlError) }
963963
}
964964
let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId + "/" + fileName
@@ -1042,7 +1042,7 @@ public extension NextcloudKit {
10421042
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
10431043
completion: @escaping (_ account: String, _ files: [NKFile]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
10441044
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
1045-
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
1045+
let headers = nkCommonInstance.getStandardHeaders(account: account, options: options) else {
10461046
return options.queue.async { completion(account, nil, nil, .urlError) }
10471047
}
10481048
let serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/files/" + nkSession.userId
@@ -1137,7 +1137,7 @@ public extension NextcloudKit {
11371137
taskHandler: @escaping (_ task: URLSessionTask) -> Void = { _ in },
11381138
completion: @escaping (_ account: String, _ items: [NKTrash]?, _ responseData: AFDataResponse<Data>?, _ error: NKError) -> Void) {
11391139
guard let nkSession = nkCommonInstance.nksessions.session(forAccount: account),
1140-
var headers = nkCommonInstance.getStandardHeaders(account: account, options: options, contentType: "application/xml") else {
1140+
var headers = nkCommonInstance.getStandardHeaders(account: account, options: option) else {
11411141
return options.queue.async { completion(account, nil, nil, .urlError) }
11421142
}
11431143
var serverUrlFileName = nkSession.urlBase + "/" + nkSession.dav + "/trashbin/" + nkSession.userId + "/trash/"

0 commit comments

Comments
 (0)