From 2317237e95fb881afe2174c46d96b004dc444555 Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Tue, 15 Oct 2024 17:56:09 -0300 Subject: [PATCH 1/2] Add missing export; rename file --- splitio/lib/splitio.dart | 1 + ...ration.dart => split_certificate_pinning_configuration.dart} | 0 splitio_platform_interface/lib/split_configuration.dart | 2 +- .../test/certificate_pinning_configuration_test.dart | 2 +- splitio_platform_interface/test/splitio_configuration_test.dart | 2 +- 5 files changed, 4 insertions(+), 3 deletions(-) rename splitio_platform_interface/lib/{certificate_pinning_configuration.dart => split_certificate_pinning_configuration.dart} (100%) diff --git a/splitio/lib/splitio.dart b/splitio/lib/splitio.dart index 0c2c2d6..029d523 100644 --- a/splitio/lib/splitio.dart +++ b/splitio/lib/splitio.dart @@ -9,6 +9,7 @@ export 'package:splitio_platform_interface/split_impression.dart'; export 'package:splitio_platform_interface/split_result.dart'; export 'package:splitio_platform_interface/split_sync_config.dart'; export 'package:splitio_platform_interface/split_view.dart'; +export 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart'; typedef ClientReadinessCallback = void Function(SplitClient splitClient); diff --git a/splitio_platform_interface/lib/certificate_pinning_configuration.dart b/splitio_platform_interface/lib/split_certificate_pinning_configuration.dart similarity index 100% rename from splitio_platform_interface/lib/certificate_pinning_configuration.dart rename to splitio_platform_interface/lib/split_certificate_pinning_configuration.dart diff --git a/splitio_platform_interface/lib/split_configuration.dart b/splitio_platform_interface/lib/split_configuration.dart index 3856c41..7367e79 100644 --- a/splitio_platform_interface/lib/split_configuration.dart +++ b/splitio_platform_interface/lib/split_configuration.dart @@ -1,4 +1,4 @@ -import 'package:splitio_platform_interface/certificate_pinning_configuration.dart'; +import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart'; import 'package:splitio_platform_interface/split_sync_config.dart'; class SplitConfiguration { diff --git a/splitio_platform_interface/test/certificate_pinning_configuration_test.dart b/splitio_platform_interface/test/certificate_pinning_configuration_test.dart index 2d3ab77..e8c43d2 100644 --- a/splitio_platform_interface/test/certificate_pinning_configuration_test.dart +++ b/splitio_platform_interface/test/certificate_pinning_configuration_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:splitio_platform_interface/certificate_pinning_configuration.dart'; +import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart'; void main() { test('single pin can be added', () { diff --git a/splitio_platform_interface/test/splitio_configuration_test.dart b/splitio_platform_interface/test/splitio_configuration_test.dart index 0b402b8..dfbb705 100644 --- a/splitio_platform_interface/test/splitio_configuration_test.dart +++ b/splitio_platform_interface/test/splitio_configuration_test.dart @@ -1,5 +1,5 @@ import 'package:flutter_test/flutter_test.dart'; -import 'package:splitio_platform_interface/certificate_pinning_configuration.dart'; +import 'package:splitio_platform_interface/split_certificate_pinning_configuration.dart'; import 'package:splitio_platform_interface/split_configuration.dart'; import 'package:splitio_platform_interface/split_sync_config.dart'; From fe9f6c08a76493f082b0ed08b3f71f5f04635d0d Mon Sep 17 00:00:00 2001 From: Gaston Thea Date: Thu, 17 Oct 2024 09:47:39 -0300 Subject: [PATCH 2/2] Replace Set with List --- .../lib/split_certificate_pinning_configuration.dart | 6 +++--- .../lib/split_configuration.dart | 10 +++++----- .../test/splitio_configuration_test.dart | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/splitio_platform_interface/lib/split_certificate_pinning_configuration.dart b/splitio_platform_interface/lib/split_certificate_pinning_configuration.dart index 9166ec1..78b9a0b 100644 --- a/splitio_platform_interface/lib/split_certificate_pinning_configuration.dart +++ b/splitio_platform_interface/lib/split_certificate_pinning_configuration.dart @@ -1,8 +1,8 @@ class CertificatePinningConfiguration { - final Map> _pins = {}; + final Map> _pins = {}; - Map> get pins => _pins; + Map> get pins => _pins; CertificatePinningConfiguration addPin(String host, String pin) { pin = pin.trim(); @@ -11,7 +11,7 @@ class CertificatePinningConfiguration { } if (!_pins.containsKey(host)) { - _pins[host] = {}; + _pins[host] = []; } _pins[host]?.add(pin); diff --git a/splitio_platform_interface/lib/split_configuration.dart b/splitio_platform_interface/lib/split_configuration.dart index 7367e79..e1bf0f9 100644 --- a/splitio_platform_interface/lib/split_configuration.dart +++ b/splitio_platform_interface/lib/split_configuration.dart @@ -46,7 +46,7 @@ class SplitConfiguration { /// /// [readyTimeout] Maximum amount of time in seconds to wait before firing the SDK_READY_TIMED_OUT event. Defaults to 10 seconds. /// - /// [certificatePinningConfig] Certificate pinning configuration. It is a map where the key is the host and the value is a set of base64 SHA-256 or base64 SHA-1 hashes of the SPKI. + /// [certificatePinningConfiguration] Certificate pinning configuration. It is a map where the key is the host and the value is a set of base64 SHA-256 or base64 SHA-1 hashes of the SPKI. SplitConfiguration({ int? featuresRefreshRate, int? segmentsRefreshRate, @@ -73,7 +73,7 @@ class SplitConfiguration { bool? encryptionEnabled, SplitLogLevel? logLevel, int? readyTimeout = 10, - CertificatePinningConfiguration? certificatePinningConfig, + CertificatePinningConfiguration? certificatePinningConfiguration, }) { if (featuresRefreshRate != null) { configurationMap['featuresRefreshRate'] = featuresRefreshRate; @@ -180,10 +180,10 @@ class SplitConfiguration { configurationMap['readyTimeout'] = readyTimeout; } - if (certificatePinningConfig != null && - certificatePinningConfig.pins.isNotEmpty) { + if (certificatePinningConfiguration != null && + certificatePinningConfiguration.pins.isNotEmpty) { configurationMap['certificatePinningConfiguration'] = { - 'pins': certificatePinningConfig.pins + 'pins': certificatePinningConfiguration.pins }; } } diff --git a/splitio_platform_interface/test/splitio_configuration_test.dart b/splitio_platform_interface/test/splitio_configuration_test.dart index dfbb705..a98d9ce 100644 --- a/splitio_platform_interface/test/splitio_configuration_test.dart +++ b/splitio_platform_interface/test/splitio_configuration_test.dart @@ -31,7 +31,7 @@ void main() { encryptionEnabled: true, logLevel: SplitLogLevel.debug, readyTimeout: 1, - certificatePinningConfig: CertificatePinningConfiguration() + certificatePinningConfiguration: CertificatePinningConfiguration() .addPin('host1', 'pin1') .addPin('host2', 'pin3') .addPin('host1', 'pin2'));