fix: use apiHost from settings when present

North-Two-Five · Apr 10, 2024 · d14a949 · d14a949
2 parents f2226ad + fc15b18
commit d14a949
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/packages/core/lib/plugins/segment_destination.dart b/packages/core/lib/plugins/segment_destination.dart
@@ -12,6 +12,7 @@ const segmentDestinationKey = 'Segment.io';
 
 class SegmentDestination extends DestinationPlugin with Flushable {
   late final QueueFlushingPlugin _queuePlugin;
+  String? _apiHost;
 
   SegmentDestination() : super(segmentDestinationKey) {
     _queuePlugin = QueueFlushingPlugin(_sendEvents);
@@ -32,7 +33,8 @@ class SegmentDestination extends DestinationPlugin with Flushable {
     await Future.forEach(chunkedEvents, (batch) async {
       try {
         final succeeded = await analytics?.httpClient.startBatchUpload(
-            analytics!.state.configuration.state.writeKey, batch);
+            analytics!.state.configuration.state.writeKey, batch,
+            host: _apiHost);
         if (succeeded == null || !succeeded) {
           numFailedEvents += batch.length;
         }
@@ -64,6 +66,12 @@ class SegmentDestination extends DestinationPlugin with Flushable {
     add(_queuePlugin);
   }
 
+  @override
+  void update(Map<String, dynamic> settings, ContextUpdateType type) {
+    super.update(settings, type);
+    _apiHost = settings[segmentDestinationKey]?['apiHost'];
+  }
+
   @override
   flush() {
     return _queuePlugin.flush();

diff --git a/packages/core/lib/state.dart b/packages/core/lib/state.dart
@@ -516,15 +516,15 @@ class Configuration {
   final int? maxBatchSize;
   final Map<String, dynamic>? defaultIntegrationSettings;
   final bool autoAddSegmentDestination;
-  final String apiHost;
+  final String? apiHost;
   final String cdnHost;
 
   final RequestFactory? requestFactory;
   final StreamSubscription<AppStatus> Function()? appStateStream;
   final ErrorHandler? errorHandler;
 
   Configuration(this.writeKey,
-      {this.apiHost = HTTPClient.defaultAPIHost,
+      {this.apiHost,
       this.autoAddSegmentDestination = true,
       this.collectDeviceId = false,
       this.cdnHost = HTTPClient.defaultCDNHost,

diff --git a/packages/core/lib/utils/http_client.dart b/packages/core/lib/utils/http_client.dart
@@ -27,9 +27,12 @@ class HTTPClient {
   ///   - key: The write key the events are assocaited with.
   ///   - batch: The array of the events, considered a batch of events.
   ///   - completion: The closure executed when done. Passes if the task should be retried or not if failed.
-  Future<bool> startBatchUpload(String writeKey, List<RawEvent> batch) async {
-    Uri uploadURL =
-        _url(_analytics.target!.state.configuration.state.apiHost, "/b");
+  Future<bool> startBatchUpload(String writeKey, List<RawEvent> batch,
+      {String? host = null}) async {
+    final apihost = _analytics.target!.state.configuration.state.apiHost ??
+        host ??
+        defaultAPIHost;
+    Uri uploadURL = _url(apihost, "/b");
 
     try {
       var urlRequest = _configuredRequest(uploadURL, "POST",