fix: change sendfile to sendbytestream [#79] (#91)

clerk · Jan 9, 2025 · 5bfd9ba · 5bfd9ba
1 parent ed332f9
commit 5bfd9ba
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 35 deletions.
diff --git a/packages/clerk_auth/lib/src/clerk_api/api.dart b/packages/clerk_auth/lib/src/clerk_api/api.dart
@@ -447,10 +447,16 @@ class Api with Logging {
     try {
       final queryParams = _queryParams(HttpMethod.post, withSession: true);
       final uri = _uri('/me/profile_image', queryParams);
-
+      final length = await file.length();
       final headers = _headers(HttpMethod.post);
-
-      final resp = await _client.sendFile(HttpMethod.post, uri, file, headers);
+      final stream = http.ByteStream(file.openRead());
+      final resp = await _client.sendByteStream(
+        HttpMethod.post,
+        uri,
+        stream,
+        length,
+        headers,
+      );
       return _processResponse(resp);
     } catch (error, stacktrace) {
       logSevere('Error during fetch', error, stacktrace);

diff --git a/packages/clerk_auth/lib/src/clerk_auth/http_client.dart b/packages/clerk_auth/lib/src/clerk_auth/http_client.dart
@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:clerk_auth/clerk_auth.dart';
 import 'package:http/http.dart';
-import 'package:http_parser/http_parser.dart';
 
 /// Enum detailing [HttpMethod]s used by the Clerk API
 enum HttpMethod {
@@ -49,10 +48,11 @@ abstract class HttpClient {
 
   /// Upload a [File] to the back end, and receive a [Response]
   ///
-  Future<Response> sendFile(
+  Future<Response> sendByteStream(
     HttpMethod method,
     Uri uri,
-    File file,
+    ByteStream byteStream,
+    int length,
     Map<String, String> headers,
   );
 }
@@ -63,8 +63,6 @@ class DefaultHttpClient implements HttpClient {
   /// Constructor
   const DefaultHttpClient();
 
-  static const _imageExts = ['png', 'webp'];
-
   @override
   Future<Response> send(
     HttpMethod method,
@@ -87,34 +85,25 @@ class DefaultHttpClient implements HttpClient {
   }
 
   @override
-  Future<Response> sendFile(
+  Future<Response> sendByteStream(
     HttpMethod method,
     Uri uri,
-    File file,
+    ByteStream byteStream,
+    int length,
     Map<String, String> headers,
   ) async {
     final request = MultipartRequest(method.toString(), uri);
     request.headers.addAll(headers);
 
-    final multipartFile = await MultipartFile.fromPath(
+    final multipartFile = MultipartFile(
       'file',
-      file.path,
-      contentType: _contentTypeFor(file),
+      byteStream,
+      length,
+      filename: byteStream.hashCode.toString(),
     );
     request.files.add(multipartFile);
 
     final streamedResponse = await request.send();
     return Response.fromStream(streamedResponse);
   }
-
-  MediaType _contentTypeFor(File file) {
-    return switch (file.path.split('.').last.toLowerCase()) {
-      'jpg' => MediaType('image', 'jpeg'),
-      String ext when _imageExts.contains(ext) => MediaType('image', ext),
-      String ext => throw AuthError(
-          message: 'Unknown media type for upload: ###',
-          substitution: ext,
-        ),
-    };
-  }
 }
diff --git a/packages/clerk_auth/pubspec.yaml b/packages/clerk_auth/pubspec.yaml
@@ -13,7 +13,6 @@ environment:
 dependencies:
   collection: ^1.17.1
   http: ^1.1.0
-  http_parser: ^4.0.2
   json_annotation: ^4.9.0
   logging: ^1.2.0
 

diff --git a/packages/clerk_auth/test/test_helpers.dart b/packages/clerk_auth/test/test_helpers.dart
@@ -4,7 +4,7 @@ import 'dart:io';
 import 'package:clerk_auth/src/clerk_auth/http_client.dart';
 import 'package:clerk_auth/src/utils/logging.dart';
 import 'package:dart_dotenv/dart_dotenv.dart';
-import 'package:http/http.dart' show Response;
+import 'package:http/http.dart' show ByteStream, Response;
 
 class TestEnv {
   TestEnv._(this._map);
@@ -99,10 +99,11 @@ class TestHttpClient implements HttpClient {
       map.entries.map((me) => '${me.key}=${me.value}').join('&');
 
   @override
-  Future<Response> sendFile(
+  Future<Response> sendByteStream(
     HttpMethod method,
     Uri uri,
-    File file,
+    ByteStream stream,
+    int length,
     Map<String, String> headers,
   ) {
     // TODO: add tests for sendFile

diff --git a/packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_in_panel.dart b/packages/clerk_flutter/lib/src/widgets/authentication/clerk_sign_in_panel.dart
@@ -131,7 +131,7 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel> {
             children: [
               if (env.hasPasswordStrategy)
                 Padding(
-                  padding: horizontalPadding32 + verticalPadding8,
+                  padding: verticalPadding8,
                   child: ClerkTextFormField(
                     label: translator.translate('Password'),
                     obscureText: true,
@@ -141,15 +141,12 @@ class _ClerkSignInPanelState extends State<ClerkSignInPanel> {
                   ),
                 ),
               if (env.hasOtherStrategies) ...[
-                if (env.hasPasswordStrategy)
-                  const Padding(
-                    padding: horizontalPadding32,
-                    child: OrDivider(),
-                  ),
+                if (env.hasPasswordStrategy) //
+                  const OrDivider(),
                 for (final strategy in env.otherStrategies)
                   if (StrategyButton.supports(strategy))
                     Padding(
-                      padding: topPadding4 + horizontalPadding32,
+                      padding: topPadding4,
                       child: StrategyButton(
                           key: ValueKey<clerk.Strategy>(strategy),
                           strategy: strategy,