0.12.0

.github/workflows/test.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        swift: [5.8.1, 5.7.3, 5.6.3]
+        swift: [5.9, 5.6.3]
 
     steps:
     - name: Checkout

Demo/Demo/Views/ContentView.swift

@@ -22,7 +22,16 @@ struct MainView: View {
 	@State private var messageText: String = ""
 
 	@State var isUploading: Bool = false
-
+
+	private let sources: [SocialSource] = [
+		SocialSource(source: .facebook),
+		SocialSource(source: .gdrive),
+		SocialSource(source: .gphotos),
+		SocialSource(source: .dropbox),
+		SocialSource(source: .instagram),
+		SocialSource(source: .onedrive)
+	]
+
 	var body: some View {
 		NavigationView {
 			ZStack {
@@ -42,34 +51,13 @@ struct MainView: View {
 					.navigationBarTitle(Text("Uploadcare demo"), displayMode: .automatic)
 					.sheet(isPresented: self.$widgetVisible, content: {
 						NavigationView {
-							SelectSourceView(publicKey: publicKey)
+							SelectSourceView(publicKey: publicKey, sources: sources)
 								.navigationBarItems(trailing: Button("Close") {
 									self.widgetVisible = false
 								})
 								.environmentObject(api)
 						}
 					})
-
-					.actionSheet(isPresented: $isShowingAddFilesAlert, content: {
-						ActionSheet(
-							title: Text("Select source"),
-							message: Text(""),
-							buttons: [
-								.default(Text("Photos"), action: {
-									self.pickerType = .photos
-									self.isShowingSheetWithPicker.toggle()
-								}),
-								.default(Text("Files"), action: {
-									self.pickerType = .files
-									self.isShowingSheetWithPicker.toggle()
-								}),
-								.default(Text("External Sources"), action: {
-									self.widgetVisible = true
-								}),
-								.cancel()
-							]
-						)
-					})
 					.sheet(isPresented: $isShowingSheetWithPicker) {
 						if self.pickerType == .photos {
 							ImagePicker(sourceType: .photoLibrary) { (imageUrl) in
@@ -144,7 +132,28 @@ struct MainView: View {
 							self.filesListStore.uploadcare = self.api.uploadcare
 						}
 						self.isShowingAddFilesAlert.toggle()
-					}.buttonStyle(NeumorphicButtonStyle(bgColor: Color.gray.opacity(0.05)))
+					}
+					.buttonStyle(NeumorphicButtonStyle(bgColor: Color.gray.opacity(0.05)))
+					.actionSheet(isPresented: $isShowingAddFilesAlert, content: {
+						ActionSheet(
+							title: Text("Select source"),
+							message: Text(""),
+							buttons: [
+								.default(Text("Photos"), action: {
+									self.pickerType = .photos
+									self.isShowingSheetWithPicker.toggle()
+								}),
+								.default(Text("Files"), action: {
+									self.pickerType = .files
+									self.isShowingSheetWithPicker.toggle()
+								}),
+								.default(Text("External Sources"), action: {
+									self.widgetVisible = true
+								}),
+								.cancel()
+							]
+						)
+					})
 				}
 			}
 		}

Documentation/REST API.md

@@ -515,10 +515,10 @@ Create and subscribe to a webhook. You can use webhooks to receive notifications
 let url = URL(string: "https://yourwebhook.com")!
 
 // Async:
-let webhook = try await uploadcare.createWebhook(targetUrl: url, isActive: true, signingSecret: "someSigningSecret")
+let webhook = try await uploadcare.createWebhook(targetUrl: url,  event: .fileUploaded, isActive: true, signingSecret: "someSigningSecret")
 
 // With a completion callback:
-uploadcare.createWebhook(targetUrl: url, isActive: true, signingSecret: "someSigningSecret") { result in
+uploadcare.createWebhook(targetUrl: url,  event: .fileUploaded, isActive: true, signingSecret: "someSigningSecret") { result in
     switch result {
     case .failure(let error):
         print(error)
@@ -537,10 +537,10 @@ let url = URL(string: "https://yourwebhook.com")!
 let webhookId = 100
 
 // Async:
-let webhook = try await uploadcare.updateWebhook(id: webhookId, targetUrl: url, isActive: false, signingSecret: "someNewSigningSecret")
+let webhook = try await uploadcare.updateWebhook(id: webhookId, targetUrl: url, event: .fileInfoUpdated, isActive: false, signingSecret: "someNewSigningSecret")
 
 // With a completion callback:
-uploadcare.updateWebhook(id: webhookId, targetUrl: url, isActive: true, signingSecret: "someNewSigningSecret") { result in
+uploadcare.updateWebhook(id: webhookId, targetUrl: url, event: .fileInfoUpdated, isActive: true, signingSecret: "someNewSigningSecret") { result in
     switch result {
     case .failure(let error):
         print(error)

Package.swift

@@ -6,7 +6,7 @@ import PackageDescription
 #if os(Linux)
 let dependencies: [PackageDescription.Package.Dependency] = [
 	.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.18.0"),
-	.package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "3.0.0")
+	.package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "4.0.0")
 ]
 let targetDependencies: [PackageDescription.Target.Dependency] = [
 	.product(name: "AsyncHTTPClient", package: "async-http-client"),

Sources/Uploadcare/Constants.swift

@@ -19,7 +19,7 @@ internal let RESTAPIHost = "api.uploadcare.com"
 /// Library name
 internal let libraryName = "UploadcareSwift"
 /// Library version
-internal let libraryVersion = "0.11.0"
+internal let libraryVersion = "0.12.0"
 
 /// API version
 internal let APIVersion = "0.7"

Sources/Uploadcare/Uploadcare.swift

@@ -1545,10 +1545,10 @@ extension Uploadcare {
 		}
 	}
 
-	private func createWebhookRequestBody(targetUrl: URL, isActive: Bool, signingSecret: String? = nil) throws -> Data {
+	private func createWebhookRequestBody(targetUrl: URL, event: Webhook.Event, isActive: Bool, signingSecret: String? = nil) throws -> Data {
 		var bodyDictionary = [
 			"target_url": targetUrl.absoluteString,
-			"event": "file.uploaded", // Presently, we only support the file.uploaded event.
+			"event": event.rawValue,
 			"is_active": "\(isActive)"
 		]
 
@@ -1564,7 +1564,7 @@ extension Uploadcare {
 	/// Example:
 	/// ```swift
 	/// let url = URL(string: "https://yourwebhook.com")!
-	/// uploadcare.createWebhook(targetUrl: url, isActive: true, signingSecret: "someSigningSecret") { result in
+	/// uploadcare.createWebhook(targetUrl: url, event: .fileUploaded, isActive: true, signingSecret: "someSigningSecret") { result in
 	///     switch result {
 	///     case .failure(let error):
 	///         print(error)
@@ -1576,15 +1576,16 @@ extension Uploadcare {
 	///
 	/// - Parameters:
 	///   - targetUrl: An URL that is triggered by an event, for example, a file upload. A target URL MUST be unique for each project — event type combination.
+	///   - event: An event you subscribe to.
 	///   - isActive: Marks a subscription as either active or not, defaults to true, otherwise false.
 	///   - signingSecret: Optional secret that, if set, will be used to calculate signatures for the webhook payloads.
 	///   - completionHandler: Completion handler.
 	#if !os(Linux)
-	public func createWebhook(targetUrl: URL, isActive: Bool, signingSecret: String? = nil, _ completionHandler: @escaping (Result<Webhook, RESTAPIError>) -> Void) {
+	public func createWebhook(targetUrl: URL, event: Webhook.Event = .fileUploaded, isActive: Bool, signingSecret: String? = nil, _ completionHandler: @escaping (Result<Webhook, RESTAPIError>) -> Void) {
 		let url = urlWithPath("/webhooks/")
 		var urlRequest = requestManager.makeUrlRequest(fromURL: url, method: .post)
 		do {
-			urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, isActive: isActive, signingSecret: signingSecret)
+			urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, event: event, isActive: isActive, signingSecret: signingSecret)
 		} catch let error {
 			DLog(error.localizedDescription)
 		}
@@ -1614,14 +1615,15 @@ extension Uploadcare {
 	///
 	/// - Parameters:
 	///   - targetUrl: An URL that is triggered by an event, for example, a file upload. A target URL MUST be unique for each project — event type combination.
+	///   - event: An event you subscribe to.
 	///   - isActive: Marks a subscription as either active or not, defaults to true, otherwise false.
 	///   - signingSecret: Optional secret that, if set, will be used to calculate signatures for the webhook payloads
 	/// - Returns: Created webhook.
 	@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-	public func createWebhook(targetUrl: URL, isActive: Bool, signingSecret: String? = nil) async throws -> Webhook {
+	public func createWebhook(targetUrl: URL, event: Webhook.Event = .fileUploaded, isActive: Bool, signingSecret: String? = nil) async throws -> Webhook {
 		let url = urlWithPath("/webhooks/")
 		var urlRequest = requestManager.makeUrlRequest(fromURL: url, method: .post)
-		urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, isActive: isActive, signingSecret: signingSecret)
+		urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, event: event, isActive: isActive, signingSecret: signingSecret)
 		requestManager.signRequest(&urlRequest)
 
 		do {
@@ -1638,7 +1640,7 @@ extension Uploadcare {
 	/// ```swift
 	/// let url = URL(string: "https://yourwebhook.com")!
 	/// let webhookId = 100
-	/// uploadcare.updateWebhook(id: webhookId, targetUrl: url, isActive: true, signingSecret: "someNewSigningSecret") { result in
+	/// uploadcare.updateWebhook(id: webhookId, targetUrl: url, event: .fileInfoUpdated, isActive: true, signingSecret: "someNewSigningSecret") { result in
 	///     switch result {
 	///     case .failure(let error):
 	///         print(error)
@@ -1651,15 +1653,16 @@ extension Uploadcare {
 	/// - Parameters:
 	///   - id: Webhook ID.
 	///   - targetUrl: Where webhook data will be posted.
+	///   - event: An event you subscribe to.
 	///   - isActive: Marks a subscription as either active or not.
 	///   - signingSecret: Optional secret that, if set, will be used to calculate signatures for the webhook payloads.
 	///   - completionHandler: Completion handler.
 	#if !os(Linux)
-	public func updateWebhook(id: Int, targetUrl: URL, isActive: Bool, signingSecret: String? = nil, _ completionHandler: @escaping (Result<Webhook, RESTAPIError>) -> Void) {
+	public func updateWebhook(id: Int, targetUrl: URL, event: Webhook.Event = .fileUploaded, isActive: Bool, signingSecret: String? = nil, _ completionHandler: @escaping (Result<Webhook, RESTAPIError>) -> Void) {
 		let url = urlWithPath("/webhooks/\(id)/")
 		var urlRequest = requestManager.makeUrlRequest(fromURL: url, method: .put)
 		do {
-			urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, isActive: isActive, signingSecret: signingSecret)
+			urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, event: event, isActive: isActive, signingSecret: signingSecret)
 		} catch let error {
 			DLog(error.localizedDescription)
 		}
@@ -1683,6 +1686,7 @@ extension Uploadcare {
 	/// let webhook = try await uploadcare.updateWebhook(
 	///     id: webhookId,
 	///     targetUrl: url,
+	///     event: .fileInfoUpdated, 
 	///     isActive: false,
 	///     signingSecret: "someNewSigningSecret"
 	/// )
@@ -1691,14 +1695,15 @@ extension Uploadcare {
 	/// - Parameters:
 	///   - id: Webhook ID
 	///   - targetUrl: Where webhook data will be posted.
+	///   - event: An event you subscribe to.
 	///   - isActive: Marks a subscription as either active or not.
 	///   - signingSecret: Optional secret that, if set, will be used to calculate signatures for the webhook payloads.
 	/// - Returns: Updated webhook.
 	@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-	public func updateWebhook(id: Int, targetUrl: URL, isActive: Bool, signingSecret: String? = nil) async throws -> Webhook {
+	public func updateWebhook(id: Int, targetUrl: URL, event: Webhook.Event = .fileUploaded, isActive: Bool, signingSecret: String? = nil) async throws -> Webhook {
 		let url = urlWithPath("/webhooks/\(id)/")
 		var urlRequest = requestManager.makeUrlRequest(fromURL: url, method: .put)
-		urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, isActive: isActive, signingSecret: signingSecret)
+		urlRequest.httpBody = try createWebhookRequestBody(targetUrl: targetUrl, event: event, isActive: isActive, signingSecret: signingSecret)
 		requestManager.signRequest(&urlRequest)
 
 		do {
@@ -1794,15 +1799,21 @@ extension Uploadcare {
 	public func convertDocuments(
 		_ paths: [String],
 		store: StoringBehavior? = nil,
+		saveInGroup: Bool? = nil,
 		_ completionHandler: @escaping (Result<ConvertDocumentsResponse, RESTAPIError>) -> Void
 	) {
 		let url = urlWithPath("/convert/document/")
 		var urlRequest = requestManager.makeUrlRequest(fromURL: url, method: .post)
 
 		let storeValue = store == StoringBehavior.auto ? .store : store
+		var saveInGroupValue: String? = nil
+		if let saveInGroup {
+			saveInGroupValue = saveInGroup ? "true" : "false"
+		}
 		let requestData = ConvertRequestData(
 			paths: paths,
-			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue
+			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue, 
+			saveInGroup: saveInGroupValue
 		)
 
 		urlRequest.httpBody = try? JSONEncoder().encode(requestData)
@@ -1832,14 +1843,19 @@ extension Uploadcare {
 	///   - store: A flag indicating if we should store your outputs.
 	/// - Returns: Operation response.
 	@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-	public func convertDocuments(_ paths: [String], store: StoringBehavior? = nil) async throws -> ConvertDocumentsResponse {
+	public func convertDocuments(_ paths: [String], store: StoringBehavior? = nil, saveInGroup: Bool? = nil) async throws -> ConvertDocumentsResponse {
 		let url = urlWithPath("/convert/document/")
 		var urlRequest = requestManager.makeUrlRequest(fromURL: url, method: .post)
 
 		let storeValue = store == StoringBehavior.auto ? .store : store
+		var saveInGroupValue: String? = nil
+		if let saveInGroup {
+			saveInGroupValue = saveInGroup ? "true" : "false"
+		}
 		let requestData = ConvertRequestData(
 			paths: paths,
-			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue
+			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue,
+			saveInGroup: saveInGroupValue
 		)
 
 		urlRequest.httpBody = try? JSONEncoder().encode(requestData)
@@ -1881,11 +1897,12 @@ extension Uploadcare {
 	public func convertDocumentsWithSettings(
 		_ tasks: [DocumentConversionJobSettings],
 		store: StoringBehavior? = nil,
+		saveInGroup: Bool? = nil,
 		_ completionHandler: @escaping (Result<ConvertDocumentsResponse, RESTAPIError>) -> Void
 	) {
 		var paths = [String]()
 		tasks.forEach({ paths.append($0.stringValue) })
-		convertDocuments(paths, store: store, completionHandler)
+		convertDocuments(paths, store: store, saveInGroup: saveInGroup, completionHandler)
 	}
 	#endif
 
@@ -1914,10 +1931,10 @@ extension Uploadcare {
 	///   - store: A flag indicating if we should store your outputs.
 	/// - Returns: Operation response.
 	@available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0, *)
-	public func convertDocumentsWithSettings(_ tasks: [DocumentConversionJobSettings], store: StoringBehavior? = nil) async throws -> ConvertDocumentsResponse {
+	public func convertDocumentsWithSettings(_ tasks: [DocumentConversionJobSettings], store: StoringBehavior? = nil, saveInGroup: Bool? = nil) async throws -> ConvertDocumentsResponse {
 		var paths = [String]()
 		tasks.forEach({ paths.append($0.stringValue) })
-		return try await convertDocuments(paths, store: store)
+		return try await convertDocuments(paths, store: store, saveInGroup: saveInGroup)
 	}
 
 	/// Document conversion job status.
@@ -2096,7 +2113,8 @@ extension Uploadcare {
 		let storeValue = store == StoringBehavior.auto ? .store : store
 		let requestData = ConvertRequestData(
 			paths: paths,
-			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue
+			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue,
+			saveInGroup: nil
 		)
 
 		urlRequest.httpBody = try? JSONEncoder().encode(requestData)
@@ -2136,7 +2154,8 @@ extension Uploadcare {
 		let storeValue = store == StoringBehavior.auto ? .store : store
 		let requestData = ConvertRequestData(
 			paths: paths,
-			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue
+			store: storeValue?.rawValue ?? StoringBehavior.store.rawValue,
+			saveInGroup: nil
 		)
 
 		urlRequest.httpBody = try? JSONEncoder().encode(requestData)