expo-dev-client 1.2.1 → 1.3.0

package/CHANGELOG.md

@@ -10,6 +10,12 @@
 
 ### 💡 Others
 
+## 1.3.0 — 2022-09-16
+
+### 🐛 Bug fixes
+
+- Remove default scheme from intent filters that specify `autoVerify=true`. ([#18963](https://github.com/expo/expo/pull/18963) by [@ajsmth](https://github.com/ajsmth))
+
 ## 1.2.1 — 2022-08-16
 
 _This version does not introduce any user-facing changes._

package/android/build.gradle

@@ -38,7 +38,7 @@ android {
     minSdkVersion safeExtGet('minSdkVersion', 21)
     targetSdkVersion safeExtGet("targetSdkVersion", 31)
     versionCode 1
-    versionName "1.2.1"
+    versionName "1.3.0"
 
     testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-dev-client",
-  "version": "1.2.1",
+  "version": "1.3.0",
   "description": "Expo Development Client",
   "main": "build/DevClient.js",
   "types": "build/DevClient.d.ts",
@@ -33,8 +33,8 @@
   "homepage": "https://docs.expo.dev/clients/introduction/",
   "dependencies": {
     "@expo/config-plugins": "~5.0.0",
-    "expo-dev-launcher": "1.2.1",
-    "expo-dev-menu": "1.2.1",
+    "expo-dev-launcher": "1.3.0",
+    "expo-dev-menu": "1.3.0",
     "expo-dev-menu-interface": "0.7.2",
     "expo-manifests": "~0.3.0",
     "expo-updates-interface": "~0.7.0"
@@ -49,5 +49,5 @@
   "jest": {
     "preset": "expo-module-scripts"
   },
-  "gitHead": "2c07c73158880073367da73c1b79d54ee33b9639"
+  "gitHead": "b86b08c4caa6aac3a910eebb4c42188abaf83eb8"
 }

package/plugin/build/withGeneratedAndroidScheme.d.ts

@@ -1,4 +1,14 @@
-import { AndroidManifest, ConfigPlugin } from '@expo/config-plugins';
+import { AndroidConfig, AndroidManifest, ConfigPlugin } from '@expo/config-plugins';
 import { ExpoConfig } from '@expo/config-types';
 export declare const withGeneratedAndroidScheme: ConfigPlugin;
 export declare function setGeneratedAndroidScheme(config: Pick<ExpoConfig, 'scheme' | 'slug'>, androidManifest: AndroidManifest): AndroidManifest;
+/**
+ * Remove the custom Expo dev client scheme from intent filters, which are set to `autoVerify=true`.
+ * The custom scheme `<data android:scheme="exp+<slug>"/>` seems to block verification for these intent filters.
+ * This plugin makes sure there is no scheme in the autoVerify intent filters, that starts with `exp+`.
+ 
+ * Iterate over all `autoVerify=true` intent filters, and pull out schemes matching with `exp+<slug>`.
+ *
+ * @param {AndroidManifest} androidManifest
+ */
+export declare function removeExpoSchemaFromVerifiedIntentFilters(config: Pick<ExpoConfig, 'scheme' | 'slug'>, androidManifest: AndroidManifest): AndroidConfig.Manifest.AndroidManifest;

package/plugin/build/withGeneratedAndroidScheme.js

@@ -3,12 +3,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setGeneratedAndroidScheme = exports.withGeneratedAndroidScheme = void 0;
+exports.removeExpoSchemaFromVerifiedIntentFilters = exports.setGeneratedAndroidScheme = exports.withGeneratedAndroidScheme = void 0;
 const config_plugins_1 = require("@expo/config-plugins");
 const getDefaultScheme_1 = __importDefault(require("./getDefaultScheme"));
 const withGeneratedAndroidScheme = (config) => {
     return (0, config_plugins_1.withAndroidManifest)(config, (config) => {
         config.modResults = setGeneratedAndroidScheme(config, config.modResults);
+        config.modResults = removeExpoSchemaFromVerifiedIntentFilters(config, config.modResults);
         return config;
     });
 };
@@ -22,3 +23,54 @@ function setGeneratedAndroidScheme(config, androidManifest) {
     return androidManifest;
 }
 exports.setGeneratedAndroidScheme = setGeneratedAndroidScheme;
+/**
+ * Remove the custom Expo dev client scheme from intent filters, which are set to `autoVerify=true`.
+ * The custom scheme `<data android:scheme="exp+<slug>"/>` seems to block verification for these intent filters.
+ * This plugin makes sure there is no scheme in the autoVerify intent filters, that starts with `exp+`.
+ 
+ * Iterate over all `autoVerify=true` intent filters, and pull out schemes matching with `exp+<slug>`.
+ *
+ * @param {AndroidManifest} androidManifest
+ */
+function removeExpoSchemaFromVerifiedIntentFilters(config, androidManifest) {
+    // Generate a cross-platform scheme used to launch the dev client.
+    const defaultScheme = (0, getDefaultScheme_1.default)(config);
+    // see: https://github.com/expo/expo-cli/blob/f1624c75b52cc1c4f99354ec4021494e0eff74aa/packages/config-plugins/src/android/Scheme.ts#L164-L179
+    for (const application of androidManifest.manifest.application || []) {
+        for (const activity of application.activity || []) {
+            if (activityHasSingleTaskLaunchMode(activity)) {
+                for (const intentFilter of activity['intent-filter'] || []) {
+                    if (intentFilterHasAutoVerification(intentFilter) && (intentFilter === null || intentFilter === void 0 ? void 0 : intentFilter.data)) {
+                        intentFilter.data = intentFilterRemoveSchemeFromData(intentFilter, (scheme) => scheme === defaultScheme);
+                    }
+                }
+                break;
+            }
+        }
+    }
+    return androidManifest;
+}
+exports.removeExpoSchemaFromVerifiedIntentFilters = removeExpoSchemaFromVerifiedIntentFilters;
+/**
+ * Determine if the activity should contain the intent filters to clean.
+ *
+ * @see https://github.com/expo/expo-cli/blob/f1624c75b52cc1c4f99354ec4021494e0eff74aa/packages/config-plugins/src/android/Scheme.ts#L166
+ */
+function activityHasSingleTaskLaunchMode(activity) {
+    var _a;
+    return ((_a = activity === null || activity === void 0 ? void 0 : activity.$) === null || _a === void 0 ? void 0 : _a['android:launchMode']) === 'singleTask';
+}
+/**
+ * Determine if the intent filter has `autoVerify=true`.
+ */
+function intentFilterHasAutoVerification(intentFilter) {
+    var _a;
+    return ((_a = intentFilter === null || intentFilter === void 0 ? void 0 : intentFilter.$) === null || _a === void 0 ? void 0 : _a['android:autoVerify']) === 'true';
+}
+/**
+ * Remove schemes from the intent filter that matches the function.
+ */
+function intentFilterRemoveSchemeFromData(intentFilter, schemeMatcher) {
+    var _a;
+    return (_a = intentFilter === null || intentFilter === void 0 ? void 0 : intentFilter.data) === null || _a === void 0 ? void 0 : _a.filter((entry) => !schemeMatcher((entry === null || entry === void 0 ? void 0 : entry.$['android:scheme']) || ''));
+}

package/plugin/src/withGeneratedAndroidScheme.ts

@@ -4,6 +4,10 @@ import {
   ConfigPlugin,
   withAndroidManifest,
 } from '@expo/config-plugins';
+import {
+  ManifestActivity,
+  ManifestIntentFilter,
+} from '@expo/config-plugins/build/android/Manifest';
 import { ExpoConfig } from '@expo/config-types';
 
 import getDefaultScheme from './getDefaultScheme';
@@ -11,6 +15,7 @@ import getDefaultScheme from './getDefaultScheme';
 export const withGeneratedAndroidScheme: ConfigPlugin = (config) => {
   return withAndroidManifest(config, (config) => {
     config.modResults = setGeneratedAndroidScheme(config, config.modResults);
+    config.modResults = removeExpoSchemaFromVerifiedIntentFilters(config, config.modResults);
     return config;
   });
 };
@@ -24,5 +29,64 @@ export function setGeneratedAndroidScheme(
   if (!AndroidConfig.Scheme.hasScheme(scheme, androidManifest)) {
     androidManifest = AndroidConfig.Scheme.appendScheme(scheme, androidManifest);
   }
+
+  return androidManifest;
+}
+
+/**
+ * Remove the custom Expo dev client scheme from intent filters, which are set to `autoVerify=true`.
+ * The custom scheme `<data android:scheme="exp+<slug>"/>` seems to block verification for these intent filters.
+ * This plugin makes sure there is no scheme in the autoVerify intent filters, that starts with `exp+`.
+ 
+ * Iterate over all `autoVerify=true` intent filters, and pull out schemes matching with `exp+<slug>`.
+ *
+ * @param {AndroidManifest} androidManifest
+ */
+export function removeExpoSchemaFromVerifiedIntentFilters(
+  config: Pick<ExpoConfig, 'scheme' | 'slug'>,
+  androidManifest: AndroidManifest
+) {
+  // Generate a cross-platform scheme used to launch the dev client.
+  const defaultScheme = getDefaultScheme(config);
+  // see: https://github.com/expo/expo-cli/blob/f1624c75b52cc1c4f99354ec4021494e0eff74aa/packages/config-plugins/src/android/Scheme.ts#L164-L179
+  for (const application of androidManifest.manifest.application || []) {
+    for (const activity of application.activity || []) {
+      if (activityHasSingleTaskLaunchMode(activity)) {
+        for (const intentFilter of activity['intent-filter'] || []) {
+          if (intentFilterHasAutoVerification(intentFilter) && intentFilter?.data) {
+            intentFilter.data = intentFilterRemoveSchemeFromData(
+              intentFilter,
+              (scheme: string) => scheme === defaultScheme
+            );
+          }
+        }
+        break;
+      }
+    }
+  }
+
   return androidManifest;
 }
+
+/**
+ * Determine if the activity should contain the intent filters to clean.
+ *
+ * @see https://github.com/expo/expo-cli/blob/f1624c75b52cc1c4f99354ec4021494e0eff74aa/packages/config-plugins/src/android/Scheme.ts#L166
+ */
+function activityHasSingleTaskLaunchMode(activity: ManifestActivity) {
+  return activity?.$?.['android:launchMode'] === 'singleTask';
+}
+
+/**
+ * Determine if the intent filter has `autoVerify=true`.
+ */
+function intentFilterHasAutoVerification(intentFilter: ManifestIntentFilter) {
+  return intentFilter?.$?.['android:autoVerify'] === 'true';
+}
+
+/**
+ * Remove schemes from the intent filter that matches the function.
+ */
+function intentFilterRemoveSchemeFromData(intentFilter: ManifestIntentFilter, schemeMatcher: any) {
+  return intentFilter?.data?.filter((entry) => !schemeMatcher(entry?.$['android:scheme'] || ''));
+}