refactor: rename MalwareScanScope to ScanScope and extract config helpers

Author: martinzigrai

android/src/main/java/com/freeraspreactnative/utils/Extensions.kt

@@ -96,7 +96,7 @@ internal fun PackageInfo.toRNPackageInfo(context: ReactContext): RNPackageInfo {
   )
 }
 
-internal fun ReadableMap.toMalwareScanScope(): MalwareScanScope {
+internal fun ReadableMap.toScanScope(): MalwareScanScope {
   val scanScope = ScopeType.valueOf(getStringThrowing("scanScope"))
   val trustedInstallSources = getArraySafe("trustedInstallSources").toList().ifEmpty { null }
   return MalwareScanScope(scanScope, trustedInstallSources)
@@ -107,9 +107,9 @@ internal fun ReadableMap.toSuspiciousAppDetectionConfig(): SuspiciousAppDetectio
   val hashes = getArraySafe("hashes").toSet().ifEmpty { null }
   val requestedPermissions = getNestedArraySafe("requestedPermissions").map { it.toSet() }.toSet().ifEmpty { null }
   val grantedPermissions = getNestedArraySafe("grantedPermissions").map { it.toSet() }.toSet().ifEmpty { null }
-  val malwareScanScope = getMapThrowing("malwareScanScope").toMalwareScanScope()
+  val scanScope = getMapThrowing("scanScope").toScanScope()
   val reasonMode = ReasonMode.valueOf(getStringThrowing("reasonMode"))
-  return SuspiciousAppDetectionConfig(packageNames, hashes, requestedPermissions, grantedPermissions, malwareScanScope, reasonMode)
+  return SuspiciousAppDetectionConfig(packageNames, hashes, requestedPermissions, grantedPermissions, scanScope, reasonMode)
 }
 
 /**

src/api/methods/native.ts

@@ -1,47 +1,7 @@
 import { Platform } from 'react-native';
 import { FreeraspReactNative } from '../nativeModules';
-import type {
-  MalwareScanScope,
-  ReasonMode,
-  SuspiciousAppDetectionConfig,
-  TalsecAndroidConfig,
-  TalsecConfig,
-} from '../../types/types';
-
-const DEFAULT_MALWARE_SCAN_SCOPE: MalwareScanScope = {
-  scanScope: 'SIDELOADED_ONLY',
-};
-
-const DEFAULT_REASON_MODE: ReasonMode = 'HIGHEST_CONFIDENCE';
-
-const withSuspiciousAppDetectionDefaults = (
-  config: SuspiciousAppDetectionConfig
-): SuspiciousAppDetectionConfig => ({
-  ...config,
-  malwareScanScope: config.malwareScanScope ?? DEFAULT_MALWARE_SCAN_SCOPE,
-  reasonMode: config.reasonMode ?? DEFAULT_REASON_MODE,
-});
-
-const normalizeAndroidConfig = (
-  androidConfig: TalsecAndroidConfig
-): TalsecAndroidConfig => {
-  if (!androidConfig.suspiciousAppDetectionConfig) {
-    return androidConfig;
-  }
-  return {
-    ...androidConfig,
-    suspiciousAppDetectionConfig: withSuspiciousAppDetectionDefaults(
-      androidConfig.suspiciousAppDetectionConfig
-    ),
-  };
-};
-
-const normalizeConfig = (options: TalsecConfig): TalsecConfig => ({
-  ...options,
-  androidConfig: options.androidConfig
-    ? normalizeAndroidConfig(options.androidConfig)
-    : undefined,
-});
+import type { TalsecConfig } from '../../types/types';
+import { normalizeConfig } from '../../utils/config';
 
 export const talsecStart = async (options: TalsecConfig): Promise<string> => {
   return FreeraspReactNative.talsecStart(normalizeConfig(options));

src/types/types.ts

@@ -15,7 +15,7 @@ export type ScopeType =
 
 export type ReasonMode = 'ALL' | 'HIGHEST_CONFIDENCE';
 
-export type MalwareScanScope = {
+export type ScanScope = {
   scanScope: ScopeType;
   trustedInstallSources?: string[];
 };
@@ -25,7 +25,7 @@ export type SuspiciousAppDetectionConfig = {
   hashes?: string[];
   requestedPermissions?: string[][];
   grantedPermissions?: string[][];
-  malwareScanScope: MalwareScanScope;
+  scanScope: ScanScope;
   reasonMode: ReasonMode;
 };
 

src/utils/config.ts

@@ -0,0 +1,42 @@
+import type {
+  ReasonMode,
+  ScanScope,
+  SuspiciousAppDetectionConfig,
+  TalsecAndroidConfig,
+  TalsecConfig,
+} from '../types/types';
+
+const DEFAULT_SCAN_SCOPE: ScanScope = {
+  scanScope: 'SIDELOADED_ONLY',
+};
+
+const DEFAULT_REASON_MODE: ReasonMode = 'HIGHEST_CONFIDENCE';
+
+export const withDefaults = (
+  config: SuspiciousAppDetectionConfig
+): SuspiciousAppDetectionConfig => ({
+  ...config,
+  scanScope: config.scanScope ?? DEFAULT_SCAN_SCOPE,
+  reasonMode: config.reasonMode ?? DEFAULT_REASON_MODE,
+});
+
+export const normalizeAndroidConfig = (
+  androidConfig: TalsecAndroidConfig
+): TalsecAndroidConfig => {
+  if (!androidConfig.suspiciousAppDetectionConfig) {
+    return androidConfig;
+  }
+  return {
+    ...androidConfig,
+    suspiciousAppDetectionConfig: withDefaults(
+      androidConfig.suspiciousAppDetectionConfig
+    ),
+  };
+};
+
+export const normalizeConfig = (options: TalsecConfig): TalsecConfig => ({
+  ...options,
+  androidConfig: options.androidConfig
+    ? normalizeAndroidConfig(options.androidConfig)
+    : undefined,
+});