Revert "refactor: use environment variables to communicate gcs.Storage config (#186)"

This reverts commit 38b8088.

Author: demolaf

packages/dart_firebase_admin/lib/src/storage/storage.dart

@@ -1,14 +1,36 @@
 import 'dart:convert';
 
 import 'package:google_cloud_storage/google_cloud_storage.dart' as gcs;
+import 'package:http/http.dart' as http;
 import 'package:meta/meta.dart';
 import '../app.dart';
-import '../utils/native_environment.dart';
 
 part 'storage_exception.dart';
 
+/// An [http.BaseClient] that lazily resolves the real client on each request.
+///
+/// This allows [Storage] to be constructed synchronously even though
+/// [FirebaseApp.client] is asynchronous. The underlying client lifecycle is
+/// managed externally (by [FirebaseApp]), so [close] is a no-op here.
+class _DeferredHttpClient extends http.BaseClient {
+  _DeferredHttpClient(this._clientFuture);
+
+  final Future<http.Client> _clientFuture;
+
+  @override
+  Future<http.StreamedResponse> send(http.BaseRequest request) async {
+    return (await _clientFuture).send(request);
+  }
+
+  @override
+  void close() {
+    // The underlying client is managed externally; do not close it here.
+  }
+}
+
 class Storage implements FirebaseService {
   Storage._(this.app) {
+    String? apiEndpoint;
     final isEmulator = Environment.isStorageEmulatorEnabled();
 
     if (isEmulator) {
@@ -20,9 +42,25 @@ class Storage implements FirebaseService {
           'FIREBASE_STORAGE_EMULATOR_HOST should not contain a protocol (http or https).',
         );
       }
-      setNativeEnvironmentVariable('STORAGE_EMULATOR_HOST', emulatorHost);
+      // The new gcs.Storage adds the http:// scheme automatically when
+      // useAuthWithCustomEndpoint is false, so pass only host:port.
+      apiEndpoint = emulatorHost;
     }
-    _delegate = gcs.Storage();
+
+    // For emulator, use the provided httpClient (e.g. a mock in tests) or a
+    // plain unauthenticated client. For production, wrap the async auth client
+    // in a _DeferredHttpClient so construction stays synchronous.
+    final http.Client httpClient = isEmulator
+        ? _DeferredHttpClient(
+            Future.value(app.options.httpClient ?? http.Client()),
+          )
+        : _DeferredHttpClient(app.client);
+
+    _delegate = gcs.Storage(
+      client: httpClient,
+      apiEndpoint: apiEndpoint,
+      useAuthWithCustomEndpoint: false,
+    );
   }
 
   @internal
@@ -35,7 +73,7 @@ class Storage implements FirebaseService {
 
   late final gcs.Storage _delegate;
 
-  gcs.Bucket bucket([String? name]) {
+  gcs.Bucket bucket(String? name) {
     final bucketName = name ?? app.options.storageBucket;
     if (bucketName == null || bucketName.isEmpty) {
       throw FirebaseAppException(
@@ -96,6 +134,8 @@ class Storage implements FirebaseService {
 
   @override
   Future<void> delete() async {
+    // _delegate.close() calls close() on our _DeferredHttpClient, which is a
+    // no-op, so the externally-managed http client is not closed here.
     _delegate.close();
   }
 }

packages/dart_firebase_admin/lib/src/utils/native_environment.dart

@@ -14,12 +14,9 @@ dependencies:
   collection: ^1.18.0
   dart_jsonwebtoken: ^3.0.0
   equatable: ^2.0.7
-  ffi: ^2.1.2
   google_cloud: ^0.3.0
   google_cloud_firestore: ^0.1.0
-  # `google_cloud_storage` will not change the surface used by
-  # `dart_firebase_admin`.
-  google_cloud_storage: ">=0.5.1"
+  google_cloud_storage: ^0.5.1
   googleapis: ^15.0.0
   googleapis_auth: ^2.2.0
   googleapis_beta: ^9.0.0