Merge pull request #44 from appspector/develop

Release 0.6.2

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.6.2 30 Mar 2021
+* Add internal updates
+
 ## 0.6.1 14 Mar 2021
 * Fix for incorrect HTTP response handling on iOS
 

example/ios/AppSpectorPluginTests/ASPluginEventsHandlerTests.m

@@ -66,7 +66,6 @@ - (void)testHandlerReturnsErrorForInvalidCallArgs {
     [self waitForExpectations:@[e] timeout:1.1];
 }
 
-
 - (void)testHandlerSendsLogEvent {
     NSDictionary *payload = @{ @"level" : @"warning",
                                @"message" : @"test" };

example/ios/AppSpectorPluginTests/AppSpectorPluginTests.m

@@ -187,4 +187,29 @@ - (void)testHandlerRejectsUnknownCalls {
     [self waitForExpectations:@[e] timeout:0.1];
 }
 
+- (void)testHandlerExtractsEnvFlagFromArgs {
+    XCTestExpectation *e = [self expectationWithDescription:@""];
+
+    FlutterMethodCall *call = [FlutterMethodCall methodCallWithMethodName:@"run" arguments:@{ @"apiKey" : @"DEADBEEF",
+                                                                                              @"enabledMonitors" : @[],
+                                                                                              @"metadata" : @{ @"APPSPECTOR_CHECK_STORE_ENVIRONMENT" : @"false" }
+    }];
+    OCMStub([self.validatorMock controlMethodSupported:[OCMArg any]]).andReturn(YES);
+    OCMStub([self.validatorMock argumentsValid:call.arguments call:call.method error:[OCMArg anyObjectRef]]).andReturn(YES);
+
+    id sdkMock = OCMClassMock([AppSpector class]);
+    OCMExpect(ClassMethod([sdkMock runWithConfig:[OCMArg checkWithBlock:^BOOL(AppSpectorConfig *config) {
+        expect([config valueForKey:@"disableProductionCheck"]).to.beTruthy();
+        return YES;
+    }]]));
+
+    [self.handler handleMethodCall:call result:^(id result) {
+        expect(result).equal(@"Ok");
+        OCMVerifyAll(sdkMock);
+        [e fulfill];
+    }];
+
+    [self waitForExpectations:@[e] timeout:0.1];
+}
+
 @end

example/ios/Podfile

@@ -29,7 +29,6 @@ flutter_ios_podfile_setup
 
 target 'Runner' do
   flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
-
   target 'AppSpectorPluginTests' do
     pod 'Expecta', '~> 1.0.5'
     pod 'OCMock', '~> 3.4'

ios/Classes/AppSpectorPlugin.m

@@ -13,6 +13,8 @@
 static NSString * const kControlChannelName = @"appspector_plugin";
 static NSString * const kEventChannelName   = @"appspector_event_channel";
 
+static NSString * const kEnvCheckOptionKey  = @"APPSPECTOR_CHECK_STORE_ENVIRONMENT";
+
 @interface AppSpectorPlugin ()
 
 @property (strong, nonatomic) ASPluginCallValidator *callValidator;
@@ -54,6 +56,8 @@ + (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
     [registrar addMethodCallDelegate:plugin.eventsHandler channel:eventChannel];
 }
 
+#pragma mark - Call handlers -
+
 - (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
     if ([self.callValidator controlMethodSupported:call.method]) {
         // Validate arguments
@@ -94,8 +98,21 @@ - (void)handleRunCall:(ASPluginMethodArgumentsList *)arguments result:(FlutterRe
     NSSet<ASMonitorID> *monitorIds = [self validateAndMapRawMonitorIds:arguments[@"enabledMonitors"]];
 
     AppSpectorConfig *config = [AppSpectorConfig configWithAPIKey:apiKey monitorIDs:monitorIds];
-    config.metadata = [self validateAndMapRawMeatdata:arguments[@"metadata"]];
 
+    // Handle special case when private SDK options are transferred via metadata
+    if (arguments[@"metadata"] != [NSNull null] && [arguments[@"metadata"][kEnvCheckOptionKey] isKindOfClass:[NSString class]]) {
+        NSString *checkOption = arguments[@"metadata"][kEnvCheckOptionKey];
+        NSNumber *productionCheck = [checkOption isEqualToString:@"true"] ? @(NO) : @(YES);
+        [config setValue:productionCheck forKey:@"disableProductionCheck"];
+
+        // Drop flag to not include in session metadata
+        NSMutableDictionary *mutableArgs = [arguments mutableCopy];
+        [[arguments mutableCopy] removeObjectForKey:kEnvCheckOptionKey];
+        arguments = [mutableArgs copy];
+    }
+
+    config.metadata = [self validateAndMapRawMeatdata:arguments[@"metadata"]];
+
     __weak __auto_type weakSelf = self;
     config.startCallback = ^(NSURL * _Nonnull sessionURL) {
         [weakSelf.controlChannel invokeMethod:@"onSessionUrl" arguments:sessionURL.absoluteString];
@@ -124,10 +141,10 @@ - (void)handleIsStartedCallWithResult:(FlutterResult)result {
 - (void)handleSetMetadataCall:(ASPluginMethodArgumentsList *)arguments result:(FlutterResult)result {
     NSString *key = arguments[@"key"];
     NSString *value = arguments[@"value"];
-  
+
     if (key != nil && (id)key != NSNull.null && value != nil && (id)value != NSNull.null) {
-      ASMetadata *metadata = @{key : value};
-      [AppSpector updateMetadata:metadata];
+        ASMetadata *metadata = @{key : value};
+        [AppSpector updateMetadata:metadata];
     }
 
     result(@"Ok");
@@ -139,6 +156,8 @@ - (void)handleRemoveMetadataCall:(ASPluginMethodArgumentsList *)arguments result
     result(@"Ok");
 }
 
+#pragma mark - Validators -
+
 - (ASMetadata *)validateAndMapRawMeatdata:(NSDictionary *)rawMetadata {
   if (rawMetadata == nil || (id)rawMetadata == NSNull.null) {
     return @{};

pubspec.yaml

@@ -1,6 +1,6 @@
 name: appspector
 description: A plugin that integrate AppSpector to your Flutter project.
-version: 0.6.1
+version: 0.6.2
 homepage: https://github.com/appspector/flutter-plugin
 
 environment: