Merge pull request #64 from talsec/fix-expo-r8

Fix expo r8

Author: xprikryl2

.gitignore

@@ -11,7 +11,7 @@ jsconfig.json
 
 # Xcode
 #
-build/
+**/ios/**/build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -39,6 +39,7 @@ project.xcworkspace
 .settings
 local.properties
 android.iml
+**/android/**/build
 
 # Cocoapods
 #

.npmignore

@@ -18,7 +18,7 @@ jsconfig.json
 
 # Xcode
 #
-build/
+**/ios/**/build/
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -46,6 +46,7 @@ project.xcworkspace
 .settings
 local.properties
 android.iml
+**/android/**/build
 
 # Cocoapods
 #

CHANGELOG.md

@@ -1,3 +1,7 @@
+# freeRASP 3.7.2
+
+- ⚡ Update expo config plugin to fix release build issue in RN 0.73
+
 # freeRASP 3.7.1
 
 ### Android

README.md

@@ -324,14 +324,16 @@ If you encounter any other issues, you can see the list of solved issues [here](
 freeRASP for React Native is bare React Native plugin. When installing freeRASP into a project that uses Expo SDK, there may be extra configuration needed. We provide plugin config that sets the dependencies automatically. It is recommended to use the plugin config. However, manual setup is also possible.
 
 ## Plugin config setup
-Add the plugin config into your `app.json` and specify the `minSdkVersion` (use at least 23):
+Add the plugin config into your `app.json` and specify the `minSdkVersion` (use at least 23).
+Additionally, if you are using Expo 50, increase version of R8 above 8.2 with the `R8Version` property [(to support sealed classes on Android)](https://github.com/talsec/Free-RASP-ReactNative/issues/60).
 ```json
 "plugins": [
       [
         "freerasp-react-native/app.plugin.js",
         {
           "android": {
-            "minSdkVersion": "23"
+            "minSdkVersion": "23",
+            "R8Version": "8.3.37" // optional for Expo 50
           }
         }
       ]

package.json

@@ -1,6 +1,6 @@
 {
   "name": "freerasp-react-native",
-  "version": "3.7.1",
+  "version": "3.7.2",
   "description": "React Native plugin for improving app security and threat monitoring on Android and iOS mobile devices.",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

plugin/build/index.d.ts

@@ -0,0 +1,4 @@
+import { ConfigPlugin } from '@expo/config-plugins';
+import { type PluginConfigType } from './pluginConfig';
+declare const _default: ConfigPlugin<PluginConfigType>;
+export default _default;

plugin/build/index.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const config_plugins_1 = require("@expo/config-plugins");
+const { createBuildGradlePropsConfigPlugin } = config_plugins_1.AndroidConfig.BuildProperties;
+const urlFreerasp = 'https://europe-west3-maven.pkg.dev/talsec-artifact-repository/freerasp';
+const urlJitpack = 'https://www.jitpack.io';
+const setBuildscriptDependency = (buildGradle) => {
+    // This enables users in bare workflow to comment out the line to prevent freerasp from adding it back.
+    const mavenFreerasp = buildGradle.includes(urlFreerasp)
+        ? ''
+        : `maven { url "${urlFreerasp}" }`;
+    const mavenJitpack = buildGradle.includes(urlJitpack)
+        ? ''
+        : `maven { url "${urlJitpack}" }`;
+    // It's ok to have multiple allprojects.repositories, so we create a new one since it's cheaper than tokenizing
+    // the existing block to find the correct place to insert our dependency.
+    const combinedGradleMaven = `
+    allprojects {
+      repositories {
+        ${mavenFreerasp}
+        ${mavenJitpack}
+      }
+    }
+  `;
+    return buildGradle + `\n${combinedGradleMaven}\n`;
+};
+const setAndroidR8 = (buildGradle, version) => {
+    const combinedGradleMaven = `
+    buildscript {
+      dependencies {
+          classpath("com.android.tools:r8:${version}")
+      }
+    }
+  `;
+    return buildGradle + `\n${combinedGradleMaven}\n`;
+};
+/**
+ * Update `<project>/build.gradle` by adding nexus dependency to buildscript
+ */
+const withBuildscriptDependency = (expoConfig) => {
+    return (0, config_plugins_1.withProjectBuildGradle)(expoConfig, (config) => {
+        if (config.modResults.language === 'groovy') {
+            config.modResults.contents = setBuildscriptDependency(config.modResults.contents);
+        }
+        else {
+            config_plugins_1.WarningAggregator.addWarningAndroid('freerasp-react-native', `Cannot automatically configure project build.gradle, because it's not groovy`);
+        }
+        return config;
+    });
+};
+const withAndroidMinSdkVersion = createBuildGradlePropsConfigPlugin([
+    {
+        propName: 'android.minSdkVersion',
+        propValueGetter: (config) => config.android?.minSdkVersion?.toString(),
+    },
+], 'withAndroidMinSdkVersion');
+/**
+ * Update `<project>/build.gradle` by updating the R8 version
+ */
+const withAndroidR8Version = (expoConfig, props) => {
+    if (!props.android?.R8Version) {
+        return expoConfig;
+    }
+    return (0, config_plugins_1.withProjectBuildGradle)(expoConfig, (config) => {
+        if (config.modResults.language === 'groovy') {
+            config.modResults.contents = setAndroidR8(config.modResults.contents, props.android?.R8Version ?? '+');
+        }
+        else {
+            config_plugins_1.WarningAggregator.addWarningAndroid('freerasp-react-native', `Cannot automatically configure project build.gradle, because it's not groovy`);
+        }
+        return config;
+    });
+};
+const withRnTalsecApp = (config, props) => {
+    config = withBuildscriptDependency(config);
+    config = withAndroidMinSdkVersion(config, props);
+    config = withAndroidR8Version(config, props);
+    return config;
+};
+let pkg = {
+    name: 'freerasp-react-native',
+};
+try {
+    const freeraspPkg = require('freerasp-react-native/package.json');
+    pkg = freeraspPkg;
+}
+catch { }
+exports.default = (0, config_plugins_1.createRunOncePlugin)(withRnTalsecApp, pkg.name, pkg.version);

