Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 49 additions & 0 deletions UnitTests/MPKitContainerTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -703,6 +703,55 @@ - (void)testConfiguredKits {

}

- (void)testConfiguredKitsWhenDisabled {
NSArray *configurations = @[
@{
@"id":@(42),
@"as":@{
@"secretKey":@"MySecretKey",
@"sendTransactionData":@"true"
},
@"eau":@false
},
@{
@"id":@314,
@"as":@{
@"secretKey":@"MySecretKey",
@"sendTransactionData":@"true"
},
@"eau":@false
}
];

MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:configurations[1]];
NSNumber *kitId = configurations[1][@"id"];
[[kitContainer startKit:kitId configuration:kitConfiguration] start];
kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:configurations[0]];
kitId = configurations[0][@"id"];
[[kitContainer startKit:kitId configuration:kitConfiguration] start];

[kitContainer configureKits:nil];
[kitContainer configureKits:configurations];

NSArray<id<MPExtensionKitProtocol>> *activeKits = [kitContainer activeKitsRegistry];
XCTAssertEqual(activeKits.count, 2);
XCTAssertEqualObjects(activeKits[0].code, @42);
XCTAssertEqualObjects(activeKits[1].code, @314);
NSArray<NSNumber *> *configuredKits = [kitContainer configuredKitsRegistry];
XCTAssertEqual(configuredKits.count, 2);
XCTAssertTrue([configuredKits containsObject:@42]);
XCTAssertTrue([configuredKits containsObject:@314]);

NSArray<NSNumber *> *disabledKitsId = @[@(42)];
[kitContainer setDisabledKits:disabledKitsId];
NSArray<id<MPExtensionKitProtocol>> *updatedActiveKits = [kitContainer activeKitsRegistry];
XCTAssertEqual(updatedActiveKits.count, 1);
XCTAssertEqualObjects(updatedActiveKits[0].code, @314);
NSArray<NSNumber *> *updatedConfiguredKits = [kitContainer configuredKitsRegistry];
XCTAssertEqual(updatedConfiguredKits.count, 1);
XCTAssertTrue([updatedConfiguredKits containsObject:@314]);
}

- (void)testForwardLoggedInUserWithMultipleKits {
MParticleUser *currentUser = [MParticle sharedInstance].identity.currentUser;
currentUser.isLoggedIn = true;
Expand Down
2 changes: 2 additions & 0 deletions mParticle-Apple-SDK/Include/mParticle.h
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,8 @@ Defaults to false. Prevents the eventsHost above from overwriting the alias endp
*/
@property (nonatomic, strong, readwrite, nullable) MPDataPlanOptions *dataPlanOptions;

@property (nonatomic, strong, readwrite, nullable) NSArray<NSNumber *> *disabledKits;

/**
Set the App Tracking Transparency Authorization Status upon starting the SDK.
Only sets a new state if it has changed.
Expand Down
20 changes: 14 additions & 6 deletions mParticle-Apple-SDK/Kits/MPKitContainer.mm
Original file line number Diff line number Diff line change
Expand Up @@ -294,10 +294,13 @@ - (void)initializeKits {

for (NSDictionary *kitConfigurationDictionary in directoryContents) {
MPKitConfiguration *kitConfiguration = [[MPKitConfiguration alloc] initWithDictionary:kitConfigurationDictionary];
self.kitConfigurations[kitConfiguration.integrationId] = kitConfiguration;
[self startKit:kitConfiguration.integrationId configuration:kitConfiguration];

self.kitsInitialized = YES;
BOOL shouldStartKit = !(_disabledKits && _disabledKits.count && [_disabledKits containsObject:kitConfiguration.integrationId]);
if (shouldStartKit) {
self.kitConfigurations[kitConfiguration.integrationId] = kitConfiguration;
[self startKit:kitConfiguration.integrationId configuration:kitConfiguration];

self.kitsInitialized = YES;
}
}
if (self.sideloadedKits.count > 0) {
self.kitsInitialized = YES;
Expand Down Expand Up @@ -1953,7 +1956,9 @@ - (void)removeKitsFromRegistryInvalidForWorkspaceSwitch {
BOOL disabledByExcludingAnonymousUsers = (self.kitConfigurations[kitRegister.code].excludeAnonymousUsers && !currentUser.isLoggedIn);
BOOL disabledByRamping = !(bracket == nullptr || (bracket != nullptr && bracket->shouldForward()));

if (active && !disabledByRamping && !disabledByConsent && !disabledByExcludingAnonymousUsers) {
BOOL disabledKit = [_disabledKits containsObject:kitRegister.code];

if (active && !disabledByRamping && !disabledByConsent && !disabledByExcludingAnonymousUsers && !disabledKit) {
[activeKitsRegistry addObject:kitRegister];
}
}
Expand Down Expand Up @@ -2132,7 +2137,10 @@ - (void)configureKits:(NSArray<NSDictionary *> *)kitConfigurations {

NSMutableArray<NSNumber *> *supportedKits = [[NSMutableArray alloc] initWithCapacity:kitsRegistry.count];
for (id<MPExtensionKitProtocol>kitRegister in kitsRegistry) {
[supportedKits addObject:kitRegister.code];
BOOL shouldStartKit = !(_disabledKits && _disabledKits.count && [_disabledKits containsObject:kitRegister.code]);
if (shouldStartKit) {
[supportedKits addObject:kitRegister.code];
}
}

return supportedKits;
Expand Down
2 changes: 2 additions & 0 deletions mParticle-Apple-SDK/mParticle.m
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ @interface MParticle() <MPBackendControllerDelegate
@property (nonatomic, strong, nullable) NSString *dataPlanId;
@property (nonatomic, strong, nullable) NSNumber *dataPlanVersion;
@property (nonatomic, readwrite) MPDataPlanOptions *dataPlanOptions;
@property (nonatomic, readwrite) NSArray<NSNumber *> *disabledKits;

@end

Expand Down Expand Up @@ -671,6 +672,7 @@ - (void)startWithOptions:(MParticleOptions *)options {

_kitContainer_PRIVATE = [[MPKitContainer_PRIVATE alloc] init];
_kitContainer_PRIVATE.sideloadedKits = options.sideloadedKits ?: [NSArray array];
_kitContainer_PRIVATE.disabledKits = options.disabledKits;
NSUInteger sideLoadedKitsCount = _kitContainer_PRIVATE.sideloadedKits.count;
[userDefaults setSideloadedKitsCount:sideLoadedKitsCount];

Expand Down
Loading