From b65822d379b1d5e9be7b179ed754e725f5a499fa Mon Sep 17 00:00:00 2001 From: box-sdk-build <94016436+box-sdk-build@users.noreply.github.com> Date: Fri, 23 Aug 2024 11:46:03 +0200 Subject: [PATCH] feat: Include URL into `FetchOptions` (box/box-codegen#549) (#208) --- .codegen.json | 2 +- Sources/Box/Errors/BoxAPIError.swift | 2 +- Sources/Managers/Ai/AiManager.swift | 6 ++--- .../Authorization/AuthorizationManager.swift | 8 +++---- Sources/Managers/Avatars/AvatarsManager.swift | 6 ++--- .../ChunkedUploadsManager.swift | 24 +++++++++---------- .../ClassificationsManager.swift | 8 +++---- ...CollaborationAllowlistEntriesManager.swift | 8 +++---- ...orationAllowlistExemptTargetsManager.swift | 8 +++---- .../Collections/CollectionsManager.swift | 4 ++-- .../Managers/Comments/CommentsManager.swift | 10 ++++---- .../DevicePinners/DevicePinnersManager.swift | 6 ++--- .../Managers/Downloads/DownloadsManager.swift | 2 +- .../EmailAliases/EmailAliasesManager.swift | 6 ++--- Sources/Managers/Events/EventsManager.swift | 4 ++-- .../FileClassificationsManager.swift | 8 +++---- .../FileMetadata/FileMetadataManager.swift | 10 ++++---- .../FileRequests/FileRequestsManager.swift | 8 +++---- .../FileVersionLegalHoldsManager.swift | 4 ++-- .../FileVersionRetentionsManager.swift | 4 ++-- .../FileVersions/FileVersionsManager.swift | 10 ++++---- .../FileWatermarksManager.swift | 6 ++--- Sources/Managers/Files/FilesManager.swift | 10 ++++---- .../FolderClassificationsManager.swift | 8 +++---- .../FolderLocks/FolderLocksManager.swift | 6 ++--- .../FolderMetadataManager.swift | 10 ++++---- .../FolderWatermarksManager.swift | 6 ++--- Sources/Managers/Folders/FoldersManager.swift | 12 +++++----- Sources/Managers/Groups/GroupsManager.swift | 10 ++++---- .../IntegrationMappingsManager.swift | 8 +++---- Sources/Managers/Invites/InvitesManager.swift | 4 ++-- .../LegalHoldPoliciesManager.swift | 10 ++++---- .../LegalHoldPolicyAssignmentsManager.swift | 10 ++++---- .../ListCollaborationsManager.swift | 8 +++---- .../Memberships/MembershipsManager.swift | 12 +++++----- .../MetadataCascadePoliciesManager.swift | 10 ++++---- .../MetadataTemplatesManager.swift | 16 ++++++------- .../RecentItems/RecentItemsManager.swift | 2 +- .../RetentionPoliciesManager.swift | 10 ++++---- .../RetentionPolicyAssignmentsManager.swift | 10 ++++---- Sources/Managers/Search/SearchManager.swift | 4 ++-- .../SessionTerminationManager.swift | 4 ++-- .../SharedLinksFilesManager.swift | 10 ++++---- .../SharedLinksFoldersManager.swift | 10 ++++---- .../SharedLinksWebLinksManager.swift | 10 ++++---- ...ieldInformationBarrierReportsManager.swift | 6 ++--- ...ormationBarrierSegmentMembersManager.swift | 8 +++---- ...ionBarrierSegmentRestrictionsManager.swift | 8 +++---- ...eldInformationBarrierSegmentsManager.swift | 10 ++++---- .../ShieldInformationBarriersManager.swift | 8 +++---- .../SignRequests/SignRequestsManager.swift | 10 ++++---- .../SignTemplates/SignTemplatesManager.swift | 4 ++-- Sources/Managers/Skills/SkillsManager.swift | 10 ++++---- .../StoragePoliciesManager.swift | 4 ++-- .../StoragePolicyAssignmentsManager.swift | 10 ++++---- .../TaskAssignmentsManager.swift | 10 ++++---- Sources/Managers/Tasks/TasksManager.swift | 10 ++++---- .../TermsOfServiceUserStatusesManager.swift | 6 ++--- .../TermsOfServicesManager.swift | 8 +++---- .../Managers/Transfer/TransferManager.swift | 2 +- .../TrashedFiles/TrashedFilesManager.swift | 6 ++--- .../TrashedFoldersManager.swift | 6 ++--- .../TrashedItems/TrashedItemsManager.swift | 2 +- .../TrashedWebLinksManager.swift | 6 ++--- Sources/Managers/Uploads/UploadsManager.swift | 6 ++--- .../UserCollaborationsManager.swift | 8 +++---- Sources/Managers/Users/UsersManager.swift | 12 +++++----- .../Managers/WebLinks/WebLinksManager.swift | 8 +++---- .../Managers/Webhooks/WebhooksManager.swift | 10 ++++---- .../Managers/Workflows/WorkflowsManager.swift | 4 ++-- .../ZipDownloads/ZipDownloadsManager.swift | 6 ++--- Sources/Networking/FetchConversation.swift | 6 +---- Sources/Networking/FetchOptions.swift | 6 +++++ Sources/Networking/NetworkClient.swift | 18 +++++--------- 74 files changed, 284 insertions(+), 288 deletions(-) diff --git a/.codegen.json b/.codegen.json index 206a376e..e44e6866 100644 --- a/.codegen.json +++ b/.codegen.json @@ -1 +1 @@ -{ "engineHash": "6dfffba", "specHash": "57614c2", "version": "0.3.1" } +{ "engineHash": "2bf4a47", "specHash": "57614c2", "version": "0.3.1" } diff --git a/Sources/Box/Errors/BoxAPIError.swift b/Sources/Box/Errors/BoxAPIError.swift index 18200e03..5baa6302 100644 --- a/Sources/Box/Errors/BoxAPIError.swift +++ b/Sources/Box/Errors/BoxAPIError.swift @@ -46,7 +46,7 @@ extension BoxAPIError { let requestHeaders = conversation.options.headers.compactMapValues { $0?.paramValue } let requestInfo = RequestInfo( method: conversation.options.method.rawValue, - url: conversation.url, + url: conversation.options.url, queryParams: conversation.options.headers.compactMapValues { $0?.paramValue }, headers: requestHeaders, body: requestHeaders[HTTPHeaderKey.contentType, default: ""].paramValue == HTTPHeaderContentTypeValue.urlEncoded diff --git a/Sources/Managers/Ai/AiManager.swift b/Sources/Managers/Ai/AiManager.swift index c47dbd13..bc46233a 100644 --- a/Sources/Managers/Ai/AiManager.swift +++ b/Sources/Managers/Ai/AiManager.swift @@ -19,7 +19,7 @@ public class AiManager { /// - Throws: The `GeneralError`. public func createAiAsk(requestBody: AiAsk, headers: CreateAiAskHeaders = CreateAiAskHeaders()) async throws -> AiResponseFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/ai/ask")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/ai/ask")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try AiResponseFull.deserialize(from: response.data) } @@ -32,7 +32,7 @@ public class AiManager { /// - Throws: The `GeneralError`. public func createAiTextGen(requestBody: AiTextGen, headers: CreateAiTextGenHeaders = CreateAiTextGenHeaders()) async throws -> AiResponse { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/ai/text_gen")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/ai/text_gen")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try AiResponse.deserialize(from: response.data) } @@ -46,7 +46,7 @@ public class AiManager { public func getAiAgentDefaultConfig(queryParams: GetAiAgentDefaultConfigQueryParams, headers: GetAiAgentDefaultConfigHeaders = GetAiAgentDefaultConfigHeaders()) async throws -> AiAgentAskOrAiAgentTextGen { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["mode": Utils.Strings.toString(value: queryParams.mode), "language": Utils.Strings.toString(value: queryParams.language), "model": Utils.Strings.toString(value: queryParams.model)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/ai_agent_default")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/ai_agent_default")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try AiAgentAskOrAiAgentTextGen.deserialize(from: response.data) } diff --git a/Sources/Managers/Authorization/AuthorizationManager.swift b/Sources/Managers/Authorization/AuthorizationManager.swift index bbe85519..46656760 100644 --- a/Sources/Managers/Authorization/AuthorizationManager.swift +++ b/Sources/Managers/Authorization/AuthorizationManager.swift @@ -25,7 +25,7 @@ public class AuthorizationManager { public func authorizeUser(queryParams: AuthorizeUserQueryParams, headers: AuthorizeUserHeaders = AuthorizeUserHeaders()) async throws { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["response_type": Utils.Strings.toString(value: queryParams.responseType), "client_id": Utils.Strings.toString(value: queryParams.clientId), "redirect_uri": Utils.Strings.toString(value: queryParams.redirectUri), "state": Utils.Strings.toString(value: queryParams.state), "scope": Utils.Strings.toString(value: queryParams.scope)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.oauth2Url)\("/authorize")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.oauth2Url)\("/authorize")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Request an Access Token using either a client-side obtained OAuth 2.0 @@ -48,7 +48,7 @@ public class AuthorizationManager { /// - Throws: The `GeneralError`. public func requestAccessToken(requestBody: PostOAuth2Token, headers: RequestAccessTokenHeaders = RequestAccessTokenHeaders()) async throws -> AccessToken { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/oauth2/token")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/x-www-form-urlencoded", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/oauth2/token")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/x-www-form-urlencoded", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try AccessToken.deserialize(from: response.data) } @@ -61,7 +61,7 @@ public class AuthorizationManager { /// - Throws: The `GeneralError`. public func refreshAccessToken(requestBody: PostOAuth2TokenRefreshAccessToken, headers: RefreshAccessTokenHeaders = RefreshAccessTokenHeaders()) async throws -> AccessToken { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/oauth2/token#refresh")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/x-www-form-urlencoded", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/oauth2/token#refresh")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/x-www-form-urlencoded", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try AccessToken.deserialize(from: response.data) } @@ -74,7 +74,7 @@ public class AuthorizationManager { /// - Throws: The `GeneralError`. public func revokeAccessToken(requestBody: PostOAuth2Revoke, headers: RevokeAccessTokenHeaders = RevokeAccessTokenHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/oauth2/revoke")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/x-www-form-urlencoded", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/oauth2/revoke")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/x-www-form-urlencoded", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Avatars/AvatarsManager.swift b/Sources/Managers/Avatars/AvatarsManager.swift index 67eeff11..bb711f29 100644 --- a/Sources/Managers/Avatars/AvatarsManager.swift +++ b/Sources/Managers/Avatars/AvatarsManager.swift @@ -21,7 +21,7 @@ public class AvatarsManager { /// - Throws: The `GeneralError`. public func getUserAvatar(userId: String, downloadDestinationURL: URL, headers: GetUserAvatarHeaders = GetUserAvatarHeaders()) async throws -> URL { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/avatar")", options: FetchOptions(method: "GET", headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/avatar")", method: "GET", headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) return response.downloadDestinationURL! } @@ -36,7 +36,7 @@ public class AvatarsManager { /// - Throws: The `GeneralError`. public func createUserAvatar(userId: String, requestBody: CreateUserAvatarRequestBody, headers: CreateUserAvatarHeaders = CreateUserAvatarHeaders()) async throws -> UserAvatar { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/avatar")", options: FetchOptions(method: "POST", headers: headersMap, multipartData: [MultipartItem(partName: "pic", fileStream: requestBody.pic, fileName: requestBody.picFileName, contentType: requestBody.picContentType)], contentType: "multipart/form-data", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/avatar")", method: "POST", headers: headersMap, multipartData: [MultipartItem(partName: "pic", fileStream: requestBody.pic, fileName: requestBody.picFileName, contentType: requestBody.picContentType)], contentType: "multipart/form-data", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UserAvatar.deserialize(from: response.data) } @@ -50,7 +50,7 @@ public class AvatarsManager { /// - Throws: The `GeneralError`. public func deleteUserAvatar(userId: String, headers: DeleteUserAvatarHeaders = DeleteUserAvatarHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/avatar")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/avatar")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/ChunkedUploads/ChunkedUploadsManager.swift b/Sources/Managers/ChunkedUploads/ChunkedUploadsManager.swift index ca94a3e8..990fa653 100644 --- a/Sources/Managers/ChunkedUploads/ChunkedUploadsManager.swift +++ b/Sources/Managers/ChunkedUploads/ChunkedUploadsManager.swift @@ -19,7 +19,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func createFileUploadSession(requestBody: CreateFileUploadSessionRequestBody, headers: CreateFileUploadSessionHeaders = CreateFileUploadSessionHeaders()) async throws -> UploadSession { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadSession.deserialize(from: response.data) } @@ -40,7 +40,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func createFileUploadSessionForExistingFile(fileId: String, requestBody: CreateFileUploadSessionForExistingFileRequestBody, headers: CreateFileUploadSessionForExistingFileHeaders = CreateFileUploadSessionForExistingFileHeaders()) async throws -> UploadSession { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/")\(fileId)\("/upload_sessions")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/")\(fileId)\("/upload_sessions")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadSession.deserialize(from: response.data) } @@ -57,7 +57,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func getFileUploadSessionByUrl(url: String, headers: GetFileUploadSessionByUrlHeaders = GetFileUploadSessionByUrlHeaders()) async throws -> UploadSession { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: url, options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: url, method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadSession.deserialize(from: response.data) } @@ -73,7 +73,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func getFileUploadSessionById(uploadSessionId: String, headers: GetFileUploadSessionByIdHeaders = GetFileUploadSessionByIdHeaders()) async throws -> UploadSession { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadSession.deserialize(from: response.data) } @@ -92,7 +92,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func uploadFilePartByUrl(url: String, requestBody: InputStream, headers: UploadFilePartByUrlHeaders) async throws -> UploadedPart { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["digest": Utils.Strings.toString(value: headers.digest), "content-range": Utils.Strings.toString(value: headers.contentRange)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: url, options: FetchOptions(method: "PUT", headers: headersMap, fileStream: requestBody, contentType: "application/octet-stream", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: url, method: "PUT", headers: headersMap, fileStream: requestBody, contentType: "application/octet-stream", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadedPart.deserialize(from: response.data) } @@ -110,7 +110,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func uploadFilePart(uploadSessionId: String, requestBody: InputStream, headers: UploadFilePartHeaders) async throws -> UploadedPart { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["digest": Utils.Strings.toString(value: headers.digest), "content-range": Utils.Strings.toString(value: headers.contentRange)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)", options: FetchOptions(method: "PUT", headers: headersMap, fileStream: requestBody, contentType: "application/octet-stream", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)", method: "PUT", headers: headersMap, fileStream: requestBody, contentType: "application/octet-stream", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadedPart.deserialize(from: response.data) } @@ -129,7 +129,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func deleteFileUploadSessionByUrl(url: String, headers: DeleteFileUploadSessionByUrlHeaders = DeleteFileUploadSessionByUrlHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: url, options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: url, method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Abort an upload session and discard all data uploaded. @@ -146,7 +146,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func deleteFileUploadSessionById(uploadSessionId: String, headers: DeleteFileUploadSessionByIdHeaders = DeleteFileUploadSessionByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Using this method with urls provided in response when creating a new upload session is preferred to use over GetFileUploadSessionParts method. @@ -165,7 +165,7 @@ public class ChunkedUploadsManager { public func getFileUploadSessionPartsByUrl(url: String, queryParams: GetFileUploadSessionPartsByUrlQueryParams = GetFileUploadSessionPartsByUrlQueryParams(), headers: GetFileUploadSessionPartsByUrlHeaders = GetFileUploadSessionPartsByUrlHeaders()) async throws -> UploadParts { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: url, options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: url, method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadParts.deserialize(from: response.data) } @@ -184,7 +184,7 @@ public class ChunkedUploadsManager { public func getFileUploadSessionParts(uploadSessionId: String, queryParams: GetFileUploadSessionPartsQueryParams = GetFileUploadSessionPartsQueryParams(), headers: GetFileUploadSessionPartsHeaders = GetFileUploadSessionPartsHeaders()) async throws -> UploadParts { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)\("/parts")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)\("/parts")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadParts.deserialize(from: response.data) } @@ -203,7 +203,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func createFileUploadSessionCommitByUrl(url: String, requestBody: CreateFileUploadSessionCommitByUrlRequestBody, headers: CreateFileUploadSessionCommitByUrlHeaders) async throws -> Files { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["digest": Utils.Strings.toString(value: headers.digest), "if-match": Utils.Strings.toString(value: headers.ifMatch), "if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: url, options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: url, method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Files.deserialize(from: response.data) } @@ -221,7 +221,7 @@ public class ChunkedUploadsManager { /// - Throws: The `GeneralError`. public func createFileUploadSessionCommit(uploadSessionId: String, requestBody: CreateFileUploadSessionCommitRequestBody, headers: CreateFileUploadSessionCommitHeaders) async throws -> Files { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["digest": Utils.Strings.toString(value: headers.digest), "if-match": Utils.Strings.toString(value: headers.ifMatch), "if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)\("/commit")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/upload_sessions/")\(uploadSessionId)\("/commit")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Files.deserialize(from: response.data) } diff --git a/Sources/Managers/Classifications/ClassificationsManager.swift b/Sources/Managers/Classifications/ClassificationsManager.swift index 713c46dd..9e376b45 100644 --- a/Sources/Managers/Classifications/ClassificationsManager.swift +++ b/Sources/Managers/Classifications/ClassificationsManager.swift @@ -23,7 +23,7 @@ public class ClassificationsManager { /// - Throws: The `GeneralError`. public func getClassificationTemplate(headers: GetClassificationTemplateHeaders = GetClassificationTemplateHeaders()) async throws -> ClassificationTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise/securityClassification-6VMVochwUWo/schema")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise/securityClassification-6VMVochwUWo/schema")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ClassificationTemplate.deserialize(from: response.data) } @@ -41,7 +41,7 @@ public class ClassificationsManager { /// - Throws: The `GeneralError`. public func addClassification(requestBody: [AddClassificationRequestBody], headers: AddClassificationHeaders = AddClassificationHeaders()) async throws -> ClassificationTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise/securityClassification-6VMVochwUWo/schema#add")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise/securityClassification-6VMVochwUWo/schema#add")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ClassificationTemplate.deserialize(from: response.data) } @@ -59,7 +59,7 @@ public class ClassificationsManager { /// - Throws: The `GeneralError`. public func updateClassification(requestBody: [UpdateClassificationRequestBody], headers: UpdateClassificationHeaders = UpdateClassificationHeaders()) async throws -> ClassificationTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise/securityClassification-6VMVochwUWo/schema#update")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise/securityClassification-6VMVochwUWo/schema#update")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ClassificationTemplate.deserialize(from: response.data) } @@ -78,7 +78,7 @@ public class ClassificationsManager { /// - Throws: The `GeneralError`. public func createClassificationTemplate(requestBody: CreateClassificationTemplateRequestBody, headers: CreateClassificationTemplateHeaders = CreateClassificationTemplateHeaders()) async throws -> ClassificationTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/schema#classifications")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/schema#classifications")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ClassificationTemplate.deserialize(from: response.data) } diff --git a/Sources/Managers/CollaborationAllowlistEntries/CollaborationAllowlistEntriesManager.swift b/Sources/Managers/CollaborationAllowlistEntries/CollaborationAllowlistEntriesManager.swift index 18d928ae..45d4c114 100644 --- a/Sources/Managers/CollaborationAllowlistEntries/CollaborationAllowlistEntriesManager.swift +++ b/Sources/Managers/CollaborationAllowlistEntries/CollaborationAllowlistEntriesManager.swift @@ -21,7 +21,7 @@ public class CollaborationAllowlistEntriesManager { public func getCollaborationWhitelistEntries(queryParams: GetCollaborationWhitelistEntriesQueryParams = GetCollaborationWhitelistEntriesQueryParams(), headers: GetCollaborationWhitelistEntriesHeaders = GetCollaborationWhitelistEntriesHeaders()) async throws -> CollaborationAllowlistEntries { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CollaborationAllowlistEntries.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class CollaborationAllowlistEntriesManager { /// - Throws: The `GeneralError`. public func createCollaborationWhitelistEntry(requestBody: CreateCollaborationWhitelistEntryRequestBody, headers: CreateCollaborationWhitelistEntryHeaders = CreateCollaborationWhitelistEntryHeaders()) async throws -> CollaborationAllowlistEntry { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CollaborationAllowlistEntry.deserialize(from: response.data) } @@ -50,7 +50,7 @@ public class CollaborationAllowlistEntriesManager { /// - Throws: The `GeneralError`. public func getCollaborationWhitelistEntryById(collaborationWhitelistEntryId: String, headers: GetCollaborationWhitelistEntryByIdHeaders = GetCollaborationWhitelistEntryByIdHeaders()) async throws -> CollaborationAllowlistEntry { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries/")\(collaborationWhitelistEntryId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries/")\(collaborationWhitelistEntryId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CollaborationAllowlistEntry.deserialize(from: response.data) } @@ -64,7 +64,7 @@ public class CollaborationAllowlistEntriesManager { /// - Throws: The `GeneralError`. public func deleteCollaborationWhitelistEntryById(collaborationWhitelistEntryId: String, headers: DeleteCollaborationWhitelistEntryByIdHeaders = DeleteCollaborationWhitelistEntryByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries/")\(collaborationWhitelistEntryId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_entries/")\(collaborationWhitelistEntryId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/CollaborationAllowlistExemptTargets/CollaborationAllowlistExemptTargetsManager.swift b/Sources/Managers/CollaborationAllowlistExemptTargets/CollaborationAllowlistExemptTargetsManager.swift index ad7029d5..346da293 100644 --- a/Sources/Managers/CollaborationAllowlistExemptTargets/CollaborationAllowlistExemptTargetsManager.swift +++ b/Sources/Managers/CollaborationAllowlistExemptTargets/CollaborationAllowlistExemptTargetsManager.swift @@ -21,7 +21,7 @@ public class CollaborationAllowlistExemptTargetsManager { public func getCollaborationWhitelistExemptTargets(queryParams: GetCollaborationWhitelistExemptTargetsQueryParams = GetCollaborationWhitelistExemptTargetsQueryParams(), headers: GetCollaborationWhitelistExemptTargetsHeaders = GetCollaborationWhitelistExemptTargetsHeaders()) async throws -> CollaborationAllowlistExemptTargets { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CollaborationAllowlistExemptTargets.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class CollaborationAllowlistExemptTargetsManager { /// - Throws: The `GeneralError`. public func createCollaborationWhitelistExemptTarget(requestBody: CreateCollaborationWhitelistExemptTargetRequestBody, headers: CreateCollaborationWhitelistExemptTargetHeaders = CreateCollaborationWhitelistExemptTargetHeaders()) async throws -> CollaborationAllowlistExemptTarget { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CollaborationAllowlistExemptTarget.deserialize(from: response.data) } @@ -50,7 +50,7 @@ public class CollaborationAllowlistExemptTargetsManager { /// - Throws: The `GeneralError`. public func getCollaborationWhitelistExemptTargetById(collaborationWhitelistExemptTargetId: String, headers: GetCollaborationWhitelistExemptTargetByIdHeaders = GetCollaborationWhitelistExemptTargetByIdHeaders()) async throws -> CollaborationAllowlistExemptTarget { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets/")\(collaborationWhitelistExemptTargetId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets/")\(collaborationWhitelistExemptTargetId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CollaborationAllowlistExemptTarget.deserialize(from: response.data) } @@ -64,7 +64,7 @@ public class CollaborationAllowlistExemptTargetsManager { /// - Throws: The `GeneralError`. public func deleteCollaborationWhitelistExemptTargetById(collaborationWhitelistExemptTargetId: String, headers: DeleteCollaborationWhitelistExemptTargetByIdHeaders = DeleteCollaborationWhitelistExemptTargetByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets/")\(collaborationWhitelistExemptTargetId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaboration_whitelist_exempt_targets/")\(collaborationWhitelistExemptTargetId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Collections/CollectionsManager.swift b/Sources/Managers/Collections/CollectionsManager.swift index 4c8ff1c6..3988da77 100644 --- a/Sources/Managers/Collections/CollectionsManager.swift +++ b/Sources/Managers/Collections/CollectionsManager.swift @@ -23,7 +23,7 @@ public class CollectionsManager { public func getCollections(queryParams: GetCollectionsQueryParams = GetCollectionsQueryParams(), headers: GetCollectionsHeaders = GetCollectionsHeaders()) async throws -> Collections { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collections")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collections")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collections.deserialize(from: response.data) } @@ -40,7 +40,7 @@ public class CollectionsManager { public func getCollectionItems(collectionId: String, queryParams: GetCollectionItemsQueryParams = GetCollectionItemsQueryParams(), headers: GetCollectionItemsHeaders = GetCollectionItemsHeaders()) async throws -> Items { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collections/")\(collectionId)\("/items")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collections/")\(collectionId)\("/items")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Items.deserialize(from: response.data) } diff --git a/Sources/Managers/Comments/CommentsManager.swift b/Sources/Managers/Comments/CommentsManager.swift index dda8806b..e81aee12 100644 --- a/Sources/Managers/Comments/CommentsManager.swift +++ b/Sources/Managers/Comments/CommentsManager.swift @@ -28,7 +28,7 @@ public class CommentsManager { public func getFileComments(fileId: String, queryParams: GetFileCommentsQueryParams = GetFileCommentsQueryParams(), headers: GetFileCommentsHeaders = GetFileCommentsHeaders()) async throws -> Comments { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/comments")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/comments")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Comments.deserialize(from: response.data) } @@ -45,7 +45,7 @@ public class CommentsManager { public func getCommentById(commentId: String, queryParams: GetCommentByIdQueryParams = GetCommentByIdQueryParams(), headers: GetCommentByIdHeaders = GetCommentByIdHeaders()) async throws -> CommentFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments/")\(commentId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments/")\(commentId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CommentFull.deserialize(from: response.data) } @@ -62,7 +62,7 @@ public class CommentsManager { public func updateCommentById(commentId: String, requestBody: UpdateCommentByIdRequestBody = UpdateCommentByIdRequestBody(), queryParams: UpdateCommentByIdQueryParams = UpdateCommentByIdQueryParams(), headers: UpdateCommentByIdHeaders = UpdateCommentByIdHeaders()) async throws -> CommentFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments/")\(commentId)", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments/")\(commentId)", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CommentFull.deserialize(from: response.data) } @@ -75,7 +75,7 @@ public class CommentsManager { /// - Throws: The `GeneralError`. public func deleteCommentById(commentId: String, headers: DeleteCommentByIdHeaders = DeleteCommentByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments/")\(commentId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments/")\(commentId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Adds a comment by the user to a specific file, or @@ -90,7 +90,7 @@ public class CommentsManager { public func createComment(requestBody: CreateCommentRequestBody, queryParams: CreateCommentQueryParams = CreateCommentQueryParams(), headers: CreateCommentHeaders = CreateCommentHeaders()) async throws -> CommentFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/comments")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try CommentFull.deserialize(from: response.data) } diff --git a/Sources/Managers/DevicePinners/DevicePinnersManager.swift b/Sources/Managers/DevicePinners/DevicePinnersManager.swift index 75907a0f..2020e0c3 100644 --- a/Sources/Managers/DevicePinners/DevicePinnersManager.swift +++ b/Sources/Managers/DevicePinners/DevicePinnersManager.swift @@ -20,7 +20,7 @@ public class DevicePinnersManager { /// - Throws: The `GeneralError`. public func getDevicePinnerById(devicePinnerId: String, headers: GetDevicePinnerByIdHeaders = GetDevicePinnerByIdHeaders()) async throws -> DevicePinner { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/device_pinners/")\(devicePinnerId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/device_pinners/")\(devicePinnerId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try DevicePinner.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class DevicePinnersManager { /// - Throws: The `GeneralError`. public func deleteDevicePinnerById(devicePinnerId: String, headers: DeleteDevicePinnerByIdHeaders = DeleteDevicePinnerByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/device_pinners/")\(devicePinnerId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/device_pinners/")\(devicePinnerId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Retrieves all the device pins within an enterprise. @@ -51,7 +51,7 @@ public class DevicePinnersManager { public func getEnterpriseDevicePinners(enterpriseId: String, queryParams: GetEnterpriseDevicePinnersQueryParams = GetEnterpriseDevicePinnersQueryParams(), headers: GetEnterpriseDevicePinnersHeaders = GetEnterpriseDevicePinnersHeaders()) async throws -> DevicePinners { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit), "direction": Utils.Strings.toString(value: queryParams.direction)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/enterprises/")\(enterpriseId)\("/device_pinners")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/enterprises/")\(enterpriseId)\("/device_pinners")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try DevicePinners.deserialize(from: response.data) } diff --git a/Sources/Managers/Downloads/DownloadsManager.swift b/Sources/Managers/Downloads/DownloadsManager.swift index e76dfb28..3b761927 100644 --- a/Sources/Managers/Downloads/DownloadsManager.swift +++ b/Sources/Managers/Downloads/DownloadsManager.swift @@ -29,7 +29,7 @@ public class DownloadsManager { public func downloadFile(fileId: String, downloadDestinationURL: URL, queryParams: DownloadFileQueryParams = DownloadFileQueryParams(), headers: DownloadFileHeaders = DownloadFileHeaders()) async throws -> URL { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["version": Utils.Strings.toString(value: queryParams.version), "access_token": Utils.Strings.toString(value: queryParams.accessToken)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["range": Utils.Strings.toString(value: headers.range), "boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/content")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/content")", method: "GET", params: queryParamsMap, headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) return response.downloadDestinationURL! } diff --git a/Sources/Managers/EmailAliases/EmailAliasesManager.swift b/Sources/Managers/EmailAliases/EmailAliasesManager.swift index 74d4b3ec..2f648d25 100644 --- a/Sources/Managers/EmailAliases/EmailAliasesManager.swift +++ b/Sources/Managers/EmailAliases/EmailAliasesManager.swift @@ -21,7 +21,7 @@ public class EmailAliasesManager { /// - Throws: The `GeneralError`. public func getUserEmailAliases(userId: String, headers: GetUserEmailAliasesHeaders = GetUserEmailAliasesHeaders()) async throws -> EmailAliases { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/email_aliases")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/email_aliases")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try EmailAliases.deserialize(from: response.data) } @@ -36,7 +36,7 @@ public class EmailAliasesManager { /// - Throws: The `GeneralError`. public func createUserEmailAlias(userId: String, requestBody: CreateUserEmailAliasRequestBody, headers: CreateUserEmailAliasHeaders = CreateUserEmailAliasHeaders()) async throws -> EmailAlias { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/email_aliases")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/email_aliases")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try EmailAlias.deserialize(from: response.data) } @@ -51,7 +51,7 @@ public class EmailAliasesManager { /// - Throws: The `GeneralError`. public func deleteUserEmailAliasById(userId: String, emailAliasId: String, headers: DeleteUserEmailAliasByIdHeaders = DeleteUserEmailAliasByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/email_aliases/")\(emailAliasId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/email_aliases/")\(emailAliasId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Events/EventsManager.swift b/Sources/Managers/Events/EventsManager.swift index 0f5b01d7..6e09bd26 100644 --- a/Sources/Managers/Events/EventsManager.swift +++ b/Sources/Managers/Events/EventsManager.swift @@ -28,7 +28,7 @@ public class EventsManager { public func getEvents(queryParams: GetEventsQueryParams = GetEventsQueryParams(), headers: GetEventsHeaders = GetEventsHeaders()) async throws -> Events { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["stream_type": Utils.Strings.toString(value: queryParams.streamType), "stream_position": Utils.Strings.toString(value: queryParams.streamPosition), "limit": Utils.Strings.toString(value: queryParams.limit), "event_type": Utils.Strings.toString(value: queryParams.eventType), "created_after": Utils.Strings.toString(value: queryParams.createdAfter), "created_before": Utils.Strings.toString(value: queryParams.createdBefore)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/events")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/events")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Events.deserialize(from: response.data) } @@ -72,7 +72,7 @@ public class EventsManager { /// - Throws: The `GeneralError`. public func getEventsWithLongPolling(headers: GetEventsWithLongPollingHeaders = GetEventsWithLongPollingHeaders()) async throws -> RealtimeServers { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/events")", options: FetchOptions(method: "OPTIONS", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/events")", method: "OPTIONS", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RealtimeServers.deserialize(from: response.data) } diff --git a/Sources/Managers/FileClassifications/FileClassificationsManager.swift b/Sources/Managers/FileClassifications/FileClassificationsManager.swift index b75a3079..3666f44b 100644 --- a/Sources/Managers/FileClassifications/FileClassificationsManager.swift +++ b/Sources/Managers/FileClassifications/FileClassificationsManager.swift @@ -31,7 +31,7 @@ public class FileClassificationsManager { /// - Throws: The `GeneralError`. public func getClassificationOnFile(fileId: String, headers: GetClassificationOnFileHeaders = GetClassificationOnFileHeaders()) async throws -> Classification { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Classification.deserialize(from: response.data) } @@ -57,7 +57,7 @@ public class FileClassificationsManager { /// - Throws: The `GeneralError`. public func addClassificationToFile(fileId: String, requestBody: AddClassificationToFileRequestBody = AddClassificationToFileRequestBody(), headers: AddClassificationToFileHeaders = AddClassificationToFileHeaders()) async throws -> Classification { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Classification.deserialize(from: response.data) } @@ -82,7 +82,7 @@ public class FileClassificationsManager { /// - Throws: The `GeneralError`. public func updateClassificationOnFile(fileId: String, requestBody: [UpdateClassificationOnFileRequestBody], headers: UpdateClassificationOnFileHeaders = UpdateClassificationOnFileHeaders()) async throws -> Classification { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Classification.deserialize(from: response.data) } @@ -105,7 +105,7 @@ public class FileClassificationsManager { /// - Throws: The `GeneralError`. public func deleteClassificationFromFile(fileId: String, headers: DeleteClassificationFromFileHeaders = DeleteClassificationFromFileHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/FileMetadata/FileMetadataManager.swift b/Sources/Managers/FileMetadata/FileMetadataManager.swift index 4673a212..969fd63d 100644 --- a/Sources/Managers/FileMetadata/FileMetadataManager.swift +++ b/Sources/Managers/FileMetadata/FileMetadataManager.swift @@ -26,7 +26,7 @@ public class FileMetadataManager { /// - Throws: The `GeneralError`. public func getFileMetadata(fileId: String, headers: GetFileMetadataHeaders = GetFileMetadataHeaders()) async throws -> Metadatas { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Metadatas.deserialize(from: response.data) } @@ -51,7 +51,7 @@ public class FileMetadataManager { /// - Throws: The `GeneralError`. public func getFileMetadataById(fileId: String, scope: GetFileMetadataByIdScope, templateKey: String, headers: GetFileMetadataByIdHeaders = GetFileMetadataByIdHeaders()) async throws -> MetadataFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataFull.deserialize(from: response.data) } @@ -80,7 +80,7 @@ public class FileMetadataManager { /// - Throws: The `GeneralError`. public func createFileMetadataById(fileId: String, scope: CreateFileMetadataByIdScope, templateKey: String, requestBody: CreateFileMetadataByIdRequestBody, headers: CreateFileMetadataByIdHeaders = CreateFileMetadataByIdHeaders()) async throws -> MetadataFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataFull.deserialize(from: response.data) } @@ -112,7 +112,7 @@ public class FileMetadataManager { /// - Throws: The `GeneralError`. public func updateFileMetadataById(fileId: String, scope: UpdateFileMetadataByIdScope, templateKey: String, requestBody: [UpdateFileMetadataByIdRequestBody], headers: UpdateFileMetadataByIdHeaders = UpdateFileMetadataByIdHeaders()) async throws -> MetadataFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataFull.deserialize(from: response.data) } @@ -135,7 +135,7 @@ public class FileMetadataManager { /// - Throws: The `GeneralError`. public func deleteFileMetadataById(fileId: String, scope: DeleteFileMetadataByIdScope, templateKey: String, headers: DeleteFileMetadataByIdHeaders = DeleteFileMetadataByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/FileRequests/FileRequestsManager.swift b/Sources/Managers/FileRequests/FileRequestsManager.swift index 82f1818b..9c34313b 100644 --- a/Sources/Managers/FileRequests/FileRequestsManager.swift +++ b/Sources/Managers/FileRequests/FileRequestsManager.swift @@ -26,7 +26,7 @@ public class FileRequestsManager { /// - Throws: The `GeneralError`. public func getFileRequestById(fileRequestId: String, headers: GetFileRequestByIdHeaders = GetFileRequestByIdHeaders()) async throws -> FileRequest { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileRequest.deserialize(from: response.data) } @@ -48,7 +48,7 @@ public class FileRequestsManager { /// - Throws: The `GeneralError`. public func updateFileRequestById(fileRequestId: String, requestBody: FileRequestUpdateRequest, headers: UpdateFileRequestByIdHeaders = UpdateFileRequestByIdHeaders()) async throws -> FileRequest { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileRequest.deserialize(from: response.data) } @@ -67,7 +67,7 @@ public class FileRequestsManager { /// - Throws: The `GeneralError`. public func deleteFileRequestById(fileRequestId: String, headers: DeleteFileRequestByIdHeaders = DeleteFileRequestByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Copies an existing file request that is already present on one folder, @@ -88,7 +88,7 @@ public class FileRequestsManager { /// - Throws: The `GeneralError`. public func createFileRequestCopy(fileRequestId: String, requestBody: FileRequestCopyRequest, headers: CreateFileRequestCopyHeaders = CreateFileRequestCopyHeaders()) async throws -> FileRequest { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)\("/copy")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_requests/")\(fileRequestId)\("/copy")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileRequest.deserialize(from: response.data) } diff --git a/Sources/Managers/FileVersionLegalHolds/FileVersionLegalHoldsManager.swift b/Sources/Managers/FileVersionLegalHolds/FileVersionLegalHoldsManager.swift index 79a9a10e..80c55227 100644 --- a/Sources/Managers/FileVersionLegalHolds/FileVersionLegalHoldsManager.swift +++ b/Sources/Managers/FileVersionLegalHolds/FileVersionLegalHoldsManager.swift @@ -21,7 +21,7 @@ public class FileVersionLegalHoldsManager { /// - Throws: The `GeneralError`. public func getFileVersionLegalHoldById(fileVersionLegalHoldId: String, headers: GetFileVersionLegalHoldByIdHeaders = GetFileVersionLegalHoldByIdHeaders()) async throws -> FileVersionLegalHold { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_legal_holds/")\(fileVersionLegalHoldId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_legal_holds/")\(fileVersionLegalHoldId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionLegalHold.deserialize(from: response.data) } @@ -54,7 +54,7 @@ public class FileVersionLegalHoldsManager { public func getFileVersionLegalHolds(queryParams: GetFileVersionLegalHoldsQueryParams, headers: GetFileVersionLegalHoldsHeaders = GetFileVersionLegalHoldsHeaders()) async throws -> FileVersionLegalHolds { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["policy_id": Utils.Strings.toString(value: queryParams.policyId), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_legal_holds")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_legal_holds")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionLegalHolds.deserialize(from: response.data) } diff --git a/Sources/Managers/FileVersionRetentions/FileVersionRetentionsManager.swift b/Sources/Managers/FileVersionRetentions/FileVersionRetentionsManager.swift index 85a47328..27fcfd4e 100644 --- a/Sources/Managers/FileVersionRetentions/FileVersionRetentionsManager.swift +++ b/Sources/Managers/FileVersionRetentions/FileVersionRetentionsManager.swift @@ -25,7 +25,7 @@ public class FileVersionRetentionsManager { public func getFileVersionRetentions(queryParams: GetFileVersionRetentionsQueryParams = GetFileVersionRetentionsQueryParams(), headers: GetFileVersionRetentionsHeaders = GetFileVersionRetentionsHeaders()) async throws -> FileVersionRetentions { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["file_id": Utils.Strings.toString(value: queryParams.fileId), "file_version_id": Utils.Strings.toString(value: queryParams.fileVersionId), "policy_id": Utils.Strings.toString(value: queryParams.policyId), "disposition_action": Utils.Strings.toString(value: queryParams.dispositionAction), "disposition_before": Utils.Strings.toString(value: queryParams.dispositionBefore), "disposition_after": Utils.Strings.toString(value: queryParams.dispositionAfter), "limit": Utils.Strings.toString(value: queryParams.limit), "marker": Utils.Strings.toString(value: queryParams.marker)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_retentions")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_retentions")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionRetentions.deserialize(from: response.data) } @@ -44,7 +44,7 @@ public class FileVersionRetentionsManager { /// - Throws: The `GeneralError`. public func getFileVersionRetentionById(fileVersionRetentionId: String, headers: GetFileVersionRetentionByIdHeaders = GetFileVersionRetentionByIdHeaders()) async throws -> FileVersionRetention { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_retentions/")\(fileVersionRetentionId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/file_version_retentions/")\(fileVersionRetentionId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionRetention.deserialize(from: response.data) } diff --git a/Sources/Managers/FileVersions/FileVersionsManager.swift b/Sources/Managers/FileVersions/FileVersionsManager.swift index 9f52cd66..ea971462 100644 --- a/Sources/Managers/FileVersions/FileVersionsManager.swift +++ b/Sources/Managers/FileVersions/FileVersionsManager.swift @@ -31,7 +31,7 @@ public class FileVersionsManager { public func getFileVersions(fileId: String, queryParams: GetFileVersionsQueryParams = GetFileVersionsQueryParams(), headers: GetFileVersionsHeaders = GetFileVersionsHeaders()) async throws -> FileVersions { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersions.deserialize(from: response.data) } @@ -57,7 +57,7 @@ public class FileVersionsManager { public func getFileVersionById(fileId: String, fileVersionId: String, queryParams: GetFileVersionByIdQueryParams = GetFileVersionByIdQueryParams(), headers: GetFileVersionByIdHeaders = GetFileVersionByIdHeaders()) async throws -> FileVersionFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/")\(fileVersionId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/")\(fileVersionId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionFull.deserialize(from: response.data) } @@ -83,7 +83,7 @@ public class FileVersionsManager { /// - Throws: The `GeneralError`. public func updateFileVersionById(fileId: String, fileVersionId: String, requestBody: UpdateFileVersionByIdRequestBody = UpdateFileVersionByIdRequestBody(), headers: UpdateFileVersionByIdHeaders = UpdateFileVersionByIdHeaders()) async throws -> FileVersionFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/")\(fileVersionId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/")\(fileVersionId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionFull.deserialize(from: response.data) } @@ -106,7 +106,7 @@ public class FileVersionsManager { /// - Throws: The `GeneralError`. public func deleteFileVersionById(fileId: String, fileVersionId: String, headers: DeleteFileVersionByIdHeaders = DeleteFileVersionByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/")\(fileVersionId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/")\(fileVersionId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Promote a specific version of a file. @@ -143,7 +143,7 @@ public class FileVersionsManager { public func promoteFileVersion(fileId: String, requestBody: PromoteFileVersionRequestBody = PromoteFileVersionRequestBody(), queryParams: PromoteFileVersionQueryParams = PromoteFileVersionQueryParams(), headers: PromoteFileVersionHeaders = PromoteFileVersionHeaders()) async throws -> FileVersionFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/current")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/versions/current")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileVersionFull.deserialize(from: response.data) } diff --git a/Sources/Managers/FileWatermarks/FileWatermarksManager.swift b/Sources/Managers/FileWatermarks/FileWatermarksManager.swift index 788194be..96816e5e 100644 --- a/Sources/Managers/FileWatermarks/FileWatermarksManager.swift +++ b/Sources/Managers/FileWatermarks/FileWatermarksManager.swift @@ -26,7 +26,7 @@ public class FileWatermarksManager { /// - Throws: The `GeneralError`. public func getFileWatermark(fileId: String, headers: GetFileWatermarkHeaders = GetFileWatermarkHeaders()) async throws -> Watermark { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/watermark")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/watermark")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Watermark.deserialize(from: response.data) } @@ -47,7 +47,7 @@ public class FileWatermarksManager { /// - Throws: The `GeneralError`. public func updateFileWatermark(fileId: String, requestBody: UpdateFileWatermarkRequestBody, headers: UpdateFileWatermarkHeaders = UpdateFileWatermarkHeaders()) async throws -> Watermark { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/watermark")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/watermark")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Watermark.deserialize(from: response.data) } @@ -66,7 +66,7 @@ public class FileWatermarksManager { /// - Throws: The `GeneralError`. public func deleteFileWatermark(fileId: String, headers: DeleteFileWatermarkHeaders = DeleteFileWatermarkHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/watermark")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/watermark")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Files/FilesManager.swift b/Sources/Managers/Files/FilesManager.swift index 83dd47ab..5e3ef855 100644 --- a/Sources/Managers/Files/FilesManager.swift +++ b/Sources/Managers/Files/FilesManager.swift @@ -28,7 +28,7 @@ public class FilesManager { public func getFileById(fileId: String, queryParams: GetFileByIdQueryParams = GetFileByIdQueryParams(), headers: GetFileByIdHeaders = GetFileByIdHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch), "boxapi": Utils.Strings.toString(value: headers.boxapi), "x-rep-hints": Utils.Strings.toString(value: headers.xRepHints)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -52,7 +52,7 @@ public class FilesManager { public func updateFileById(fileId: String, requestBody: UpdateFileByIdRequestBody = UpdateFileByIdRequestBody(), queryParams: UpdateFileByIdQueryParams = UpdateFileByIdQueryParams(), headers: UpdateFileByIdHeaders = UpdateFileByIdHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -75,7 +75,7 @@ public class FilesManager { /// - Throws: The `GeneralError`. public func deleteFileById(fileId: String, headers: DeleteFileByIdHeaders = DeleteFileByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Creates a copy of a file. @@ -97,7 +97,7 @@ public class FilesManager { public func copyFile(fileId: String, requestBody: CopyFileRequestBody, queryParams: CopyFileQueryParams = CopyFileQueryParams(), headers: CopyFileHeaders = CopyFileHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/copy")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/copy")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -131,7 +131,7 @@ public class FilesManager { public func getFileThumbnailById(fileId: String, extension_: GetFileThumbnailByIdExtension, downloadDestinationURL: URL, queryParams: GetFileThumbnailByIdQueryParams = GetFileThumbnailByIdQueryParams(), headers: GetFileThumbnailByIdHeaders = GetFileThumbnailByIdHeaders()) async throws -> URL { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["min_height": Utils.Strings.toString(value: queryParams.minHeight), "min_width": Utils.Strings.toString(value: queryParams.minWidth), "max_height": Utils.Strings.toString(value: queryParams.maxHeight), "max_width": Utils.Strings.toString(value: queryParams.maxWidth)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/thumbnail.")\(extension_)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/thumbnail.")\(extension_)", method: "GET", params: queryParamsMap, headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) return response.downloadDestinationURL! } diff --git a/Sources/Managers/FolderClassifications/FolderClassificationsManager.swift b/Sources/Managers/FolderClassifications/FolderClassificationsManager.swift index 00dc8acb..30503a62 100644 --- a/Sources/Managers/FolderClassifications/FolderClassificationsManager.swift +++ b/Sources/Managers/FolderClassifications/FolderClassificationsManager.swift @@ -34,7 +34,7 @@ public class FolderClassificationsManager { /// - Throws: The `GeneralError`. public func getClassificationOnFolder(folderId: String, headers: GetClassificationOnFolderHeaders = GetClassificationOnFolderHeaders()) async throws -> Classification { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Classification.deserialize(from: response.data) } @@ -63,7 +63,7 @@ public class FolderClassificationsManager { /// - Throws: The `GeneralError`. public func addClassificationToFolder(folderId: String, requestBody: AddClassificationToFolderRequestBody = AddClassificationToFolderRequestBody(), headers: AddClassificationToFolderHeaders = AddClassificationToFolderHeaders()) async throws -> Classification { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Classification.deserialize(from: response.data) } @@ -91,7 +91,7 @@ public class FolderClassificationsManager { /// - Throws: The `GeneralError`. public func updateClassificationOnFolder(folderId: String, requestBody: [UpdateClassificationOnFolderRequestBody], headers: UpdateClassificationOnFolderHeaders = UpdateClassificationOnFolderHeaders()) async throws -> Classification { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Classification.deserialize(from: response.data) } @@ -117,7 +117,7 @@ public class FolderClassificationsManager { /// - Throws: The `GeneralError`. public func deleteClassificationFromFolder(folderId: String, headers: DeleteClassificationFromFolderHeaders = DeleteClassificationFromFolderHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/enterprise/securityClassification-6VMVochwUWo")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/FolderLocks/FolderLocksManager.swift b/Sources/Managers/FolderLocks/FolderLocksManager.swift index 2bc0bd11..bd6ad6dc 100644 --- a/Sources/Managers/FolderLocks/FolderLocksManager.swift +++ b/Sources/Managers/FolderLocks/FolderLocksManager.swift @@ -23,7 +23,7 @@ public class FolderLocksManager { public func getFolderLocks(queryParams: GetFolderLocksQueryParams, headers: GetFolderLocksHeaders = GetFolderLocksHeaders()) async throws -> FolderLocks { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["folder_id": Utils.Strings.toString(value: queryParams.folderId)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folder_locks")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folder_locks")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderLocks.deserialize(from: response.data) } @@ -40,7 +40,7 @@ public class FolderLocksManager { /// - Throws: The `GeneralError`. public func createFolderLock(requestBody: CreateFolderLockRequestBody, headers: CreateFolderLockHeaders = CreateFolderLockHeaders()) async throws -> FolderLock { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folder_locks")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folder_locks")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderLock.deserialize(from: response.data) } @@ -56,7 +56,7 @@ public class FolderLocksManager { /// - Throws: The `GeneralError`. public func deleteFolderLockById(folderLockId: String, headers: DeleteFolderLockByIdHeaders = DeleteFolderLockByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folder_locks/")\(folderLockId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folder_locks/")\(folderLockId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/FolderMetadata/FolderMetadataManager.swift b/Sources/Managers/FolderMetadata/FolderMetadataManager.swift index 8f296704..9ab84ff5 100644 --- a/Sources/Managers/FolderMetadata/FolderMetadataManager.swift +++ b/Sources/Managers/FolderMetadata/FolderMetadataManager.swift @@ -30,7 +30,7 @@ public class FolderMetadataManager { /// - Throws: The `GeneralError`. public func getFolderMetadata(folderId: String, headers: GetFolderMetadataHeaders = GetFolderMetadataHeaders()) async throws -> Metadatas { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Metadatas.deserialize(from: response.data) } @@ -58,7 +58,7 @@ public class FolderMetadataManager { /// - Throws: The `GeneralError`. public func getFolderMetadataById(folderId: String, scope: GetFolderMetadataByIdScope, templateKey: String, headers: GetFolderMetadataByIdHeaders = GetFolderMetadataByIdHeaders()) async throws -> MetadataFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataFull.deserialize(from: response.data) } @@ -94,7 +94,7 @@ public class FolderMetadataManager { /// - Throws: The `GeneralError`. public func createFolderMetadataById(folderId: String, scope: CreateFolderMetadataByIdScope, templateKey: String, requestBody: CreateFolderMetadataByIdRequestBody, headers: CreateFolderMetadataByIdHeaders = CreateFolderMetadataByIdHeaders()) async throws -> MetadataFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataFull.deserialize(from: response.data) } @@ -129,7 +129,7 @@ public class FolderMetadataManager { /// - Throws: The `GeneralError`. public func updateFolderMetadataById(folderId: String, scope: UpdateFolderMetadataByIdScope, templateKey: String, requestBody: [UpdateFolderMetadataByIdRequestBody], headers: UpdateFolderMetadataByIdHeaders = UpdateFolderMetadataByIdHeaders()) async throws -> MetadataFull { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataFull.deserialize(from: response.data) } @@ -155,7 +155,7 @@ public class FolderMetadataManager { /// - Throws: The `GeneralError`. public func deleteFolderMetadataById(folderId: String, scope: DeleteFolderMetadataByIdScope, templateKey: String, headers: DeleteFolderMetadataByIdHeaders = DeleteFolderMetadataByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/metadata/")\(scope)\("/")\(templateKey)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/FolderWatermarks/FolderWatermarksManager.swift b/Sources/Managers/FolderWatermarks/FolderWatermarksManager.swift index a6d563c3..aa863999 100644 --- a/Sources/Managers/FolderWatermarks/FolderWatermarksManager.swift +++ b/Sources/Managers/FolderWatermarks/FolderWatermarksManager.swift @@ -29,7 +29,7 @@ public class FolderWatermarksManager { /// - Throws: The `GeneralError`. public func getFolderWatermark(folderId: String, headers: GetFolderWatermarkHeaders = GetFolderWatermarkHeaders()) async throws -> Watermark { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/watermark")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/watermark")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Watermark.deserialize(from: response.data) } @@ -53,7 +53,7 @@ public class FolderWatermarksManager { /// - Throws: The `GeneralError`. public func updateFolderWatermark(folderId: String, requestBody: UpdateFolderWatermarkRequestBody, headers: UpdateFolderWatermarkHeaders = UpdateFolderWatermarkHeaders()) async throws -> Watermark { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/watermark")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/watermark")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Watermark.deserialize(from: response.data) } @@ -75,7 +75,7 @@ public class FolderWatermarksManager { /// - Throws: The `GeneralError`. public func deleteFolderWatermark(folderId: String, headers: DeleteFolderWatermarkHeaders = DeleteFolderWatermarkHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/watermark")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/watermark")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Folders/FoldersManager.swift b/Sources/Managers/Folders/FoldersManager.swift index 6d9a93cb..a706cecf 100644 --- a/Sources/Managers/Folders/FoldersManager.swift +++ b/Sources/Managers/Folders/FoldersManager.swift @@ -40,7 +40,7 @@ public class FoldersManager { public func getFolderById(folderId: String, queryParams: GetFolderByIdQueryParams = GetFolderByIdQueryParams(), headers: GetFolderByIdHeaders = GetFolderByIdHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "sort": Utils.Strings.toString(value: queryParams.sort), "direction": Utils.Strings.toString(value: queryParams.direction), "offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch), "boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -67,7 +67,7 @@ public class FoldersManager { public func updateFolderById(folderId: String, requestBody: UpdateFolderByIdRequestBody = UpdateFolderByIdRequestBody(), queryParams: UpdateFolderByIdQueryParams = UpdateFolderByIdQueryParams(), headers: UpdateFolderByIdHeaders = UpdateFolderByIdHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -92,7 +92,7 @@ public class FoldersManager { public func deleteFolderById(folderId: String, queryParams: DeleteFolderByIdQueryParams = DeleteFolderByIdQueryParams(), headers: DeleteFolderByIdHeaders = DeleteFolderByIdHeaders()) async throws { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["recursive": Utils.Strings.toString(value: queryParams.recursive)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", options: FetchOptions(method: "DELETE", params: queryParamsMap, headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", method: "DELETE", params: queryParamsMap, headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Retrieves a page of items in a folder. These items can be files, @@ -120,7 +120,7 @@ public class FoldersManager { public func getFolderItems(folderId: String, queryParams: GetFolderItemsQueryParams = GetFolderItemsQueryParams(), headers: GetFolderItemsHeaders = GetFolderItemsHeaders()) async throws -> Items { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "usemarker": Utils.Strings.toString(value: queryParams.usemarker), "marker": Utils.Strings.toString(value: queryParams.marker), "offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit), "sort": Utils.Strings.toString(value: queryParams.sort), "direction": Utils.Strings.toString(value: queryParams.direction)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/items")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/items")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Items.deserialize(from: response.data) } @@ -135,7 +135,7 @@ public class FoldersManager { public func createFolder(requestBody: CreateFolderRequestBody, queryParams: CreateFolderQueryParams = CreateFolderQueryParams(), headers: CreateFolderHeaders = CreateFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -162,7 +162,7 @@ public class FoldersManager { public func copyFolder(folderId: String, requestBody: CopyFolderRequestBody, queryParams: CopyFolderQueryParams = CopyFolderQueryParams(), headers: CopyFolderHeaders = CopyFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/copy")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/copy")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } diff --git a/Sources/Managers/Groups/GroupsManager.swift b/Sources/Managers/Groups/GroupsManager.swift index 605c3bce..6ba4a896 100644 --- a/Sources/Managers/Groups/GroupsManager.swift +++ b/Sources/Managers/Groups/GroupsManager.swift @@ -21,7 +21,7 @@ public class GroupsManager { public func getGroups(queryParams: GetGroupsQueryParams = GetGroupsQueryParams(), headers: GetGroupsHeaders = GetGroupsHeaders()) async throws -> Groups { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["filter_term": Utils.Strings.toString(value: queryParams.filterTerm), "fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Groups.deserialize(from: response.data) } @@ -37,7 +37,7 @@ public class GroupsManager { public func createGroup(requestBody: CreateGroupRequestBody, queryParams: CreateGroupQueryParams = CreateGroupQueryParams(), headers: CreateGroupHeaders = CreateGroupHeaders()) async throws -> GroupFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupFull.deserialize(from: response.data) } @@ -55,7 +55,7 @@ public class GroupsManager { public func getGroupById(groupId: String, queryParams: GetGroupByIdQueryParams = GetGroupByIdQueryParams(), headers: GetGroupByIdHeaders = GetGroupByIdHeaders()) async throws -> GroupFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupFull.deserialize(from: response.data) } @@ -74,7 +74,7 @@ public class GroupsManager { public func updateGroupById(groupId: String, requestBody: UpdateGroupByIdRequestBody = UpdateGroupByIdRequestBody(), queryParams: UpdateGroupByIdQueryParams = UpdateGroupByIdQueryParams(), headers: UpdateGroupByIdHeaders = UpdateGroupByIdHeaders()) async throws -> GroupFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupFull.deserialize(from: response.data) } @@ -88,7 +88,7 @@ public class GroupsManager { /// - Throws: The `GeneralError`. public func deleteGroupById(groupId: String, headers: DeleteGroupByIdHeaders = DeleteGroupByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/IntegrationMappings/IntegrationMappingsManager.swift b/Sources/Managers/IntegrationMappings/IntegrationMappingsManager.swift index 076a9b17..ce9d1a73 100644 --- a/Sources/Managers/IntegrationMappings/IntegrationMappingsManager.swift +++ b/Sources/Managers/IntegrationMappings/IntegrationMappingsManager.swift @@ -23,7 +23,7 @@ public class IntegrationMappingsManager { public func getSlackIntegrationMapping(queryParams: GetSlackIntegrationMappingQueryParams = GetSlackIntegrationMappingQueryParams(), headers: GetSlackIntegrationMappingHeaders = GetSlackIntegrationMappingHeaders()) async throws -> IntegrationMappings { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit), "partner_item_type": Utils.Strings.toString(value: queryParams.partnerItemType), "partner_item_id": Utils.Strings.toString(value: queryParams.partnerItemId), "box_item_id": Utils.Strings.toString(value: queryParams.boxItemId), "box_item_type": Utils.Strings.toString(value: queryParams.boxItemType), "is_manually_created": Utils.Strings.toString(value: queryParams.isManuallyCreated)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try IntegrationMappings.deserialize(from: response.data) } @@ -40,7 +40,7 @@ public class IntegrationMappingsManager { /// - Throws: The `GeneralError`. public func createSlackIntegrationMapping(requestBody: IntegrationMappingSlackCreateRequest, headers: CreateSlackIntegrationMappingHeaders = CreateSlackIntegrationMappingHeaders()) async throws -> IntegrationMapping { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try IntegrationMapping.deserialize(from: response.data) } @@ -59,7 +59,7 @@ public class IntegrationMappingsManager { /// - Throws: The `GeneralError`. public func updateSlackIntegrationMappingById(integrationMappingId: String, requestBody: UpdateSlackIntegrationMappingByIdRequestBody = UpdateSlackIntegrationMappingByIdRequestBody(), headers: UpdateSlackIntegrationMappingByIdHeaders = UpdateSlackIntegrationMappingByIdHeaders()) async throws -> IntegrationMapping { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack/")\(integrationMappingId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack/")\(integrationMappingId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try IntegrationMapping.deserialize(from: response.data) } @@ -76,7 +76,7 @@ public class IntegrationMappingsManager { /// - Throws: The `GeneralError`. public func deleteSlackIntegrationMappingById(integrationMappingId: String, headers: DeleteSlackIntegrationMappingByIdHeaders = DeleteSlackIntegrationMappingByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack/")\(integrationMappingId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/integration_mappings/slack/")\(integrationMappingId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Invites/InvitesManager.swift b/Sources/Managers/Invites/InvitesManager.swift index e4a23859..b0e09102 100644 --- a/Sources/Managers/Invites/InvitesManager.swift +++ b/Sources/Managers/Invites/InvitesManager.swift @@ -29,7 +29,7 @@ public class InvitesManager { public func createInvite(requestBody: CreateInviteRequestBody, queryParams: CreateInviteQueryParams = CreateInviteQueryParams(), headers: CreateInviteHeaders = CreateInviteHeaders()) async throws -> Invite { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/invites")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/invites")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Invite.deserialize(from: response.data) } @@ -45,7 +45,7 @@ public class InvitesManager { public func getInviteById(inviteId: String, queryParams: GetInviteByIdQueryParams = GetInviteByIdQueryParams(), headers: GetInviteByIdHeaders = GetInviteByIdHeaders()) async throws -> Invite { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/invites/")\(inviteId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/invites/")\(inviteId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Invite.deserialize(from: response.data) } diff --git a/Sources/Managers/LegalHoldPolicies/LegalHoldPoliciesManager.swift b/Sources/Managers/LegalHoldPolicies/LegalHoldPoliciesManager.swift index 0441ebf0..c320a3cf 100644 --- a/Sources/Managers/LegalHoldPolicies/LegalHoldPoliciesManager.swift +++ b/Sources/Managers/LegalHoldPolicies/LegalHoldPoliciesManager.swift @@ -21,7 +21,7 @@ public class LegalHoldPoliciesManager { public func getLegalHoldPolicies(queryParams: GetLegalHoldPoliciesQueryParams = GetLegalHoldPoliciesQueryParams(), headers: GetLegalHoldPoliciesHeaders = GetLegalHoldPoliciesHeaders()) async throws -> LegalHoldPolicies { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["policy_name": Utils.Strings.toString(value: queryParams.policyName), "fields": Utils.Strings.toString(value: queryParams.fields), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicies.deserialize(from: response.data) } @@ -34,7 +34,7 @@ public class LegalHoldPoliciesManager { /// - Throws: The `GeneralError`. public func createLegalHoldPolicy(requestBody: CreateLegalHoldPolicyRequestBody, headers: CreateLegalHoldPolicyHeaders = CreateLegalHoldPolicyHeaders()) async throws -> LegalHoldPolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicy.deserialize(from: response.data) } @@ -48,7 +48,7 @@ public class LegalHoldPoliciesManager { /// - Throws: The `GeneralError`. public func getLegalHoldPolicyById(legalHoldPolicyId: String, headers: GetLegalHoldPolicyByIdHeaders = GetLegalHoldPolicyByIdHeaders()) async throws -> LegalHoldPolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies/")\(legalHoldPolicyId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies/")\(legalHoldPolicyId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicy.deserialize(from: response.data) } @@ -63,7 +63,7 @@ public class LegalHoldPoliciesManager { /// - Throws: The `GeneralError`. public func updateLegalHoldPolicyById(legalHoldPolicyId: String, requestBody: UpdateLegalHoldPolicyByIdRequestBody = UpdateLegalHoldPolicyByIdRequestBody(), headers: UpdateLegalHoldPolicyByIdHeaders = UpdateLegalHoldPolicyByIdHeaders()) async throws -> LegalHoldPolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies/")\(legalHoldPolicyId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies/")\(legalHoldPolicyId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicy.deserialize(from: response.data) } @@ -79,7 +79,7 @@ public class LegalHoldPoliciesManager { /// - Throws: The `GeneralError`. public func deleteLegalHoldPolicyById(legalHoldPolicyId: String, headers: DeleteLegalHoldPolicyByIdHeaders = DeleteLegalHoldPolicyByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies/")\(legalHoldPolicyId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policies/")\(legalHoldPolicyId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/LegalHoldPolicyAssignments/LegalHoldPolicyAssignmentsManager.swift b/Sources/Managers/LegalHoldPolicyAssignments/LegalHoldPolicyAssignmentsManager.swift index 6286578b..19aa3f50 100644 --- a/Sources/Managers/LegalHoldPolicyAssignments/LegalHoldPolicyAssignmentsManager.swift +++ b/Sources/Managers/LegalHoldPolicyAssignments/LegalHoldPolicyAssignmentsManager.swift @@ -20,7 +20,7 @@ public class LegalHoldPolicyAssignmentsManager { public func getLegalHoldPolicyAssignments(queryParams: GetLegalHoldPolicyAssignmentsQueryParams, headers: GetLegalHoldPolicyAssignmentsHeaders = GetLegalHoldPolicyAssignmentsHeaders()) async throws -> LegalHoldPolicyAssignments { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["policy_id": Utils.Strings.toString(value: queryParams.policyId), "assign_to_type": Utils.Strings.toString(value: queryParams.assignToType), "assign_to_id": Utils.Strings.toString(value: queryParams.assignToId), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit), "fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicyAssignments.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class LegalHoldPolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func createLegalHoldPolicyAssignment(requestBody: CreateLegalHoldPolicyAssignmentRequestBody, headers: CreateLegalHoldPolicyAssignmentHeaders = CreateLegalHoldPolicyAssignmentHeaders()) async throws -> LegalHoldPolicyAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicyAssignment.deserialize(from: response.data) } @@ -47,7 +47,7 @@ public class LegalHoldPolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func getLegalHoldPolicyAssignmentById(legalHoldPolicyAssignmentId: String, headers: GetLegalHoldPolicyAssignmentByIdHeaders = GetLegalHoldPolicyAssignmentByIdHeaders()) async throws -> LegalHoldPolicyAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments/")\(legalHoldPolicyAssignmentId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments/")\(legalHoldPolicyAssignmentId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try LegalHoldPolicyAssignment.deserialize(from: response.data) } @@ -63,7 +63,7 @@ public class LegalHoldPolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func deleteLegalHoldPolicyAssignmentById(legalHoldPolicyAssignmentId: String, headers: DeleteLegalHoldPolicyAssignmentByIdHeaders = DeleteLegalHoldPolicyAssignmentByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments/")\(legalHoldPolicyAssignmentId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments/")\(legalHoldPolicyAssignmentId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Get a list of files with current file versions for a legal hold @@ -96,7 +96,7 @@ public class LegalHoldPolicyAssignmentsManager { public func getLegalHoldPolicyAssignmentFileOnHold(legalHoldPolicyAssignmentId: String, queryParams: GetLegalHoldPolicyAssignmentFileOnHoldQueryParams = GetLegalHoldPolicyAssignmentFileOnHoldQueryParams(), headers: GetLegalHoldPolicyAssignmentFileOnHoldHeaders = GetLegalHoldPolicyAssignmentFileOnHoldHeaders()) async throws -> FilesOnHold { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit), "fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments/")\(legalHoldPolicyAssignmentId)\("/files_on_hold")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/legal_hold_policy_assignments/")\(legalHoldPolicyAssignmentId)\("/files_on_hold")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FilesOnHold.deserialize(from: response.data) } diff --git a/Sources/Managers/ListCollaborations/ListCollaborationsManager.swift b/Sources/Managers/ListCollaborations/ListCollaborationsManager.swift index 2abb9928..9e74a112 100644 --- a/Sources/Managers/ListCollaborations/ListCollaborationsManager.swift +++ b/Sources/Managers/ListCollaborations/ListCollaborationsManager.swift @@ -30,7 +30,7 @@ public class ListCollaborationsManager { public func getFileCollaborations(fileId: String, queryParams: GetFileCollaborationsQueryParams = GetFileCollaborationsQueryParams(), headers: GetFileCollaborationsHeaders = GetFileCollaborationsHeaders()) async throws -> Collaborations { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "marker": Utils.Strings.toString(value: queryParams.marker)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/collaborations")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/collaborations")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaborations.deserialize(from: response.data) } @@ -54,7 +54,7 @@ public class ListCollaborationsManager { public func getFolderCollaborations(folderId: String, queryParams: GetFolderCollaborationsQueryParams = GetFolderCollaborationsQueryParams(), headers: GetFolderCollaborationsHeaders = GetFolderCollaborationsHeaders()) async throws -> Collaborations { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/collaborations")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/collaborations")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaborations.deserialize(from: response.data) } @@ -68,7 +68,7 @@ public class ListCollaborationsManager { public func getCollaborations(queryParams: GetCollaborationsQueryParams, headers: GetCollaborationsHeaders = GetCollaborationsHeaders()) async throws -> Collaborations { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["status": Utils.Strings.toString(value: queryParams.status), "fields": Utils.Strings.toString(value: queryParams.fields), "offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaborations.deserialize(from: response.data) } @@ -88,7 +88,7 @@ public class ListCollaborationsManager { public func getGroupCollaborations(groupId: String, queryParams: GetGroupCollaborationsQueryParams = GetGroupCollaborationsQueryParams(), headers: GetGroupCollaborationsHeaders = GetGroupCollaborationsHeaders()) async throws -> Collaborations { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)\("/collaborations")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)\("/collaborations")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaborations.deserialize(from: response.data) } diff --git a/Sources/Managers/Memberships/MembershipsManager.swift b/Sources/Managers/Memberships/MembershipsManager.swift index c2ba788b..6b170746 100644 --- a/Sources/Managers/Memberships/MembershipsManager.swift +++ b/Sources/Managers/Memberships/MembershipsManager.swift @@ -24,7 +24,7 @@ public class MembershipsManager { public func getUserMemberships(userId: String, queryParams: GetUserMembershipsQueryParams = GetUserMembershipsQueryParams(), headers: GetUserMembershipsHeaders = GetUserMembershipsHeaders()) async throws -> GroupMemberships { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/memberships")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/memberships")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupMemberships.deserialize(from: response.data) } @@ -42,7 +42,7 @@ public class MembershipsManager { public func getGroupMemberships(groupId: String, queryParams: GetGroupMembershipsQueryParams = GetGroupMembershipsQueryParams(), headers: GetGroupMembershipsHeaders = GetGroupMembershipsHeaders()) async throws -> GroupMemberships { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)\("/memberships")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/")\(groupId)\("/memberships")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupMemberships.deserialize(from: response.data) } @@ -58,7 +58,7 @@ public class MembershipsManager { public func createGroupMembership(requestBody: CreateGroupMembershipRequestBody, queryParams: CreateGroupMembershipQueryParams = CreateGroupMembershipQueryParams(), headers: CreateGroupMembershipHeaders = CreateGroupMembershipHeaders()) async throws -> GroupMembership { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupMembership.deserialize(from: response.data) } @@ -76,7 +76,7 @@ public class MembershipsManager { public func getGroupMembershipById(groupMembershipId: String, queryParams: GetGroupMembershipByIdQueryParams = GetGroupMembershipByIdQueryParams(), headers: GetGroupMembershipByIdHeaders = GetGroupMembershipByIdHeaders()) async throws -> GroupMembership { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships/")\(groupMembershipId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships/")\(groupMembershipId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupMembership.deserialize(from: response.data) } @@ -95,7 +95,7 @@ public class MembershipsManager { public func updateGroupMembershipById(groupMembershipId: String, requestBody: UpdateGroupMembershipByIdRequestBody = UpdateGroupMembershipByIdRequestBody(), queryParams: UpdateGroupMembershipByIdQueryParams = UpdateGroupMembershipByIdQueryParams(), headers: UpdateGroupMembershipByIdHeaders = UpdateGroupMembershipByIdHeaders()) async throws -> GroupMembership { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships/")\(groupMembershipId)", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships/")\(groupMembershipId)", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try GroupMembership.deserialize(from: response.data) } @@ -110,7 +110,7 @@ public class MembershipsManager { /// - Throws: The `GeneralError`. public func deleteGroupMembershipById(groupMembershipId: String, headers: DeleteGroupMembershipByIdHeaders = DeleteGroupMembershipByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships/")\(groupMembershipId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/group_memberships/")\(groupMembershipId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/MetadataCascadePolicies/MetadataCascadePoliciesManager.swift b/Sources/Managers/MetadataCascadePolicies/MetadataCascadePoliciesManager.swift index 031a4f12..e9da64a2 100644 --- a/Sources/Managers/MetadataCascadePolicies/MetadataCascadePoliciesManager.swift +++ b/Sources/Managers/MetadataCascadePolicies/MetadataCascadePoliciesManager.swift @@ -22,7 +22,7 @@ public class MetadataCascadePoliciesManager { public func getMetadataCascadePolicies(queryParams: GetMetadataCascadePoliciesQueryParams, headers: GetMetadataCascadePoliciesHeaders = GetMetadataCascadePoliciesHeaders()) async throws -> MetadataCascadePolicies { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["folder_id": Utils.Strings.toString(value: queryParams.folderId), "owner_enterprise_id": Utils.Strings.toString(value: queryParams.ownerEnterpriseId), "marker": Utils.Strings.toString(value: queryParams.marker), "offset": Utils.Strings.toString(value: queryParams.offset)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataCascadePolicies.deserialize(from: response.data) } @@ -40,7 +40,7 @@ public class MetadataCascadePoliciesManager { /// - Throws: The `GeneralError`. public func createMetadataCascadePolicy(requestBody: CreateMetadataCascadePolicyRequestBody, headers: CreateMetadataCascadePolicyHeaders = CreateMetadataCascadePolicyHeaders()) async throws -> MetadataCascadePolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataCascadePolicy.deserialize(from: response.data) } @@ -54,7 +54,7 @@ public class MetadataCascadePoliciesManager { /// - Throws: The `GeneralError`. public func getMetadataCascadePolicyById(metadataCascadePolicyId: String, headers: GetMetadataCascadePolicyByIdHeaders = GetMetadataCascadePolicyByIdHeaders()) async throws -> MetadataCascadePolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies/")\(metadataCascadePolicyId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies/")\(metadataCascadePolicyId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataCascadePolicy.deserialize(from: response.data) } @@ -67,7 +67,7 @@ public class MetadataCascadePoliciesManager { /// - Throws: The `GeneralError`. public func deleteMetadataCascadePolicyById(metadataCascadePolicyId: String, headers: DeleteMetadataCascadePolicyByIdHeaders = DeleteMetadataCascadePolicyByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies/")\(metadataCascadePolicyId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies/")\(metadataCascadePolicyId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Force the metadata on a folder with a metadata cascade policy to be applied to @@ -83,7 +83,7 @@ public class MetadataCascadePoliciesManager { /// - Throws: The `GeneralError`. public func applyMetadataCascadePolicy(metadataCascadePolicyId: String, requestBody: ApplyMetadataCascadePolicyRequestBody, headers: ApplyMetadataCascadePolicyHeaders = ApplyMetadataCascadePolicyHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies/")\(metadataCascadePolicyId)\("/apply")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_cascade_policies/")\(metadataCascadePolicyId)\("/apply")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/MetadataTemplates/MetadataTemplatesManager.swift b/Sources/Managers/MetadataTemplates/MetadataTemplatesManager.swift index 867c8273..7c69a138 100644 --- a/Sources/Managers/MetadataTemplates/MetadataTemplatesManager.swift +++ b/Sources/Managers/MetadataTemplates/MetadataTemplatesManager.swift @@ -21,7 +21,7 @@ public class MetadataTemplatesManager { public func getMetadataTemplatesByInstanceId(queryParams: GetMetadataTemplatesByInstanceIdQueryParams, headers: GetMetadataTemplatesByInstanceIdHeaders = GetMetadataTemplatesByInstanceIdHeaders()) async throws -> MetadataTemplates { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["metadata_instance_id": Utils.Strings.toString(value: queryParams.metadataInstanceId)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplates.deserialize(from: response.data) } @@ -40,7 +40,7 @@ public class MetadataTemplatesManager { /// - Throws: The `GeneralError`. public func getMetadataTemplate(scope: GetMetadataTemplateScope, templateKey: String, headers: GetMetadataTemplateHeaders = GetMetadataTemplateHeaders()) async throws -> MetadataTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(scope)\("/")\(templateKey)\("/schema")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(scope)\("/")\(templateKey)\("/schema")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplate.deserialize(from: response.data) } @@ -63,7 +63,7 @@ public class MetadataTemplatesManager { /// - Throws: The `GeneralError`. public func updateMetadataTemplate(scope: UpdateMetadataTemplateScope, templateKey: String, requestBody: [UpdateMetadataTemplateRequestBody], headers: UpdateMetadataTemplateHeaders = UpdateMetadataTemplateHeaders()) async throws -> MetadataTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(scope)\("/")\(templateKey)\("/schema")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(scope)\("/")\(templateKey)\("/schema")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplate.deserialize(from: response.data) } @@ -79,7 +79,7 @@ public class MetadataTemplatesManager { /// - Throws: The `GeneralError`. public func deleteMetadataTemplate(scope: DeleteMetadataTemplateScope, templateKey: String, headers: DeleteMetadataTemplateHeaders = DeleteMetadataTemplateHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(scope)\("/")\(templateKey)\("/schema")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(scope)\("/")\(templateKey)\("/schema")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Retrieves a metadata template by its ID. @@ -92,7 +92,7 @@ public class MetadataTemplatesManager { /// - Throws: The `GeneralError`. public func getMetadataTemplateById(templateId: String, headers: GetMetadataTemplateByIdHeaders = GetMetadataTemplateByIdHeaders()) async throws -> MetadataTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(templateId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/")\(templateId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplate.deserialize(from: response.data) } @@ -107,7 +107,7 @@ public class MetadataTemplatesManager { public func getGlobalMetadataTemplates(queryParams: GetGlobalMetadataTemplatesQueryParams = GetGlobalMetadataTemplatesQueryParams(), headers: GetGlobalMetadataTemplatesHeaders = GetGlobalMetadataTemplatesHeaders()) async throws -> MetadataTemplates { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/global")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/global")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplates.deserialize(from: response.data) } @@ -122,7 +122,7 @@ public class MetadataTemplatesManager { public func getEnterpriseMetadataTemplates(queryParams: GetEnterpriseMetadataTemplatesQueryParams = GetEnterpriseMetadataTemplatesQueryParams(), headers: GetEnterpriseMetadataTemplatesHeaders = GetEnterpriseMetadataTemplatesHeaders()) async throws -> MetadataTemplates { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/enterprise")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplates.deserialize(from: response.data) } @@ -136,7 +136,7 @@ public class MetadataTemplatesManager { /// - Throws: The `GeneralError`. public func createMetadataTemplate(requestBody: CreateMetadataTemplateRequestBody, headers: CreateMetadataTemplateHeaders = CreateMetadataTemplateHeaders()) async throws -> MetadataTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/schema")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_templates/schema")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataTemplate.deserialize(from: response.data) } diff --git a/Sources/Managers/RecentItems/RecentItemsManager.swift b/Sources/Managers/RecentItems/RecentItemsManager.swift index 98e7b4e0..f51ad209 100644 --- a/Sources/Managers/RecentItems/RecentItemsManager.swift +++ b/Sources/Managers/RecentItems/RecentItemsManager.swift @@ -22,7 +22,7 @@ public class RecentItemsManager { public func getRecentItems(queryParams: GetRecentItemsQueryParams = GetRecentItemsQueryParams(), headers: GetRecentItemsHeaders = GetRecentItemsHeaders()) async throws -> RecentItems { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "marker": Utils.Strings.toString(value: queryParams.marker)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/recent_items")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/recent_items")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RecentItems.deserialize(from: response.data) } diff --git a/Sources/Managers/RetentionPolicies/RetentionPoliciesManager.swift b/Sources/Managers/RetentionPolicies/RetentionPoliciesManager.swift index 88b79078..3780c8d7 100644 --- a/Sources/Managers/RetentionPolicies/RetentionPoliciesManager.swift +++ b/Sources/Managers/RetentionPolicies/RetentionPoliciesManager.swift @@ -20,7 +20,7 @@ public class RetentionPoliciesManager { public func getRetentionPolicies(queryParams: GetRetentionPoliciesQueryParams = GetRetentionPoliciesQueryParams(), headers: GetRetentionPoliciesHeaders = GetRetentionPoliciesHeaders()) async throws -> RetentionPolicies { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["policy_name": Utils.Strings.toString(value: queryParams.policyName), "policy_type": Utils.Strings.toString(value: queryParams.policyType), "created_by_user_id": Utils.Strings.toString(value: queryParams.createdByUserId), "fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "marker": Utils.Strings.toString(value: queryParams.marker)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicies.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class RetentionPoliciesManager { /// - Throws: The `GeneralError`. public func createRetentionPolicy(requestBody: CreateRetentionPolicyRequestBody, headers: CreateRetentionPolicyHeaders = CreateRetentionPolicyHeaders()) async throws -> RetentionPolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicy.deserialize(from: response.data) } @@ -49,7 +49,7 @@ public class RetentionPoliciesManager { public func getRetentionPolicyById(retentionPolicyId: String, queryParams: GetRetentionPolicyByIdQueryParams = GetRetentionPolicyByIdQueryParams(), headers: GetRetentionPolicyByIdHeaders = GetRetentionPolicyByIdHeaders()) async throws -> RetentionPolicy { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicy.deserialize(from: response.data) } @@ -64,7 +64,7 @@ public class RetentionPoliciesManager { /// - Throws: The `GeneralError`. public func updateRetentionPolicyById(retentionPolicyId: String, requestBody: UpdateRetentionPolicyByIdRequestBody = UpdateRetentionPolicyByIdRequestBody(), headers: UpdateRetentionPolicyByIdHeaders = UpdateRetentionPolicyByIdHeaders()) async throws -> RetentionPolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicy.deserialize(from: response.data) } @@ -77,7 +77,7 @@ public class RetentionPoliciesManager { /// - Throws: The `GeneralError`. public func deleteRetentionPolicyById(retentionPolicyId: String, headers: DeleteRetentionPolicyByIdHeaders = DeleteRetentionPolicyByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/RetentionPolicyAssignments/RetentionPolicyAssignmentsManager.swift b/Sources/Managers/RetentionPolicyAssignments/RetentionPolicyAssignmentsManager.swift index f37c743f..a3c3d0e8 100644 --- a/Sources/Managers/RetentionPolicyAssignments/RetentionPolicyAssignmentsManager.swift +++ b/Sources/Managers/RetentionPolicyAssignments/RetentionPolicyAssignmentsManager.swift @@ -23,7 +23,7 @@ public class RetentionPolicyAssignmentsManager { public func getRetentionPolicyAssignments(retentionPolicyId: String, queryParams: GetRetentionPolicyAssignmentsQueryParams = GetRetentionPolicyAssignmentsQueryParams(), headers: GetRetentionPolicyAssignmentsHeaders = GetRetentionPolicyAssignmentsHeaders()) async throws -> RetentionPolicyAssignments { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["type": Utils.Strings.toString(value: queryParams.type), "fields": Utils.Strings.toString(value: queryParams.fields), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)\("/assignments")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policies/")\(retentionPolicyId)\("/assignments")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicyAssignments.deserialize(from: response.data) } @@ -36,7 +36,7 @@ public class RetentionPolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func createRetentionPolicyAssignment(requestBody: CreateRetentionPolicyAssignmentRequestBody, headers: CreateRetentionPolicyAssignmentHeaders = CreateRetentionPolicyAssignmentHeaders()) async throws -> RetentionPolicyAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicyAssignment.deserialize(from: response.data) } @@ -52,7 +52,7 @@ public class RetentionPolicyAssignmentsManager { public func getRetentionPolicyAssignmentById(retentionPolicyAssignmentId: String, queryParams: GetRetentionPolicyAssignmentByIdQueryParams = GetRetentionPolicyAssignmentByIdQueryParams(), headers: GetRetentionPolicyAssignmentByIdHeaders = GetRetentionPolicyAssignmentByIdHeaders()) async throws -> RetentionPolicyAssignment { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments/")\(retentionPolicyAssignmentId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments/")\(retentionPolicyAssignmentId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try RetentionPolicyAssignment.deserialize(from: response.data) } @@ -66,7 +66,7 @@ public class RetentionPolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func deleteRetentionPolicyAssignmentById(retentionPolicyAssignmentId: String, headers: DeleteRetentionPolicyAssignmentByIdHeaders = DeleteRetentionPolicyAssignmentByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments/")\(retentionPolicyAssignmentId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments/")\(retentionPolicyAssignmentId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Returns a list of files under retention for a retention policy assignment. @@ -81,7 +81,7 @@ public class RetentionPolicyAssignmentsManager { public func getFilesUnderRetentionPolicyAssignment(retentionPolicyAssignmentId: String, queryParams: GetFilesUnderRetentionPolicyAssignmentQueryParams = GetFilesUnderRetentionPolicyAssignmentQueryParams(), headers: GetFilesUnderRetentionPolicyAssignmentHeaders = GetFilesUnderRetentionPolicyAssignmentHeaders()) async throws -> FilesUnderRetention { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments/")\(retentionPolicyAssignmentId)\("/files_under_retention")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/retention_policy_assignments/")\(retentionPolicyAssignmentId)\("/files_under_retention")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FilesUnderRetention.deserialize(from: response.data) } diff --git a/Sources/Managers/Search/SearchManager.swift b/Sources/Managers/Search/SearchManager.swift index 73b1b048..a794fc54 100644 --- a/Sources/Managers/Search/SearchManager.swift +++ b/Sources/Managers/Search/SearchManager.swift @@ -24,7 +24,7 @@ public class SearchManager { /// - Throws: The `GeneralError`. public func searchByMetadataQuery(requestBody: MetadataQuery, headers: SearchByMetadataQueryHeaders = SearchByMetadataQueryHeaders()) async throws -> MetadataQueryResults { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_queries/execute_read")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/metadata_queries/execute_read")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try MetadataQueryResults.deserialize(from: response.data) } @@ -39,7 +39,7 @@ public class SearchManager { public func searchForContent(queryParams: SearchForContentQueryParams = SearchForContentQueryParams(), headers: SearchForContentHeaders = SearchForContentHeaders()) async throws -> SearchResultsOrSearchResultsWithSharedLinks { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["query": Utils.Strings.toString(value: queryParams.query), "scope": Utils.Strings.toString(value: queryParams.scope), "file_extensions": Utils.Strings.toString(value: queryParams.fileExtensions), "created_at_range": Utils.Strings.toString(value: queryParams.createdAtRange), "updated_at_range": Utils.Strings.toString(value: queryParams.updatedAtRange), "size_range": Utils.Strings.toString(value: queryParams.sizeRange), "owner_user_ids": Utils.Strings.toString(value: queryParams.ownerUserIds), "recent_updater_user_ids": Utils.Strings.toString(value: queryParams.recentUpdaterUserIds), "ancestor_folder_ids": Utils.Strings.toString(value: queryParams.ancestorFolderIds), "content_types": Utils.Strings.toString(value: queryParams.contentTypes), "type": Utils.Strings.toString(value: queryParams.type), "trash_content": Utils.Strings.toString(value: queryParams.trashContent), "mdfilters": Utils.Strings.toString(value: queryParams.mdfilters), "sort": Utils.Strings.toString(value: queryParams.sort), "direction": Utils.Strings.toString(value: queryParams.direction), "limit": Utils.Strings.toString(value: queryParams.limit), "include_recent_shared_links": Utils.Strings.toString(value: queryParams.includeRecentSharedLinks), "fields": Utils.Strings.toString(value: queryParams.fields), "offset": Utils.Strings.toString(value: queryParams.offset), "deleted_user_ids": Utils.Strings.toString(value: queryParams.deletedUserIds), "deleted_at_range": Utils.Strings.toString(value: queryParams.deletedAtRange)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/search")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/search")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SearchResultsOrSearchResultsWithSharedLinks.deserialize(from: response.data) } diff --git a/Sources/Managers/SessionTermination/SessionTerminationManager.swift b/Sources/Managers/SessionTermination/SessionTerminationManager.swift index 0eeea128..1ed23f2b 100644 --- a/Sources/Managers/SessionTermination/SessionTerminationManager.swift +++ b/Sources/Managers/SessionTermination/SessionTerminationManager.swift @@ -22,7 +22,7 @@ public class SessionTerminationManager { /// - Throws: The `GeneralError`. public func terminateUsersSessions(requestBody: TerminateUsersSessionsRequestBody, headers: TerminateUsersSessionsHeaders = TerminateUsersSessionsHeaders()) async throws -> SessionTerminationMessage { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/terminate_sessions")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/terminate_sessions")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SessionTerminationMessage.deserialize(from: response.data) } @@ -38,7 +38,7 @@ public class SessionTerminationManager { /// - Throws: The `GeneralError`. public func terminateGroupsSessions(requestBody: TerminateGroupsSessionsRequestBody, headers: TerminateGroupsSessionsHeaders = TerminateGroupsSessionsHeaders()) async throws -> SessionTerminationMessage { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/terminate_sessions")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/groups/terminate_sessions")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SessionTerminationMessage.deserialize(from: response.data) } diff --git a/Sources/Managers/SharedLinksFiles/SharedLinksFilesManager.swift b/Sources/Managers/SharedLinksFiles/SharedLinksFilesManager.swift index 0c41ad8c..0255c267 100644 --- a/Sources/Managers/SharedLinksFiles/SharedLinksFilesManager.swift +++ b/Sources/Managers/SharedLinksFiles/SharedLinksFilesManager.swift @@ -29,7 +29,7 @@ public class SharedLinksFilesManager { public func findFileForSharedLink(queryParams: FindFileForSharedLinkQueryParams = FindFileForSharedLinkQueryParams(), headers: FindFileForSharedLinkHeaders) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch), "boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shared_items")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shared_items")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -51,7 +51,7 @@ public class SharedLinksFilesManager { public func getSharedLinkForFile(fileId: String, queryParams: GetSharedLinkForFileQueryParams, headers: GetSharedLinkForFileHeaders = GetSharedLinkForFileHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#get_shared_link")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#get_shared_link")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -74,7 +74,7 @@ public class SharedLinksFilesManager { public func addShareLinkToFile(fileId: String, requestBody: AddShareLinkToFileRequestBody = AddShareLinkToFileRequestBody(), queryParams: AddShareLinkToFileQueryParams, headers: AddShareLinkToFileHeaders = AddShareLinkToFileHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#add_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#add_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -97,7 +97,7 @@ public class SharedLinksFilesManager { public func updateSharedLinkOnFile(fileId: String, requestBody: UpdateSharedLinkOnFileRequestBody = UpdateSharedLinkOnFileRequestBody(), queryParams: UpdateSharedLinkOnFileQueryParams, headers: UpdateSharedLinkOnFileHeaders = UpdateSharedLinkOnFileHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#update_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#update_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } @@ -120,7 +120,7 @@ public class SharedLinksFilesManager { public func removeSharedLinkFromFile(fileId: String, requestBody: RemoveSharedLinkFromFileRequestBody = RemoveSharedLinkFromFileRequestBody(), queryParams: RemoveSharedLinkFromFileQueryParams, headers: RemoveSharedLinkFromFileHeaders = RemoveSharedLinkFromFileHeaders()) async throws -> FileFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#remove_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("#remove_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FileFull.deserialize(from: response.data) } diff --git a/Sources/Managers/SharedLinksFolders/SharedLinksFoldersManager.swift b/Sources/Managers/SharedLinksFolders/SharedLinksFoldersManager.swift index 33153ded..1b5696b4 100644 --- a/Sources/Managers/SharedLinksFolders/SharedLinksFoldersManager.swift +++ b/Sources/Managers/SharedLinksFolders/SharedLinksFoldersManager.swift @@ -26,7 +26,7 @@ public class SharedLinksFoldersManager { public func findFolderForSharedLink(queryParams: FindFolderForSharedLinkQueryParams = FindFolderForSharedLinkQueryParams(), headers: FindFolderForSharedLinkHeaders) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch), "boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shared_items#folders")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shared_items#folders")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -51,7 +51,7 @@ public class SharedLinksFoldersManager { public func getSharedLinkForFolder(folderId: String, queryParams: GetSharedLinkForFolderQueryParams, headers: GetSharedLinkForFolderHeaders = GetSharedLinkForFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#get_shared_link")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#get_shared_link")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -77,7 +77,7 @@ public class SharedLinksFoldersManager { public func addShareLinkToFolder(folderId: String, requestBody: AddShareLinkToFolderRequestBody = AddShareLinkToFolderRequestBody(), queryParams: AddShareLinkToFolderQueryParams, headers: AddShareLinkToFolderHeaders = AddShareLinkToFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#add_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#add_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -103,7 +103,7 @@ public class SharedLinksFoldersManager { public func updateSharedLinkOnFolder(folderId: String, requestBody: UpdateSharedLinkOnFolderRequestBody = UpdateSharedLinkOnFolderRequestBody(), queryParams: UpdateSharedLinkOnFolderQueryParams, headers: UpdateSharedLinkOnFolderHeaders = UpdateSharedLinkOnFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#update_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#update_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } @@ -129,7 +129,7 @@ public class SharedLinksFoldersManager { public func removeSharedLinkFromFolder(folderId: String, requestBody: RemoveSharedLinkFromFolderRequestBody = RemoveSharedLinkFromFolderRequestBody(), queryParams: RemoveSharedLinkFromFolderQueryParams, headers: RemoveSharedLinkFromFolderHeaders = RemoveSharedLinkFromFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#remove_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("#remove_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } diff --git a/Sources/Managers/SharedLinksWebLinks/SharedLinksWebLinksManager.swift b/Sources/Managers/SharedLinksWebLinks/SharedLinksWebLinksManager.swift index 5f6b5183..da9134d4 100644 --- a/Sources/Managers/SharedLinksWebLinks/SharedLinksWebLinksManager.swift +++ b/Sources/Managers/SharedLinksWebLinks/SharedLinksWebLinksManager.swift @@ -26,7 +26,7 @@ public class SharedLinksWebLinksManager { public func findWebLinkForSharedLink(queryParams: FindWebLinkForSharedLinkQueryParams = FindWebLinkForSharedLinkQueryParams(), headers: FindWebLinkForSharedLinkHeaders) async throws -> WebLink { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-none-match": Utils.Strings.toString(value: headers.ifNoneMatch), "boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shared_items#web_links")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shared_items#web_links")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -42,7 +42,7 @@ public class SharedLinksWebLinksManager { public func getSharedLinkForWebLink(webLinkId: String, queryParams: GetSharedLinkForWebLinkQueryParams, headers: GetSharedLinkForWebLinkHeaders = GetSharedLinkForWebLinkHeaders()) async throws -> WebLink { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#get_shared_link")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#get_shared_link")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -59,7 +59,7 @@ public class SharedLinksWebLinksManager { public func addShareLinkToWebLink(webLinkId: String, requestBody: AddShareLinkToWebLinkRequestBody = AddShareLinkToWebLinkRequestBody(), queryParams: AddShareLinkToWebLinkQueryParams, headers: AddShareLinkToWebLinkHeaders = AddShareLinkToWebLinkHeaders()) async throws -> WebLink { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#add_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#add_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -76,7 +76,7 @@ public class SharedLinksWebLinksManager { public func updateSharedLinkOnWebLink(webLinkId: String, requestBody: UpdateSharedLinkOnWebLinkRequestBody = UpdateSharedLinkOnWebLinkRequestBody(), queryParams: UpdateSharedLinkOnWebLinkQueryParams, headers: UpdateSharedLinkOnWebLinkHeaders = UpdateSharedLinkOnWebLinkHeaders()) async throws -> WebLink { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#update_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#update_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -93,7 +93,7 @@ public class SharedLinksWebLinksManager { public func removeSharedLinkFromWebLink(webLinkId: String, requestBody: RemoveSharedLinkFromWebLinkRequestBody = RemoveSharedLinkFromWebLinkRequestBody(), queryParams: RemoveSharedLinkFromWebLinkQueryParams, headers: RemoveSharedLinkFromWebLinkHeaders = RemoveSharedLinkFromWebLinkHeaders()) async throws -> WebLink { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#remove_shared_link")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("#remove_shared_link")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } diff --git a/Sources/Managers/ShieldInformationBarrierReports/ShieldInformationBarrierReportsManager.swift b/Sources/Managers/ShieldInformationBarrierReports/ShieldInformationBarrierReportsManager.swift index 102ca361..f5bd510f 100644 --- a/Sources/Managers/ShieldInformationBarrierReports/ShieldInformationBarrierReportsManager.swift +++ b/Sources/Managers/ShieldInformationBarrierReports/ShieldInformationBarrierReportsManager.swift @@ -20,7 +20,7 @@ public class ShieldInformationBarrierReportsManager { public func getShieldInformationBarrierReports(queryParams: GetShieldInformationBarrierReportsQueryParams, headers: GetShieldInformationBarrierReportsHeaders = GetShieldInformationBarrierReportsHeaders()) async throws -> ShieldInformationBarrierReports { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["shield_information_barrier_id": Utils.Strings.toString(value: queryParams.shieldInformationBarrierId), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_reports")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_reports")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierReports.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class ShieldInformationBarrierReportsManager { /// - Throws: The `GeneralError`. public func createShieldInformationBarrierReport(requestBody: ShieldInformationBarrierReference, headers: CreateShieldInformationBarrierReportHeaders = CreateShieldInformationBarrierReportHeaders()) async throws -> ShieldInformationBarrierReport { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_reports")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_reports")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierReport.deserialize(from: response.data) } @@ -47,7 +47,7 @@ public class ShieldInformationBarrierReportsManager { /// - Throws: The `GeneralError`. public func getShieldInformationBarrierReportById(shieldInformationBarrierReportId: String, headers: GetShieldInformationBarrierReportByIdHeaders = GetShieldInformationBarrierReportByIdHeaders()) async throws -> ShieldInformationBarrierReport { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_reports/")\(shieldInformationBarrierReportId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_reports/")\(shieldInformationBarrierReportId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierReport.deserialize(from: response.data) } diff --git a/Sources/Managers/ShieldInformationBarrierSegmentMembers/ShieldInformationBarrierSegmentMembersManager.swift b/Sources/Managers/ShieldInformationBarrierSegmentMembers/ShieldInformationBarrierSegmentMembersManager.swift index 54db293d..29759a0b 100644 --- a/Sources/Managers/ShieldInformationBarrierSegmentMembers/ShieldInformationBarrierSegmentMembersManager.swift +++ b/Sources/Managers/ShieldInformationBarrierSegmentMembers/ShieldInformationBarrierSegmentMembersManager.swift @@ -21,7 +21,7 @@ public class ShieldInformationBarrierSegmentMembersManager { /// - Throws: The `GeneralError`. public func getShieldInformationBarrierSegmentMemberById(shieldInformationBarrierSegmentMemberId: String, headers: GetShieldInformationBarrierSegmentMemberByIdHeaders = GetShieldInformationBarrierSegmentMemberByIdHeaders()) async throws -> ShieldInformationBarrierSegmentMember { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members/")\(shieldInformationBarrierSegmentMemberId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members/")\(shieldInformationBarrierSegmentMemberId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegmentMember.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class ShieldInformationBarrierSegmentMembersManager { /// - Throws: The `GeneralError`. public func deleteShieldInformationBarrierSegmentMemberById(shieldInformationBarrierSegmentMemberId: String, headers: DeleteShieldInformationBarrierSegmentMemberByIdHeaders = DeleteShieldInformationBarrierSegmentMemberByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members/")\(shieldInformationBarrierSegmentMemberId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members/")\(shieldInformationBarrierSegmentMemberId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Lists shield information barrier segment members @@ -49,7 +49,7 @@ public class ShieldInformationBarrierSegmentMembersManager { public func getShieldInformationBarrierSegmentMembers(queryParams: GetShieldInformationBarrierSegmentMembersQueryParams, headers: GetShieldInformationBarrierSegmentMembersHeaders = GetShieldInformationBarrierSegmentMembersHeaders()) async throws -> ShieldInformationBarrierSegmentMembers { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["shield_information_barrier_segment_id": Utils.Strings.toString(value: queryParams.shieldInformationBarrierSegmentId), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegmentMembers.deserialize(from: response.data) } @@ -62,7 +62,7 @@ public class ShieldInformationBarrierSegmentMembersManager { /// - Throws: The `GeneralError`. public func createShieldInformationBarrierSegmentMember(requestBody: CreateShieldInformationBarrierSegmentMemberRequestBody, headers: CreateShieldInformationBarrierSegmentMemberHeaders = CreateShieldInformationBarrierSegmentMemberHeaders()) async throws -> ShieldInformationBarrierSegmentMember { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_members")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegmentMember.deserialize(from: response.data) } diff --git a/Sources/Managers/ShieldInformationBarrierSegmentRestrictions/ShieldInformationBarrierSegmentRestrictionsManager.swift b/Sources/Managers/ShieldInformationBarrierSegmentRestrictions/ShieldInformationBarrierSegmentRestrictionsManager.swift index 47243b15..daff3dc5 100644 --- a/Sources/Managers/ShieldInformationBarrierSegmentRestrictions/ShieldInformationBarrierSegmentRestrictionsManager.swift +++ b/Sources/Managers/ShieldInformationBarrierSegmentRestrictions/ShieldInformationBarrierSegmentRestrictionsManager.swift @@ -21,7 +21,7 @@ public class ShieldInformationBarrierSegmentRestrictionsManager { /// - Throws: The `GeneralError`. public func getShieldInformationBarrierSegmentRestrictionById(shieldInformationBarrierSegmentRestrictionId: String, headers: GetShieldInformationBarrierSegmentRestrictionByIdHeaders = GetShieldInformationBarrierSegmentRestrictionByIdHeaders()) async throws -> ShieldInformationBarrierSegmentRestriction { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions/")\(shieldInformationBarrierSegmentRestrictionId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions/")\(shieldInformationBarrierSegmentRestrictionId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegmentRestriction.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class ShieldInformationBarrierSegmentRestrictionsManager { /// - Throws: The `GeneralError`. public func deleteShieldInformationBarrierSegmentRestrictionById(shieldInformationBarrierSegmentRestrictionId: String, headers: DeleteShieldInformationBarrierSegmentRestrictionByIdHeaders = DeleteShieldInformationBarrierSegmentRestrictionByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions/")\(shieldInformationBarrierSegmentRestrictionId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions/")\(shieldInformationBarrierSegmentRestrictionId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Lists shield information barrier segment restrictions @@ -49,7 +49,7 @@ public class ShieldInformationBarrierSegmentRestrictionsManager { public func getShieldInformationBarrierSegmentRestrictions(queryParams: GetShieldInformationBarrierSegmentRestrictionsQueryParams, headers: GetShieldInformationBarrierSegmentRestrictionsHeaders = GetShieldInformationBarrierSegmentRestrictionsHeaders()) async throws -> ShieldInformationBarrierSegmentRestrictions { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["shield_information_barrier_segment_id": Utils.Strings.toString(value: queryParams.shieldInformationBarrierSegmentId), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegmentRestrictions.deserialize(from: response.data) } @@ -63,7 +63,7 @@ public class ShieldInformationBarrierSegmentRestrictionsManager { /// - Throws: The `GeneralError`. public func createShieldInformationBarrierSegmentRestriction(requestBody: CreateShieldInformationBarrierSegmentRestrictionRequestBody, headers: CreateShieldInformationBarrierSegmentRestrictionHeaders = CreateShieldInformationBarrierSegmentRestrictionHeaders()) async throws -> ShieldInformationBarrierSegmentRestriction { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segment_restrictions")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegmentRestriction.deserialize(from: response.data) } diff --git a/Sources/Managers/ShieldInformationBarrierSegments/ShieldInformationBarrierSegmentsManager.swift b/Sources/Managers/ShieldInformationBarrierSegments/ShieldInformationBarrierSegmentsManager.swift index 69c207a5..92133c34 100644 --- a/Sources/Managers/ShieldInformationBarrierSegments/ShieldInformationBarrierSegmentsManager.swift +++ b/Sources/Managers/ShieldInformationBarrierSegments/ShieldInformationBarrierSegmentsManager.swift @@ -20,7 +20,7 @@ public class ShieldInformationBarrierSegmentsManager { /// - Throws: The `GeneralError`. public func getShieldInformationBarrierSegmentById(shieldInformationBarrierSegmentId: String, headers: GetShieldInformationBarrierSegmentByIdHeaders = GetShieldInformationBarrierSegmentByIdHeaders()) async throws -> ShieldInformationBarrierSegment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments/")\(shieldInformationBarrierSegmentId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments/")\(shieldInformationBarrierSegmentId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegment.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class ShieldInformationBarrierSegmentsManager { /// - Throws: The `GeneralError`. public func updateShieldInformationBarrierSegmentById(shieldInformationBarrierSegmentId: String, requestBody: UpdateShieldInformationBarrierSegmentByIdRequestBody = UpdateShieldInformationBarrierSegmentByIdRequestBody(), headers: UpdateShieldInformationBarrierSegmentByIdHeaders = UpdateShieldInformationBarrierSegmentByIdHeaders()) async throws -> ShieldInformationBarrierSegment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments/")\(shieldInformationBarrierSegmentId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments/")\(shieldInformationBarrierSegmentId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegment.deserialize(from: response.data) } @@ -49,7 +49,7 @@ public class ShieldInformationBarrierSegmentsManager { /// - Throws: The `GeneralError`. public func deleteShieldInformationBarrierSegmentById(shieldInformationBarrierSegmentId: String, headers: DeleteShieldInformationBarrierSegmentByIdHeaders = DeleteShieldInformationBarrierSegmentByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments/")\(shieldInformationBarrierSegmentId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments/")\(shieldInformationBarrierSegmentId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Retrieves a list of shield information barrier segment objects @@ -63,7 +63,7 @@ public class ShieldInformationBarrierSegmentsManager { public func getShieldInformationBarrierSegments(queryParams: GetShieldInformationBarrierSegmentsQueryParams, headers: GetShieldInformationBarrierSegmentsHeaders = GetShieldInformationBarrierSegmentsHeaders()) async throws -> ShieldInformationBarrierSegments { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["shield_information_barrier_id": Utils.Strings.toString(value: queryParams.shieldInformationBarrierId), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegments.deserialize(from: response.data) } @@ -76,7 +76,7 @@ public class ShieldInformationBarrierSegmentsManager { /// - Throws: The `GeneralError`. public func createShieldInformationBarrierSegment(requestBody: CreateShieldInformationBarrierSegmentRequestBody, headers: CreateShieldInformationBarrierSegmentHeaders = CreateShieldInformationBarrierSegmentHeaders()) async throws -> ShieldInformationBarrierSegment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barrier_segments")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrierSegment.deserialize(from: response.data) } diff --git a/Sources/Managers/ShieldInformationBarriers/ShieldInformationBarriersManager.swift b/Sources/Managers/ShieldInformationBarriers/ShieldInformationBarriersManager.swift index 44c82e8f..c2f0a2c4 100644 --- a/Sources/Managers/ShieldInformationBarriers/ShieldInformationBarriersManager.swift +++ b/Sources/Managers/ShieldInformationBarriers/ShieldInformationBarriersManager.swift @@ -20,7 +20,7 @@ public class ShieldInformationBarriersManager { /// - Throws: The `GeneralError`. public func getShieldInformationBarrierById(shieldInformationBarrierId: String, headers: GetShieldInformationBarrierByIdHeaders = GetShieldInformationBarrierByIdHeaders()) async throws -> ShieldInformationBarrier { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers/")\(shieldInformationBarrierId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers/")\(shieldInformationBarrierId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrier.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class ShieldInformationBarriersManager { /// - Throws: The `GeneralError`. public func updateShieldInformationBarrierStatus(requestBody: UpdateShieldInformationBarrierStatusRequestBody, headers: UpdateShieldInformationBarrierStatusHeaders = UpdateShieldInformationBarrierStatusHeaders()) async throws -> ShieldInformationBarrier { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers/change_status")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers/change_status")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrier.deserialize(from: response.data) } @@ -48,7 +48,7 @@ public class ShieldInformationBarriersManager { public func getShieldInformationBarriers(queryParams: GetShieldInformationBarriersQueryParams = GetShieldInformationBarriersQueryParams(), headers: GetShieldInformationBarriersHeaders = GetShieldInformationBarriersHeaders()) async throws -> ShieldInformationBarriers { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarriers.deserialize(from: response.data) } @@ -63,7 +63,7 @@ public class ShieldInformationBarriersManager { /// - Throws: The `GeneralError`. public func createShieldInformationBarrier(requestBody: CreateShieldInformationBarrierRequestBody, headers: CreateShieldInformationBarrierHeaders = CreateShieldInformationBarrierHeaders()) async throws -> ShieldInformationBarrier { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/shield_information_barriers")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ShieldInformationBarrier.deserialize(from: response.data) } diff --git a/Sources/Managers/SignRequests/SignRequestsManager.swift b/Sources/Managers/SignRequests/SignRequestsManager.swift index b4b2c506..2108d816 100644 --- a/Sources/Managers/SignRequests/SignRequestsManager.swift +++ b/Sources/Managers/SignRequests/SignRequestsManager.swift @@ -20,7 +20,7 @@ public class SignRequestsManager { /// - Throws: The `GeneralError`. public func cancelSignRequest(signRequestId: String, headers: CancelSignRequestHeaders = CancelSignRequestHeaders()) async throws -> SignRequest { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests/")\(signRequestId)\("/cancel")", options: FetchOptions(method: "POST", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests/")\(signRequestId)\("/cancel")", method: "POST", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SignRequest.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class SignRequestsManager { /// - Throws: The `GeneralError`. public func resendSignRequest(signRequestId: String, headers: ResendSignRequestHeaders = ResendSignRequestHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests/")\(signRequestId)\("/resend")", options: FetchOptions(method: "POST", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests/")\(signRequestId)\("/resend")", method: "POST", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Gets a sign request by ID. @@ -46,7 +46,7 @@ public class SignRequestsManager { /// - Throws: The `GeneralError`. public func getSignRequestById(signRequestId: String, headers: GetSignRequestByIdHeaders = GetSignRequestByIdHeaders()) async throws -> SignRequest { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests/")\(signRequestId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests/")\(signRequestId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SignRequest.deserialize(from: response.data) } @@ -61,7 +61,7 @@ public class SignRequestsManager { public func getSignRequests(queryParams: GetSignRequestsQueryParams = GetSignRequestsQueryParams(), headers: GetSignRequestsHeaders = GetSignRequestsHeaders()) async throws -> SignRequests { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SignRequests.deserialize(from: response.data) } @@ -75,7 +75,7 @@ public class SignRequestsManager { /// - Throws: The `GeneralError`. public func createSignRequest(requestBody: SignRequestCreateRequest, headers: CreateSignRequestHeaders = CreateSignRequestHeaders()) async throws -> SignRequest { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_requests")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SignRequest.deserialize(from: response.data) } diff --git a/Sources/Managers/SignTemplates/SignTemplatesManager.swift b/Sources/Managers/SignTemplates/SignTemplatesManager.swift index 93b65b43..4f142715 100644 --- a/Sources/Managers/SignTemplates/SignTemplatesManager.swift +++ b/Sources/Managers/SignTemplates/SignTemplatesManager.swift @@ -20,7 +20,7 @@ public class SignTemplatesManager { public func getSignTemplates(queryParams: GetSignTemplatesQueryParams = GetSignTemplatesQueryParams(), headers: GetSignTemplatesHeaders = GetSignTemplatesHeaders()) async throws -> SignTemplates { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_templates")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_templates")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SignTemplates.deserialize(from: response.data) } @@ -34,7 +34,7 @@ public class SignTemplatesManager { /// - Throws: The `GeneralError`. public func getSignTemplateById(templateId: String, headers: GetSignTemplateByIdHeaders = GetSignTemplateByIdHeaders()) async throws -> SignTemplate { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_templates/")\(templateId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/sign_templates/")\(templateId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SignTemplate.deserialize(from: response.data) } diff --git a/Sources/Managers/Skills/SkillsManager.swift b/Sources/Managers/Skills/SkillsManager.swift index 0d89c0d3..0a49fbf1 100644 --- a/Sources/Managers/Skills/SkillsManager.swift +++ b/Sources/Managers/Skills/SkillsManager.swift @@ -26,7 +26,7 @@ public class SkillsManager { /// - Throws: The `GeneralError`. public func getBoxSkillCardsOnFile(fileId: String, headers: GetBoxSkillCardsOnFileHeaders = GetBoxSkillCardsOnFileHeaders()) async throws -> SkillCardsMetadata { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SkillCardsMetadata.deserialize(from: response.data) } @@ -47,7 +47,7 @@ public class SkillsManager { /// - Throws: The `GeneralError`. public func createBoxSkillCardsOnFile(fileId: String, requestBody: CreateBoxSkillCardsOnFileRequestBody, headers: CreateBoxSkillCardsOnFileHeaders = CreateBoxSkillCardsOnFileHeaders()) async throws -> SkillCardsMetadata { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SkillCardsMetadata.deserialize(from: response.data) } @@ -68,7 +68,7 @@ public class SkillsManager { /// - Throws: The `GeneralError`. public func updateBoxSkillCardsOnFile(fileId: String, requestBody: [UpdateBoxSkillCardsOnFileRequestBody], headers: UpdateBoxSkillCardsOnFileHeaders = UpdateBoxSkillCardsOnFileHeaders()) async throws -> SkillCardsMetadata { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json-patch+json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try SkillCardsMetadata.deserialize(from: response.data) } @@ -87,7 +87,7 @@ public class SkillsManager { /// - Throws: The `GeneralError`. public func deleteBoxSkillCardsFromFile(fileId: String, headers: DeleteBoxSkillCardsFromFileHeaders = DeleteBoxSkillCardsFromFileHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/metadata/global/boxSkillsCards")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// An alternative method that can be used to overwrite and update all Box Skill @@ -101,7 +101,7 @@ public class SkillsManager { /// - Throws: The `GeneralError`. public func updateAllSkillCardsOnFile(skillId: String, requestBody: UpdateAllSkillCardsOnFileRequestBody, headers: UpdateAllSkillCardsOnFileHeaders = UpdateAllSkillCardsOnFileHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/skill_invocations/")\(skillId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/skill_invocations/")\(skillId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/StoragePolicies/StoragePoliciesManager.swift b/Sources/Managers/StoragePolicies/StoragePoliciesManager.swift index 76c55fb8..b8377c38 100644 --- a/Sources/Managers/StoragePolicies/StoragePoliciesManager.swift +++ b/Sources/Managers/StoragePolicies/StoragePoliciesManager.swift @@ -20,7 +20,7 @@ public class StoragePoliciesManager { public func getStoragePolicies(queryParams: GetStoragePoliciesQueryParams = GetStoragePoliciesQueryParams(), headers: GetStoragePoliciesHeaders = GetStoragePoliciesHeaders()) async throws -> StoragePolicies { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policies")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policies")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try StoragePolicies.deserialize(from: response.data) } @@ -34,7 +34,7 @@ public class StoragePoliciesManager { /// - Throws: The `GeneralError`. public func getStoragePolicyById(storagePolicyId: String, headers: GetStoragePolicyByIdHeaders = GetStoragePolicyByIdHeaders()) async throws -> StoragePolicy { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policies/")\(storagePolicyId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policies/")\(storagePolicyId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try StoragePolicy.deserialize(from: response.data) } diff --git a/Sources/Managers/StoragePolicyAssignments/StoragePolicyAssignmentsManager.swift b/Sources/Managers/StoragePolicyAssignments/StoragePolicyAssignmentsManager.swift index 62267e68..1db55285 100644 --- a/Sources/Managers/StoragePolicyAssignments/StoragePolicyAssignmentsManager.swift +++ b/Sources/Managers/StoragePolicyAssignments/StoragePolicyAssignmentsManager.swift @@ -20,7 +20,7 @@ public class StoragePolicyAssignmentsManager { public func getStoragePolicyAssignments(queryParams: GetStoragePolicyAssignmentsQueryParams, headers: GetStoragePolicyAssignmentsHeaders = GetStoragePolicyAssignmentsHeaders()) async throws -> StoragePolicyAssignments { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "resolved_for_type": Utils.Strings.toString(value: queryParams.resolvedForType), "resolved_for_id": Utils.Strings.toString(value: queryParams.resolvedForId)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try StoragePolicyAssignments.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class StoragePolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func createStoragePolicyAssignment(requestBody: CreateStoragePolicyAssignmentRequestBody, headers: CreateStoragePolicyAssignmentHeaders = CreateStoragePolicyAssignmentHeaders()) async throws -> StoragePolicyAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try StoragePolicyAssignment.deserialize(from: response.data) } @@ -47,7 +47,7 @@ public class StoragePolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func getStoragePolicyAssignmentById(storagePolicyAssignmentId: String, headers: GetStoragePolicyAssignmentByIdHeaders = GetStoragePolicyAssignmentByIdHeaders()) async throws -> StoragePolicyAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments/")\(storagePolicyAssignmentId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments/")\(storagePolicyAssignmentId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try StoragePolicyAssignment.deserialize(from: response.data) } @@ -62,7 +62,7 @@ public class StoragePolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func updateStoragePolicyAssignmentById(storagePolicyAssignmentId: String, requestBody: UpdateStoragePolicyAssignmentByIdRequestBody, headers: UpdateStoragePolicyAssignmentByIdHeaders = UpdateStoragePolicyAssignmentByIdHeaders()) async throws -> StoragePolicyAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments/")\(storagePolicyAssignmentId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments/")\(storagePolicyAssignmentId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try StoragePolicyAssignment.deserialize(from: response.data) } @@ -82,7 +82,7 @@ public class StoragePolicyAssignmentsManager { /// - Throws: The `GeneralError`. public func deleteStoragePolicyAssignmentById(storagePolicyAssignmentId: String, headers: DeleteStoragePolicyAssignmentByIdHeaders = DeleteStoragePolicyAssignmentByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments/")\(storagePolicyAssignmentId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/storage_policy_assignments/")\(storagePolicyAssignmentId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/TaskAssignments/TaskAssignmentsManager.swift b/Sources/Managers/TaskAssignments/TaskAssignmentsManager.swift index f52c70a5..68d41a12 100644 --- a/Sources/Managers/TaskAssignments/TaskAssignmentsManager.swift +++ b/Sources/Managers/TaskAssignments/TaskAssignmentsManager.swift @@ -20,7 +20,7 @@ public class TaskAssignmentsManager { /// - Throws: The `GeneralError`. public func getTaskAssignments(taskId: String, headers: GetTaskAssignmentsHeaders = GetTaskAssignmentsHeaders()) async throws -> TaskAssignments { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)\("/assignments")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)\("/assignments")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TaskAssignments.deserialize(from: response.data) } @@ -36,7 +36,7 @@ public class TaskAssignmentsManager { /// - Throws: The `GeneralError`. public func createTaskAssignment(requestBody: CreateTaskAssignmentRequestBody, headers: CreateTaskAssignmentHeaders = CreateTaskAssignmentHeaders()) async throws -> TaskAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TaskAssignment.deserialize(from: response.data) } @@ -50,7 +50,7 @@ public class TaskAssignmentsManager { /// - Throws: The `GeneralError`. public func getTaskAssignmentById(taskAssignmentId: String, headers: GetTaskAssignmentByIdHeaders = GetTaskAssignmentByIdHeaders()) async throws -> TaskAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments/")\(taskAssignmentId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments/")\(taskAssignmentId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TaskAssignment.deserialize(from: response.data) } @@ -66,7 +66,7 @@ public class TaskAssignmentsManager { /// - Throws: The `GeneralError`. public func updateTaskAssignmentById(taskAssignmentId: String, requestBody: UpdateTaskAssignmentByIdRequestBody = UpdateTaskAssignmentByIdRequestBody(), headers: UpdateTaskAssignmentByIdHeaders = UpdateTaskAssignmentByIdHeaders()) async throws -> TaskAssignment { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments/")\(taskAssignmentId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments/")\(taskAssignmentId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TaskAssignment.deserialize(from: response.data) } @@ -79,7 +79,7 @@ public class TaskAssignmentsManager { /// - Throws: The `GeneralError`. public func deleteTaskAssignmentById(taskAssignmentId: String, headers: DeleteTaskAssignmentByIdHeaders = DeleteTaskAssignmentByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments/")\(taskAssignmentId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/task_assignments/")\(taskAssignmentId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Tasks/TasksManager.swift b/Sources/Managers/Tasks/TasksManager.swift index d6a77b09..26c51d73 100644 --- a/Sources/Managers/Tasks/TasksManager.swift +++ b/Sources/Managers/Tasks/TasksManager.swift @@ -27,7 +27,7 @@ public class TasksManager { /// - Throws: The `GeneralError`. public func getFileTasks(fileId: String, headers: GetFileTasksHeaders = GetFileTasksHeaders()) async throws -> Tasks { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/tasks")", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/tasks")", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Tasks.deserialize(from: response.data) } @@ -41,7 +41,7 @@ public class TasksManager { /// - Throws: The `GeneralError`. public func createTask(requestBody: CreateTaskRequestBody, headers: CreateTaskHeaders = CreateTaskHeaders()) async throws -> Task { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Task.deserialize(from: response.data) } @@ -55,7 +55,7 @@ public class TasksManager { /// - Throws: The `GeneralError`. public func getTaskById(taskId: String, headers: GetTaskByIdHeaders = GetTaskByIdHeaders()) async throws -> Task { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Task.deserialize(from: response.data) } @@ -71,7 +71,7 @@ public class TasksManager { /// - Throws: The `GeneralError`. public func updateTaskById(taskId: String, requestBody: UpdateTaskByIdRequestBody = UpdateTaskByIdRequestBody(), headers: UpdateTaskByIdHeaders = UpdateTaskByIdHeaders()) async throws -> Task { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Task.deserialize(from: response.data) } @@ -84,7 +84,7 @@ public class TasksManager { /// - Throws: The `GeneralError`. public func deleteTaskById(taskId: String, headers: DeleteTaskByIdHeaders = DeleteTaskByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/tasks/")\(taskId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/TermsOfServiceUserStatuses/TermsOfServiceUserStatusesManager.swift b/Sources/Managers/TermsOfServiceUserStatuses/TermsOfServiceUserStatusesManager.swift index 26da8d6c..ffcba708 100644 --- a/Sources/Managers/TermsOfServiceUserStatuses/TermsOfServiceUserStatusesManager.swift +++ b/Sources/Managers/TermsOfServiceUserStatuses/TermsOfServiceUserStatusesManager.swift @@ -22,7 +22,7 @@ public class TermsOfServiceUserStatusesManager { public func getTermsOfServiceUserStatuses(queryParams: GetTermsOfServiceUserStatusesQueryParams, headers: GetTermsOfServiceUserStatusesHeaders = GetTermsOfServiceUserStatusesHeaders()) async throws -> TermsOfServiceUserStatuses { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["tos_id": Utils.Strings.toString(value: queryParams.tosId), "user_id": Utils.Strings.toString(value: queryParams.userId)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_service_user_statuses")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_service_user_statuses")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfServiceUserStatuses.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class TermsOfServiceUserStatusesManager { /// - Throws: The `GeneralError`. public func createTermsOfServiceStatusForUser(requestBody: CreateTermsOfServiceStatusForUserRequestBody, headers: CreateTermsOfServiceStatusForUserHeaders = CreateTermsOfServiceStatusForUserHeaders()) async throws -> TermsOfServiceUserStatus { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_service_user_statuses")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_service_user_statuses")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfServiceUserStatus.deserialize(from: response.data) } @@ -50,7 +50,7 @@ public class TermsOfServiceUserStatusesManager { /// - Throws: The `GeneralError`. public func updateTermsOfServiceStatusForUserById(termsOfServiceUserStatusId: String, requestBody: UpdateTermsOfServiceStatusForUserByIdRequestBody, headers: UpdateTermsOfServiceStatusForUserByIdHeaders = UpdateTermsOfServiceStatusForUserByIdHeaders()) async throws -> TermsOfServiceUserStatus { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_service_user_statuses/")\(termsOfServiceUserStatusId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_service_user_statuses/")\(termsOfServiceUserStatusId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfServiceUserStatus.deserialize(from: response.data) } diff --git a/Sources/Managers/TermsOfServices/TermsOfServicesManager.swift b/Sources/Managers/TermsOfServices/TermsOfServicesManager.swift index a63b781a..01b28385 100644 --- a/Sources/Managers/TermsOfServices/TermsOfServicesManager.swift +++ b/Sources/Managers/TermsOfServices/TermsOfServicesManager.swift @@ -21,7 +21,7 @@ public class TermsOfServicesManager { public func getTermsOfService(queryParams: GetTermsOfServiceQueryParams = GetTermsOfServiceQueryParams(), headers: GetTermsOfServiceHeaders = GetTermsOfServiceHeaders()) async throws -> TermsOfServices { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["tos_type": Utils.Strings.toString(value: queryParams.tosType)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfServices.deserialize(from: response.data) } @@ -35,7 +35,7 @@ public class TermsOfServicesManager { /// - Throws: The `GeneralError`. public func createTermsOfService(requestBody: CreateTermsOfServiceRequestBody, headers: CreateTermsOfServiceHeaders = CreateTermsOfServiceHeaders()) async throws -> TermsOfService { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfService.deserialize(from: response.data) } @@ -49,7 +49,7 @@ public class TermsOfServicesManager { /// - Throws: The `GeneralError`. public func getTermsOfServiceById(termsOfServiceId: String, headers: GetTermsOfServiceByIdHeaders = GetTermsOfServiceByIdHeaders()) async throws -> TermsOfService { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services/")\(termsOfServiceId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services/")\(termsOfServiceId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfService.deserialize(from: response.data) } @@ -64,7 +64,7 @@ public class TermsOfServicesManager { /// - Throws: The `GeneralError`. public func updateTermsOfServiceById(termsOfServiceId: String, requestBody: UpdateTermsOfServiceByIdRequestBody, headers: UpdateTermsOfServiceByIdHeaders = UpdateTermsOfServiceByIdHeaders()) async throws -> TermsOfService { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services/")\(termsOfServiceId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/terms_of_services/")\(termsOfServiceId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TermsOfService.deserialize(from: response.data) } diff --git a/Sources/Managers/Transfer/TransferManager.swift b/Sources/Managers/Transfer/TransferManager.swift index 5740cdc2..2388e7b6 100644 --- a/Sources/Managers/Transfer/TransferManager.swift +++ b/Sources/Managers/Transfer/TransferManager.swift @@ -55,7 +55,7 @@ public class TransferManager { public func transferOwnedFolder(userId: String, requestBody: TransferOwnedFolderRequestBody, queryParams: TransferOwnedFolderQueryParams = TransferOwnedFolderQueryParams(), headers: TransferOwnedFolderHeaders = TransferOwnedFolderHeaders()) async throws -> FolderFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "notify": Utils.Strings.toString(value: queryParams.notify)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/folders/0")", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)\("/folders/0")", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try FolderFull.deserialize(from: response.data) } diff --git a/Sources/Managers/TrashedFiles/TrashedFilesManager.swift b/Sources/Managers/TrashedFiles/TrashedFilesManager.swift index b0bdbd4d..c8c594df 100644 --- a/Sources/Managers/TrashedFiles/TrashedFilesManager.swift +++ b/Sources/Managers/TrashedFiles/TrashedFilesManager.swift @@ -32,7 +32,7 @@ public class TrashedFilesManager { public func restoreFileFromTrash(fileId: String, requestBody: RestoreFileFromTrashRequestBody = RestoreFileFromTrashRequestBody(), queryParams: RestoreFileFromTrashQueryParams = RestoreFileFromTrashQueryParams(), headers: RestoreFileFromTrashHeaders = RestoreFileFromTrashHeaders()) async throws -> TrashFileRestored { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TrashFileRestored.deserialize(from: response.data) } @@ -64,7 +64,7 @@ public class TrashedFilesManager { public func getTrashedFileById(fileId: String, queryParams: GetTrashedFileByIdQueryParams = GetTrashedFileByIdQueryParams(), headers: GetTrashedFileByIdHeaders = GetTrashedFileByIdHeaders()) async throws -> TrashFile { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/trash")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/trash")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TrashFile.deserialize(from: response.data) } @@ -84,7 +84,7 @@ public class TrashedFilesManager { /// - Throws: The `GeneralError`. public func deleteTrashedFileById(fileId: String, headers: DeleteTrashedFileByIdHeaders = DeleteTrashedFileByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/trash")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/")\(fileId)\("/trash")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/TrashedFolders/TrashedFoldersManager.swift b/Sources/Managers/TrashedFolders/TrashedFoldersManager.swift index 7f825be1..f014f8f9 100644 --- a/Sources/Managers/TrashedFolders/TrashedFoldersManager.swift +++ b/Sources/Managers/TrashedFolders/TrashedFoldersManager.swift @@ -42,7 +42,7 @@ public class TrashedFoldersManager { public func restoreFolderFromTrash(folderId: String, requestBody: RestoreFolderFromTrashRequestBody = RestoreFolderFromTrashRequestBody(), queryParams: RestoreFolderFromTrashQueryParams = RestoreFolderFromTrashQueryParams(), headers: RestoreFolderFromTrashHeaders = RestoreFolderFromTrashHeaders()) async throws -> TrashFolderRestored { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TrashFolderRestored.deserialize(from: response.data) } @@ -77,7 +77,7 @@ public class TrashedFoldersManager { public func getTrashedFolderById(folderId: String, queryParams: GetTrashedFolderByIdQueryParams = GetTrashedFolderByIdQueryParams(), headers: GetTrashedFolderByIdHeaders = GetTrashedFolderByIdHeaders()) async throws -> TrashFolder { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/trash")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/trash")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TrashFolder.deserialize(from: response.data) } @@ -100,7 +100,7 @@ public class TrashedFoldersManager { /// - Throws: The `GeneralError`. public func deleteTrashedFolderById(folderId: String, headers: DeleteTrashedFolderByIdHeaders = DeleteTrashedFolderByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/trash")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/")\(folderId)\("/trash")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/TrashedItems/TrashedItemsManager.swift b/Sources/Managers/TrashedItems/TrashedItemsManager.swift index 78bf9762..e2165ccf 100644 --- a/Sources/Managers/TrashedItems/TrashedItemsManager.swift +++ b/Sources/Managers/TrashedItems/TrashedItemsManager.swift @@ -28,7 +28,7 @@ public class TrashedItemsManager { public func getTrashedItems(queryParams: GetTrashedItemsQueryParams = GetTrashedItemsQueryParams(), headers: GetTrashedItemsHeaders = GetTrashedItemsHeaders()) async throws -> Items { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "limit": Utils.Strings.toString(value: queryParams.limit), "offset": Utils.Strings.toString(value: queryParams.offset), "usemarker": Utils.Strings.toString(value: queryParams.usemarker), "marker": Utils.Strings.toString(value: queryParams.marker), "direction": Utils.Strings.toString(value: queryParams.direction), "sort": Utils.Strings.toString(value: queryParams.sort)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/trash/items")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/folders/trash/items")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Items.deserialize(from: response.data) } diff --git a/Sources/Managers/TrashedWebLinks/TrashedWebLinksManager.swift b/Sources/Managers/TrashedWebLinks/TrashedWebLinksManager.swift index bf874353..f397a2df 100644 --- a/Sources/Managers/TrashedWebLinks/TrashedWebLinksManager.swift +++ b/Sources/Managers/TrashedWebLinks/TrashedWebLinksManager.swift @@ -26,7 +26,7 @@ public class TrashedWebLinksManager { public func restoreWeblinkFromTrash(webLinkId: String, requestBody: RestoreWeblinkFromTrashRequestBody = RestoreWeblinkFromTrashRequestBody(), queryParams: RestoreWeblinkFromTrashQueryParams = RestoreWeblinkFromTrashQueryParams(), headers: RestoreWeblinkFromTrashHeaders = RestoreWeblinkFromTrashHeaders()) async throws -> TrashWebLinkRestored { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TrashWebLinkRestored.deserialize(from: response.data) } @@ -42,7 +42,7 @@ public class TrashedWebLinksManager { public func getTrashedWebLinkById(webLinkId: String, queryParams: GetTrashedWebLinkByIdQueryParams = GetTrashedWebLinkByIdQueryParams(), headers: GetTrashedWebLinkByIdHeaders = GetTrashedWebLinkByIdHeaders()) async throws -> TrashWebLink { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("/trash")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("/trash")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try TrashWebLink.deserialize(from: response.data) } @@ -56,7 +56,7 @@ public class TrashedWebLinksManager { /// - Throws: The `GeneralError`. public func deleteTrashedWebLinkById(webLinkId: String, headers: DeleteTrashedWebLinkByIdHeaders = DeleteTrashedWebLinkByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("/trash")", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)\("/trash")", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Uploads/UploadsManager.swift b/Sources/Managers/Uploads/UploadsManager.swift index 62304595..c0564782 100644 --- a/Sources/Managers/Uploads/UploadsManager.swift +++ b/Sources/Managers/Uploads/UploadsManager.swift @@ -35,7 +35,7 @@ public class UploadsManager { public func uploadFileVersion(fileId: String, requestBody: UploadFileVersionRequestBody, queryParams: UploadFileVersionQueryParams = UploadFileVersionQueryParams(), headers: UploadFileVersionHeaders = UploadFileVersionHeaders()) async throws -> Files { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["if-match": Utils.Strings.toString(value: headers.ifMatch), "content-md5": Utils.Strings.toString(value: headers.contentMd5)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/")\(fileId)\("/content")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, multipartData: [MultipartItem(partName: "attributes", data: try requestBody.attributes.serialize()), MultipartItem(partName: "file", fileStream: requestBody.file, fileName: requestBody.fileFileName, contentType: requestBody.fileContentType)], contentType: "multipart/form-data", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/")\(fileId)\("/content")", method: "POST", params: queryParamsMap, headers: headersMap, multipartData: [MultipartItem(partName: "attributes", data: try requestBody.attributes.serialize()), MultipartItem(partName: "file", fileStream: requestBody.file, fileName: requestBody.fileFileName, contentType: requestBody.fileContentType)], contentType: "multipart/form-data", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Files.deserialize(from: response.data) } @@ -56,7 +56,7 @@ public class UploadsManager { public func uploadFile(requestBody: UploadFileRequestBody, queryParams: UploadFileQueryParams = UploadFileQueryParams(), headers: UploadFileHeaders = UploadFileHeaders()) async throws -> Files { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["content-md5": Utils.Strings.toString(value: headers.contentMd5)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/content")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, multipartData: [MultipartItem(partName: "attributes", data: try requestBody.attributes.serialize()), MultipartItem(partName: "file", fileStream: requestBody.file, fileName: requestBody.fileFileName, contentType: requestBody.fileContentType)], contentType: "multipart/form-data", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.uploadUrl)\("/2.0/files/content")", method: "POST", params: queryParamsMap, headers: headersMap, multipartData: [MultipartItem(partName: "attributes", data: try requestBody.attributes.serialize()), MultipartItem(partName: "file", fileStream: requestBody.file, fileName: requestBody.fileFileName, contentType: requestBody.fileContentType)], contentType: "multipart/form-data", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Files.deserialize(from: response.data) } @@ -70,7 +70,7 @@ public class UploadsManager { /// - Throws: The `GeneralError`. public func preflightFileUploadCheck(requestBody: PreflightFileUploadCheckRequestBody = PreflightFileUploadCheckRequestBody(), headers: PreflightFileUploadCheckHeaders = PreflightFileUploadCheckHeaders()) async throws -> UploadUrl { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/content")", options: FetchOptions(method: "OPTIONS", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/files/content")", method: "OPTIONS", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UploadUrl.deserialize(from: response.data) } diff --git a/Sources/Managers/UserCollaborations/UserCollaborationsManager.swift b/Sources/Managers/UserCollaborations/UserCollaborationsManager.swift index 19fd96c9..682f1da5 100644 --- a/Sources/Managers/UserCollaborations/UserCollaborationsManager.swift +++ b/Sources/Managers/UserCollaborations/UserCollaborationsManager.swift @@ -22,7 +22,7 @@ public class UserCollaborationsManager { public func getCollaborationById(collaborationId: String, queryParams: GetCollaborationByIdQueryParams = GetCollaborationByIdQueryParams(), headers: GetCollaborationByIdHeaders = GetCollaborationByIdHeaders()) async throws -> Collaboration { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations/")\(collaborationId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations/")\(collaborationId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaboration.deserialize(from: response.data) } @@ -39,7 +39,7 @@ public class UserCollaborationsManager { /// - Throws: The `GeneralError`. public func updateCollaborationById(collaborationId: String, requestBody: UpdateCollaborationByIdRequestBody, headers: UpdateCollaborationByIdHeaders = UpdateCollaborationByIdHeaders()) async throws -> Collaboration { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations/")\(collaborationId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations/")\(collaborationId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaboration.deserialize(from: response.data) } @@ -52,7 +52,7 @@ public class UserCollaborationsManager { /// - Throws: The `GeneralError`. public func deleteCollaborationById(collaborationId: String, headers: DeleteCollaborationByIdHeaders = DeleteCollaborationByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations/")\(collaborationId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations/")\(collaborationId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } /// Adds a collaboration for a single user or a single group to a file @@ -79,7 +79,7 @@ public class UserCollaborationsManager { public func createCollaboration(requestBody: CreateCollaborationRequestBody, queryParams: CreateCollaborationQueryParams = CreateCollaborationQueryParams(), headers: CreateCollaborationHeaders = CreateCollaborationHeaders()) async throws -> Collaboration { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields), "notify": Utils.Strings.toString(value: queryParams.notify)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/collaborations")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Collaboration.deserialize(from: response.data) } diff --git a/Sources/Managers/Users/UsersManager.swift b/Sources/Managers/Users/UsersManager.swift index d8cfcd29..54590863 100644 --- a/Sources/Managers/Users/UsersManager.swift +++ b/Sources/Managers/Users/UsersManager.swift @@ -25,7 +25,7 @@ public class UsersManager { public func getUsers(queryParams: GetUsersQueryParams = GetUsersQueryParams(), headers: GetUsersHeaders = GetUsersHeaders()) async throws -> Users { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["filter_term": Utils.Strings.toString(value: queryParams.filterTerm), "user_type": Utils.Strings.toString(value: queryParams.userType), "external_app_user_id": Utils.Strings.toString(value: queryParams.externalAppUserId), "fields": Utils.Strings.toString(value: queryParams.fields), "offset": Utils.Strings.toString(value: queryParams.offset), "limit": Utils.Strings.toString(value: queryParams.limit), "usemarker": Utils.Strings.toString(value: queryParams.usemarker), "marker": Utils.Strings.toString(value: queryParams.marker)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Users.deserialize(from: response.data) } @@ -42,7 +42,7 @@ public class UsersManager { public func createUser(requestBody: CreateUserRequestBody, queryParams: CreateUserQueryParams = CreateUserQueryParams(), headers: CreateUserHeaders = CreateUserHeaders()) async throws -> UserFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users")", options: FetchOptions(method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users")", method: "POST", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UserFull.deserialize(from: response.data) } @@ -65,7 +65,7 @@ public class UsersManager { public func getUserMe(queryParams: GetUserMeQueryParams = GetUserMeQueryParams(), headers: GetUserMeHeaders = GetUserMeHeaders()) async throws -> UserFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/me")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/me")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UserFull.deserialize(from: response.data) } @@ -91,7 +91,7 @@ public class UsersManager { public func getUserById(userId: String, queryParams: GetUserByIdQueryParams = GetUserByIdQueryParams(), headers: GetUserByIdHeaders = GetUserByIdHeaders()) async throws -> UserFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UserFull.deserialize(from: response.data) } @@ -110,7 +110,7 @@ public class UsersManager { public func updateUserById(userId: String, requestBody: UpdateUserByIdRequestBody = UpdateUserByIdRequestBody(), queryParams: UpdateUserByIdQueryParams = UpdateUserByIdQueryParams(), headers: UpdateUserByIdHeaders = UpdateUserByIdHeaders()) async throws -> UserFull { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["fields": Utils.Strings.toString(value: queryParams.fields)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)", options: FetchOptions(method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)", method: "PUT", params: queryParamsMap, headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try UserFull.deserialize(from: response.data) } @@ -128,7 +128,7 @@ public class UsersManager { public func deleteUserById(userId: String, queryParams: DeleteUserByIdQueryParams = DeleteUserByIdQueryParams(), headers: DeleteUserByIdHeaders = DeleteUserByIdHeaders()) async throws { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["notify": Utils.Strings.toString(value: queryParams.notify), "force": Utils.Strings.toString(value: queryParams.force)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)", options: FetchOptions(method: "DELETE", params: queryParamsMap, headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/users/")\(userId)", method: "DELETE", params: queryParamsMap, headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/WebLinks/WebLinksManager.swift b/Sources/Managers/WebLinks/WebLinksManager.swift index 657e8138..2a0b31dc 100644 --- a/Sources/Managers/WebLinks/WebLinksManager.swift +++ b/Sources/Managers/WebLinks/WebLinksManager.swift @@ -19,7 +19,7 @@ public class WebLinksManager { /// - Throws: The `GeneralError`. public func createWebLink(requestBody: CreateWebLinkRequestBody, headers: CreateWebLinkHeaders = CreateWebLinkHeaders()) async throws -> WebLink { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -33,7 +33,7 @@ public class WebLinksManager { /// - Throws: The `GeneralError`. public func getWebLinkById(webLinkId: String, headers: GetWebLinkByIdHeaders = GetWebLinkByIdHeaders()) async throws -> WebLink { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge(["boxapi": Utils.Strings.toString(value: headers.boxapi)], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -48,7 +48,7 @@ public class WebLinksManager { /// - Throws: The `GeneralError`. public func updateWebLinkById(webLinkId: String, requestBody: UpdateWebLinkByIdRequestBody = UpdateWebLinkByIdRequestBody(), headers: UpdateWebLinkByIdHeaders = UpdateWebLinkByIdHeaders()) async throws -> WebLink { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try WebLink.deserialize(from: response.data) } @@ -61,7 +61,7 @@ public class WebLinksManager { /// - Throws: The `GeneralError`. public func deleteWebLinkById(webLinkId: String, headers: DeleteWebLinkByIdHeaders = DeleteWebLinkByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/web_links/")\(webLinkId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Webhooks/WebhooksManager.swift b/Sources/Managers/Webhooks/WebhooksManager.swift index 485b2e78..ab1a5178 100644 --- a/Sources/Managers/Webhooks/WebhooksManager.swift +++ b/Sources/Managers/Webhooks/WebhooksManager.swift @@ -25,7 +25,7 @@ public class WebhooksManager { public func getWebhooks(queryParams: GetWebhooksQueryParams = GetWebhooksQueryParams(), headers: GetWebhooksHeaders = GetWebhooksHeaders()) async throws -> Webhooks { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["marker": Utils.Strings.toString(value: queryParams.marker), "limit": Utils.Strings.toString(value: queryParams.limit)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Webhooks.deserialize(from: response.data) } @@ -38,7 +38,7 @@ public class WebhooksManager { /// - Throws: The `GeneralError`. public func createWebhook(requestBody: CreateWebhookRequestBody, headers: CreateWebhookHeaders = CreateWebhookHeaders()) async throws -> Webhook { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Webhook.deserialize(from: response.data) } @@ -52,7 +52,7 @@ public class WebhooksManager { /// - Throws: The `GeneralError`. public func getWebhookById(webhookId: String, headers: GetWebhookByIdHeaders = GetWebhookByIdHeaders()) async throws -> Webhook { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks/")\(webhookId)", options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks/")\(webhookId)", method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Webhook.deserialize(from: response.data) } @@ -67,7 +67,7 @@ public class WebhooksManager { /// - Throws: The `GeneralError`. public func updateWebhookById(webhookId: String, requestBody: UpdateWebhookByIdRequestBody = UpdateWebhookByIdRequestBody(), headers: UpdateWebhookByIdHeaders = UpdateWebhookByIdHeaders()) async throws -> Webhook { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks/")\(webhookId)", options: FetchOptions(method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks/")\(webhookId)", method: "PUT", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Webhook.deserialize(from: response.data) } @@ -80,7 +80,7 @@ public class WebhooksManager { /// - Throws: The `GeneralError`. public func deleteWebhookById(webhookId: String, headers: DeleteWebhookByIdHeaders = DeleteWebhookByIdHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks/")\(webhookId)", options: FetchOptions(method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/webhooks/")\(webhookId)", method: "DELETE", headers: headersMap, responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/Workflows/WorkflowsManager.swift b/Sources/Managers/Workflows/WorkflowsManager.swift index d46611de..806f115c 100644 --- a/Sources/Managers/Workflows/WorkflowsManager.swift +++ b/Sources/Managers/Workflows/WorkflowsManager.swift @@ -24,7 +24,7 @@ public class WorkflowsManager { public func getWorkflows(queryParams: GetWorkflowsQueryParams, headers: GetWorkflowsHeaders = GetWorkflowsHeaders()) async throws -> Workflows { let queryParamsMap: [String: String] = Utils.Dictionary.prepareParams(map: ["folder_id": Utils.Strings.toString(value: queryParams.folderId), "trigger_type": Utils.Strings.toString(value: queryParams.triggerType), "limit": Utils.Strings.toString(value: queryParams.limit), "marker": Utils.Strings.toString(value: queryParams.marker)]) let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/workflows")", options: FetchOptions(method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/workflows")", method: "GET", params: queryParamsMap, headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try Workflows.deserialize(from: response.data) } @@ -41,7 +41,7 @@ public class WorkflowsManager { /// - Throws: The `GeneralError`. public func startWorkflow(workflowId: String, requestBody: StartWorkflowRequestBody, headers: StartWorkflowHeaders = StartWorkflowHeaders()) async throws { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/workflows/")\(workflowId)\("/start")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/workflows/")\(workflowId)\("/start")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: nil, auth: self.auth, networkSession: self.networkSession)) } } diff --git a/Sources/Managers/ZipDownloads/ZipDownloadsManager.swift b/Sources/Managers/ZipDownloads/ZipDownloadsManager.swift index 491b8c6d..240e950a 100644 --- a/Sources/Managers/ZipDownloads/ZipDownloadsManager.swift +++ b/Sources/Managers/ZipDownloads/ZipDownloadsManager.swift @@ -34,7 +34,7 @@ public class ZipDownloadsManager { /// - Throws: The `GeneralError`. public func createZipDownload(requestBody: ZipDownloadRequest, headers: CreateZipDownloadHeaders = CreateZipDownloadHeaders()) async throws -> ZipDownload { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/zip_downloads")", options: FetchOptions(method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: "\(self.networkSession.baseUrls.baseUrl)\("/2.0/zip_downloads")", method: "POST", headers: headersMap, data: try requestBody.serialize(), contentType: "application/json", responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ZipDownload.deserialize(from: response.data) } @@ -61,7 +61,7 @@ public class ZipDownloadsManager { /// - Throws: The `GeneralError`. public func getZipDownloadContent(downloadUrl: String, downloadDestinationURL: URL, headers: GetZipDownloadContentHeaders = GetZipDownloadContentHeaders()) async throws -> URL { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: downloadUrl, options: FetchOptions(method: "GET", headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: downloadUrl, method: "GET", headers: headersMap, downloadDestinationURL: downloadDestinationURL, responseFormat: "binary", auth: self.auth, networkSession: self.networkSession)) return response.downloadDestinationURL! } @@ -86,7 +86,7 @@ public class ZipDownloadsManager { /// - Throws: The `GeneralError`. public func getZipDownloadStatus(statusUrl: String, headers: GetZipDownloadStatusHeaders = GetZipDownloadStatusHeaders()) async throws -> ZipDownloadStatus { let headersMap: [String: String] = Utils.Dictionary.prepareParams(map: Utils.Dictionary.merge([:], headers.extraHeaders)) - let response: FetchResponse = try await NetworkClient.shared.fetch(url: statusUrl, options: FetchOptions(method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) + let response: FetchResponse = try await NetworkClient.shared.fetch(options: FetchOptions(url: statusUrl, method: "GET", headers: headersMap, responseFormat: "json", auth: self.auth, networkSession: self.networkSession)) return try ZipDownloadStatus.deserialize(from: response.data) } diff --git a/Sources/Networking/FetchConversation.swift b/Sources/Networking/FetchConversation.swift index a91c7c3f..744c23e3 100644 --- a/Sources/Networking/FetchConversation.swift +++ b/Sources/Networking/FetchConversation.swift @@ -11,8 +11,6 @@ class FetchConversation { case url(URL) } - /// The URL for the request. - let url: String /// Request options that provides request-specific information, such as the request type, and body, query parameters. let options: FetchOptions /// Represents an URL request. @@ -25,13 +23,11 @@ class FetchConversation { /// Initializer /// /// - Parameters: - /// - url: The URL for the request. /// - options: Request options that provides request-specific information, such as the request type, and body, query parameters. /// - urlRequest: Represents an URL request. /// - urlResponse: Represents a response to an HTTP URL /// - responseType: Represents response type, either data or downloaded file - init(url: String, options: FetchOptions, urlRequest: URLRequest, urlResponse: HTTPURLResponse, responseType: ResponseType) { - self.url = url + init(options: FetchOptions, urlRequest: URLRequest, urlResponse: HTTPURLResponse, responseType: ResponseType) { self.options = options self.urlRequest = urlRequest self.urlResponse = urlResponse diff --git a/Sources/Networking/FetchOptions.swift b/Sources/Networking/FetchOptions.swift index c6936e7e..c3e6a66f 100644 --- a/Sources/Networking/FetchOptions.swift +++ b/Sources/Networking/FetchOptions.swift @@ -20,6 +20,9 @@ public enum HTTPMethod: String, ExpressibleByStringLiteral, CaseIterable { /// Represents paremeters used for the request. public class FetchOptions { + /// The HTTP request URL + public let url: String + /// The HTTP request method (e.g. get, post, delete) public let method: HTTPMethod @@ -56,6 +59,7 @@ public class FetchOptions { /// Initializer /// /// - Parameters: + /// - url: The HTTP request URL. /// - method: The HTTP request method (e.g. GET, POST, DELETE). /// - params: Additional parameters to be passed in the URL that is called. /// - headers: Additional information to be passed in the HTTP headers of the request. @@ -68,6 +72,7 @@ public class FetchOptions { /// - auth: The authentication sesson management used in the request. /// - networkSession: The URLSession holder along with the network configuration parameters public init( + url: String, method: HTTPMethod = HTTPMethod.get, params: [String : ParameterConvertible?] = [:], headers: [String : ParameterConvertible?] = [:], @@ -80,6 +85,7 @@ public class FetchOptions { auth: Authentication? = nil, networkSession: NetworkSession? = nil ) { + self.url = url self.method = method self.headers = headers self.params = params diff --git a/Sources/Networking/NetworkClient.swift b/Sources/Networking/NetworkClient.swift index 488efa51..13573582 100644 --- a/Sources/Networking/NetworkClient.swift +++ b/Sources/Networking/NetworkClient.swift @@ -24,13 +24,11 @@ public class NetworkClient { /// Executes requests /// /// - Parameters: - /// - url: The URL for the request. /// - options: Request options that provides request-specific information, such as the request type, and body, query parameters. /// - Returns: Response of the request in the form of FetchResponse object. /// - Throws: An error if the request fails for any reason. - public func fetch(url: String, options: FetchOptions) async throws -> FetchResponse { + public func fetch(options: FetchOptions) async throws -> FetchResponse { return try await fetch( - url: url, options: options, networkSession: options.networkSession ?? NetworkSession(), attempt: 1 @@ -40,31 +38,28 @@ public class NetworkClient { /// Executes requests /// /// - Parameters: - /// - url: The URL for the request. /// - options: Request options that provides request-specific information, such as the request type, and body, query parameters. /// - networkSession: The Networking Session object which provides the URLSession object along with a network configuration parameters used in network communication. /// - attempt: The request attempt number. /// - Returns: Response of the request in the form of FetchResponse object. /// - Throws: An error if the request fails for any reason. private func fetch( - url: String, options: FetchOptions, networkSession: NetworkSession, attempt: Int ) async throws -> FetchResponse { let urlRequest = try await createRequest( - url: url, options: options, networkSession: networkSession ) if let downloadDestinationURL = options.downloadDestinationURL { let (downloadUrl, urlResponse) = try await sendDownloadRequest(urlRequest, downloadDestinationURL: downloadDestinationURL, networkSession: networkSession) - let conversation = FetchConversation(url: url, options: options, urlRequest: urlRequest, urlResponse: urlResponse as! HTTPURLResponse, responseType: .url(downloadUrl)) + let conversation = FetchConversation(options: options, urlRequest: urlRequest, urlResponse: urlResponse as! HTTPURLResponse, responseType: .url(downloadUrl)) return try await processResponse(using: conversation, networkSession: networkSession, attempt: attempt) } else { let (data, urlResponse) = try await sendDataRequest(urlRequest, networkSession: networkSession) - let conversation = FetchConversation(url: url, options: options, urlRequest: urlRequest, urlResponse: urlResponse as! HTTPURLResponse, responseType: .data(data)) + let conversation = FetchConversation(options: options, urlRequest: urlRequest, urlResponse: urlResponse as! HTTPURLResponse, responseType: .data(data)) return try await processResponse(using: conversation, networkSession: networkSession, attempt: attempt) } } @@ -154,11 +149,10 @@ public class NetworkClient { /// - Returns: The URLRequest object which represents information about the request. /// - Throws: An error if the operation fails for any reason. private func createRequest( - url: String, options: FetchOptions, networkSession: NetworkSession ) async throws -> URLRequest { - var urlRequest = URLRequest(url: createEndpointUrl(url: url, params: options.params)) + var urlRequest = URLRequest(url: createEndpointUrl(url: options.url, params: options.params)) urlRequest.httpMethod = options.method.rawValue try await updateRequestWithHeaders(&urlRequest, options: options, networkSession: networkSession) @@ -333,7 +327,7 @@ public class NetworkClient { // Unauthorized if statusCode == 401, let auth = conversation.options.auth { _ = try await auth.refreshToken(networkSession: networkSession) - return try await fetch(url: conversation.url, options: conversation.options, networkSession: networkSession, attempt: attempt + 1) + return try await fetch(options: conversation.options, networkSession: networkSession, attempt: attempt + 1) } // Retryable @@ -342,7 +336,7 @@ public class NetworkClient { ?? networkSession.networkSettings.retryStrategy.getRetryTimeout(attempt: attempt) try await wait(seconds: retryTimeout) - return try await fetch(url: conversation.url, options: conversation.options, networkSession: networkSession, attempt: attempt + 1) + return try await fetch(options: conversation.options, networkSession: networkSession, attempt: attempt + 1) } throw BoxAPIError(fromConversation: conversation)