Merge pull request #1362 from Instabug/feat/stop-capturing-network-body

feat: enable/disable stop capturing network body

Author: AyaMahmoud148

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...dev)
+
+### Added
+
+- Add support for enable/disable capturing network body. ([#1362](https://github.com/Instabug/Instabug-React-Native/pull/1362))
+
 # Changelog
 
 ## [Unreleased](https://github.com/Instabug/Instabug-React-Native/compare/v14.1.0...dev)

android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java

@@ -1294,4 +1294,21 @@ public void run() {
 
         });
     }
+    /** 
+    * Enables or disables capturing network body.
+    * @param isEnabled A boolean to enable/disable capturing network body.
+    */
+   @ReactMethod
+   public void setNetworkLogBodyEnabled(final boolean isEnabled) {
+       MainThreadHandler.runOnMainThread(new Runnable() {
+           @Override
+           public void run() {
+               try {
+                   Instabug.setNetworkLogBodyEnabled(isEnabled);
+               } catch (Exception e) {
+                   e.printStackTrace();
+               }
+           }
+       });
+   }
 }

android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java

@@ -676,4 +676,18 @@ public void testEnableAutoMasking(){
 
             mockInstabug.verify(() -> Instabug.setAutoMaskScreenshotsTypes(MaskingType.LABELS,MaskingType.MEDIA,MaskingType.TEXT_INPUTS,MaskingType.MASK_NOTHING));
     }
+    
+    @Test
+    public void testSetNetworkLogBodyEnabled() {
+        rnModule.setNetworkLogBodyEnabled(true);
+    
+        mockInstabug.verify(() -> Instabug.setNetworkLogBodyEnabled(true));
+    }
+
+    @Test
+    public void testSetNetworkLogBodyDisabled() {
+        rnModule.setNetworkLogBodyEnabled(false);
+    
+        mockInstabug.verify(() -> Instabug.setNetworkLogBodyEnabled(false));
+    }
 }

examples/default/ios/InstabugTests/InstabugSampleTests.m

@@ -625,4 +625,13 @@ - (void)testEnableAutoMasking {
      OCMVerify([mock setAutoMaskScreenshots:IBGAutoMaskScreenshotOptionLabels | IBGAutoMaskScreenshotOptionTextInputs | IBGAutoMaskScreenshotOptionMedia | IBGAutoMaskScreenshotOptionMaskNothing]);
 }
 
+- (void)testSetNetworkLogBodyEnabled {
+    id mock = OCMClassMock([IBGNetworkLogger class]);
+    BOOL isEnabled = YES;
+
+    OCMStub([mock setLogBodyEnabled:isEnabled]);
+    [self.instabugBridge setNetworkLogBodyEnabled:isEnabled];
+    OCMVerify([mock setLogBodyEnabled:isEnabled]);
+}
+
 @end

ios/RNInstabug/InstabugReactBridge.h

@@ -139,5 +139,6 @@ w3cExternalTraceAttributes:(NSDictionary * _Nullable)w3cExternalTraceAttributes;
 - (void)removeFeatureFlags:(NSArray *)featureFlags;
 - (void)removeAllFeatureFlags;
 - (void)enableAutoMasking:(NSArray *)autoMaskingTypes;
+- (void)setNetworkLogBodyEnabled:(BOOL)isEnabled;
 
 @end

ios/RNInstabug/InstabugReactBridge.m

@@ -451,4 +451,7 @@ + (BOOL)iOSVersionIsLessThan:(NSString *)iOSVersion {
     [Instabug setAutoMaskScreenshots: autoMaskingOptions];
 
 };
+RCT_EXPORT_METHOD(setNetworkLogBodyEnabled:(BOOL)isEnabled) {
+    IBGNetworkLogger.logBodyEnabled = isEnabled;
+}
 @end

src/modules/NetworkLogger.ts

@@ -5,6 +5,7 @@ import xhr, { NetworkData, ProgressCallback } from '../utils/XhrNetworkIntercept
 import { isContentTypeNotAllowed, reportNetworkLog } from '../utils/InstabugUtils';
 import { InstabugRNConfig } from '../utils/config';
 import { Logger } from '../utils/logger';
+import { NativeInstabug } from '../native/NativeInstabug';
 
 export type { NetworkData };
 
@@ -114,3 +115,11 @@ export const apolloLinkRequestHandler: RequestHandler = (operation, forward) =>
 
   return forward(operation);
 };
+
+/**
+ * Sets whether network body logs will be captured or not.
+ * @param isEnabled
+ */
+export const setNetworkLogBodyEnabled = (isEnabled: boolean) => {
+  NativeInstabug.setNetworkLogBodyEnabled(isEnabled);
+};

src/native/NativeInstabug.ts

@@ -73,6 +73,7 @@ export interface InstabugNativeModule extends NativeModule {
   ): void;
 
   setNetworkLoggingEnabled(isEnabled: boolean): void;
+  setNetworkLogBodyEnabled(isEnabled: boolean): void;
 
   // Repro Steps APIs //
   setReproStepsConfig(

test/mocks/mockInstabug.ts

@@ -74,6 +74,7 @@ const mockInstabug: InstabugNativeModule = {
   isW3CaughtHeaderEnabled: jest.fn(),
   registerW3CFlagsChangeListener: jest.fn(),
   enableAutoMasking: jest.fn(),
+  setNetworkLogBodyEnabled: jest.fn(),
 };
 
 export default mockInstabug;

test/modules/NetworkLogger.spec.ts

@@ -8,6 +8,7 @@ import Interceptor from '../../src/utils/XhrNetworkInterceptor';
 import { isContentTypeNotAllowed, reportNetworkLog } from '../../src/utils/InstabugUtils';
 import InstabugConstants from '../../src/utils/InstabugConstants';
 import { Logger } from '../../src/utils/logger';
+import { NativeInstabug } from '../../src/native/NativeInstabug';
 
 const clone = <T>(obj: T): T => {
   return JSON.parse(JSON.stringify(obj));
@@ -282,4 +283,11 @@ describe('NetworkLogger Module', () => {
 
     expect(reportNetworkLog).toHaveBeenCalledWith(networkData);
   });
+
+  it('should call the native method setNetworkLogBodyEnabled', () => {
+    NetworkLogger.setNetworkLogBodyEnabled(true);
+
+    expect(NativeInstabug.setNetworkLogBodyEnabled).toBeCalledTimes(1);
+    expect(NativeInstabug.setNetworkLogBodyEnabled).toBeCalledWith(true);
+  });
 });