api: Add contentType param to ApiConnection.postFileFromStream

Author: chrisbobbe

lib/api/core.dart

@@ -3,6 +3,7 @@ import 'dart:io';
 
 import 'package:flutter/foundation.dart';
 import 'package:http/http.dart' as http;
+import 'package:http_parser/http_parser.dart';
 
 import '../log.dart';
 import '../model/binding.dart';
@@ -192,10 +193,20 @@ class ApiConnection {
  }
 
  Future<T> postFileFromStream<T>(String routeName, T Function(Map<String, dynamic>) fromJson,
- String path, Stream<List<int>> content, int length, {String? filename}) async {
+ String path, Stream<List<int>> content, int length,
+ {String? filename, String? contentType}) async {
  final url = realmUrl.replace(path: "/api/v1/$path");
+ MediaType? parsedContentType;
+ if (contentType != null) {
+ try {
+ parsedContentType = MediaType.parse(contentType);
+ } on FormatException {
+ // TODO log
+ }
+ }
  final request = http.MultipartRequest('POST', url)
- ..files.add(http.MultipartFile('file', content, length, filename: filename));
+ ..files.add(http.MultipartFile('file', content, length,
+ filename: filename, contentType: parsedContentType));
  return send(routeName, fromJson, request);
  }
 

test/api/core_test.dart

@@ -81,12 +81,17 @@ void main() {
  });
 
  test('ApiConnection.postFileFromStream', () async {
- Future<void> checkRequest(List<List<int>> content, int length, {String? filename}) {
+ Future<void> checkRequest(List<List<int>> content, int length,
+ {String? filename, String? contentType, bool isContentTypeInvalid = false}) {
  return FakeApiConnection.with_(account: eg.selfAccount, (connection) async {
  connection.prepare(json: {});
  await connection.postFileFromStream(
  kExampleRouteName, (json) => json, 'example/route',
- Stream.fromIterable(content), length, filename: filename);
+ Stream.fromIterable(content), length,
+ filename: filename, contentType: contentType);
+ final expectedContentType = (contentType != null && !isContentTypeInvalid)
+ ? contentType
+ : 'application/octet-stream';
  check(connection.lastRequest!).isA<http.MultipartRequest>()
  ..method.equals('POST')
  ..url.asString.equals('${eg.realmUrl.origin}/api/v1/example/route')
@@ -99,6 +104,7 @@ void main() {
  ..field.equals('file')
  ..length.equals(length)
  ..filename.equals(filename)
+ ..contentType.asString.equals(expectedContentType)
  ..has<Future<List<int>>>((f) => f.finalize().toBytes(), 'contents')
  .completes((it) => it.deepEquals(content.expand((l) => l)))
  );
@@ -110,6 +116,10 @@ void main() {
  checkRequest(['asd'.codeUnits, 'f'.codeUnits], 4, filename: null);
 
  checkRequest(['asdf'.codeUnits], 4, filename: 'info.txt');
+ checkRequest(['asdf'.codeUnits], 4,
+ filename: 'image.jpg', contentType: 'image/jpeg');
+ checkRequest(['asdf'.codeUnits], 4,
+ filename: 'image.jpg', contentType: 'asdfjkl;', isContentTypeInvalid: true);
 
  checkRequest(['asdf'.codeUnits], 1, filename: null); // nothing on client side catches a wrong length
  checkRequest(['asdf'.codeUnits], 100, filename: null);

test/stdlib_checks.dart

@@ -9,6 +9,7 @@ import 'dart:convert';
 
 import 'package:checks/checks.dart';
 import 'package:http/http.dart' as http;
+import 'package:http_parser/http_parser.dart';
 
 extension ListChecks<T> on Subject<List<T>> {
  Subject<T> operator [](int index) => has((l) => l[index], '[$index]');
@@ -136,6 +137,10 @@ extension HttpMultipartFileChecks on Subject<http.MultipartFile> {
  Subject<String> get field => has((f) => f.field, 'field');
  Subject<int> get length => has((f) => f.length, 'length');
  Subject<String?> get filename => has((f) => f.filename, 'filename');
- // TODO Subject<MediaType> get contentType => has((f) => f.contentType, 'contentType');
+ Subject<MediaType> get contentType => has((f) => f.contentType, 'contentType');
  Subject<bool> get isFinalized => has((f) => f.isFinalized, 'isFinalized');
 }
+
+extension MediaTypeChecks on Subject<MediaType> {
+ Subject<String> get asString => has((x) => x.toString(), 'toString'); // TODO(checks): what's a good convention for this?
+}