Merge branch 'master' into feature/partial-update

packages/stream_chat/lib/src/api/channel.dart

@@ -480,17 +480,19 @@ class Channel {
   }
 
   /// Delete a file from this channel
-  Future<EmptyResponse> deleteFile(String url) async {
-    final response = await _client
-        .delete('$_channelURL/file', queryParameters: {'url': url});
-    return _client.decode(response.data, EmptyResponse.fromJson);
+  Future<EmptyResponse> deleteFile(
+    String url, {
+    CancelToken cancelToken,
+  }) {
+    return _client.deleteFile(url, id, type, cancelToken: cancelToken);
   }
 
   /// Delete an image from this channel
-  Future<EmptyResponse> deleteImage(String url) async {
-    final response = await _client
-        .delete('$_channelURL/image', queryParameters: {'url': url});
-    return _client.decode(response.data, EmptyResponse.fromJson);
+  Future<EmptyResponse> deleteImage(
+    String url, {
+    CancelToken cancelToken,
+  }) {
+    return _client.deleteImage(url, id, type, cancelToken: cancelToken);
   }
 
   /// Send an event on this channel

packages/stream_chat/lib/src/attachment_file_uploader.dart

@@ -31,6 +31,28 @@ abstract class AttachmentFileUploader {
     ProgressCallback onSendProgress,
     CancelToken cancelToken,
   });
+
+  /// Deletes a image using its [url] from the given channel.
+  /// Returns [EmptyResponse] once deleted successfully.
+  ///
+  /// Optionally, cancel the request using [cancelToken]
+  Future<EmptyResponse> deleteImage(
+    String url,
+    String channelId,
+    String channelType, {
+    CancelToken cancelToken,
+  });
+
+  /// Deletes a file using its [url] from the given channel.
+  /// Returns [EmptyResponse] once deleted successfully.
+  ///
+  /// Optionally, cancel the request using [cancelToken]
+  Future<EmptyResponse> deleteFile(
+    String url,
+    String channelId,
+    String channelType, {
+    CancelToken cancelToken,
+  });
 }
 
 /// Stream's default implementation of [AttachmentFileUploader]
@@ -89,4 +111,34 @@ class StreamAttachmentFileUploader implements AttachmentFileUploader {
     );
     return _client.decode(response.data, SendFileResponse.fromJson);
   }
+
+  @override
+  Future<EmptyResponse> deleteImage(
+    String url,
+    String channelId,
+    String channelType, {
+    CancelToken cancelToken,
+  }) async {
+    final response = await _client.delete(
+      '/channels/$channelType/$channelId/image',
+      queryParameters: {'url': url},
+      cancelToken: cancelToken,
+    );
+    return _client.decode(response.data, EmptyResponse.fromJson);
+  }
+
+  @override
+  Future<EmptyResponse> deleteFile(
+    String url,
+    String channelId,
+    String channelType, {
+    CancelToken cancelToken,
+  }) async {
+    final response = await _client.delete(
+      '/channels/$channelType/$channelId/file',
+      queryParameters: {'url': url},
+      cancelToken: cancelToken,
+    );
+    return _client.decode(response.data, EmptyResponse.fromJson);
+  }
 }

packages/stream_chat/lib/src/client.dart

@@ -822,10 +822,14 @@ class StreamChatClient {
   Future<Response<String>> delete(
     String path, {
     Map<String, dynamic> queryParameters,
+    CancelToken cancelToken,
   }) async {
     try {
-      final response = await httpClient.delete<String>(path,
-          queryParameters: queryParameters);
+      final response = await httpClient.delete<String>(
+        path,
+        queryParameters: queryParameters,
+        cancelToken: cancelToken,
+      );
       return response;
     } on DioError catch (error) {
       throw _parseError(error);
@@ -1076,6 +1080,36 @@ class StreamChatClient {
     );
   }
 
+  /// Delete a file from this channel
+  Future<EmptyResponse> deleteFile(
+    String url,
+    String channelId,
+    String channelType, {
+    CancelToken cancelToken,
+  }) {
+    return attachmentFileUploader.deleteFile(
+      url,
+      channelId,
+      channelType,
+      cancelToken: cancelToken,
+    );
+  }
+
+  /// Delete an image from this channel
+  Future<EmptyResponse> deleteImage(
+    String url,
+    String channelId,
+    String channelType, {
+    CancelToken cancelToken,
+  }) {
+    return attachmentFileUploader.deleteImage(
+      url,
+      channelId,
+      channelType,
+      cancelToken: cancelToken,
+    );
+  }
+
   /// Add a device for Push Notifications.
   Future<EmptyResponse> addDevice(String id, PushProvider pushProvider) async {
     final response = await post('/devices', data: {