plugin/build/pluginConfig.d.ts

@@ -0,0 +1,21 @@
+/**
+ * Interface representing base build properties configuration.
+ */
+export interface PluginConfigType {
+    /**
+     * Interface representing available configuration for Android native build properties.
+     * @platform android
+     */
+    android?: PluginConfigTypeAndroid;
+}
+/**
+ * Interface representing available configuration for Android native build properties.
+ * @platform android
+ */
+export interface PluginConfigTypeAndroid {
+    /**
+     * Override the default `minSdkVersion` version number in **build.gradle**.
+     * */
+    minSdkVersion?: number;
+    R8Version?: string;
+}

plugin/build/pluginConfig.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

plugin/src/index.ts

@@ -5,17 +5,16 @@ import {
   createRunOncePlugin,
   withProjectBuildGradle,
 } from '@expo/config-plugins';
-
-// @ts-ignore
-import { PluginConfigType } from './pluginConfig';
+import { type ExpoConfig } from '@expo/config-types';
+import { type PluginConfigType } from './pluginConfig';
 
 const { createBuildGradlePropsConfigPlugin } = AndroidConfig.BuildProperties;
 
 const urlFreerasp =
   'https://europe-west3-maven.pkg.dev/talsec-artifact-repository/freerasp';
 const urlJitpack = 'https://www.jitpack.io';
 
-export const setBuildscriptDependency = (buildGradle: string) => {
+const setBuildscriptDependency = (buildGradle: string) => {
   // This enables users in bare workflow to comment out the line to prevent freerasp from adding it back.
 
   const mavenFreerasp = buildGradle.includes(urlFreerasp)
@@ -39,11 +38,23 @@ export const setBuildscriptDependency = (buildGradle: string) => {
   return buildGradle + `\n${combinedGradleMaven}\n`;
 };
 
+const setAndroidR8 = (buildGradle: string, version: string) => {
+  const combinedGradleMaven = `
+    buildscript {
+      dependencies {
+          classpath("com.android.tools:r8:${version}")
+      }
+    }
+  `;
+
+  return buildGradle + `\n${combinedGradleMaven}\n`;
+};
+
 /**
  * Update `<project>/build.gradle` by adding nexus dependency to buildscript
  */
-export const withBuildscriptDependency: ConfigPlugin = (config) => {
-  return withProjectBuildGradle(config, (config) => {
+const withBuildscriptDependency: ConfigPlugin = (expoConfig) => {
+  return withProjectBuildGradle(expoConfig, (config) => {
     if (config.modResults.language === 'groovy') {
       config.modResults.contents = setBuildscriptDependency(
         config.modResults.contents
@@ -58,7 +69,7 @@ export const withBuildscriptDependency: ConfigPlugin = (config) => {
   });
 };
 
-export const withAndroidMinSdkVersion =
+const withAndroidMinSdkVersion =
   createBuildGradlePropsConfigPlugin<PluginConfigType>(
     [
       {
@@ -69,9 +80,36 @@ export const withAndroidMinSdkVersion =
     'withAndroidMinSdkVersion'
   );
 
+/**
+ * Update `<project>/build.gradle` by updating the R8 version
+ */
+const withAndroidR8Version: ConfigPlugin<PluginConfigType> = (
+  expoConfig: ExpoConfig,
+  props: PluginConfigType
+) => {
+  if (!props.android?.R8Version) {
+    return expoConfig;
+  }
+  return withProjectBuildGradle(expoConfig, (config) => {
+    if (config.modResults.language === 'groovy') {
+      config.modResults.contents = setAndroidR8(
+        config.modResults.contents,
+        props.android?.R8Version ?? '+'
+      );
+    } else {
+      WarningAggregator.addWarningAndroid(
+        'freerasp-react-native',
+        `Cannot automatically configure project build.gradle, because it's not groovy`
+      );
+    }
+    return config;
+  });
+};
+
 const withRnTalsecApp: ConfigPlugin<PluginConfigType> = (config, props) => {
   config = withBuildscriptDependency(config);
   config = withAndroidMinSdkVersion(config, props);
+  config = withAndroidR8Version(config, props);
   return config;
 };