@superfan-app/spotify-auth 0.1.77 → 0.1.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@superfan-app/spotify-auth",
-  "version": "0.1.77",
+  "version": "0.1.80",
   "description": "Spotify OAuth module for Expo",
   "main": "src/index.tsx",
   "types": "build/index.d.ts",

package/plugin/build/index.js

@@ -111,8 +111,16 @@ const withSpotifyAndroidManifest = (config, props) => {
         if (!mainActivity['intent-filter']) {
             mainActivity['intent-filter'] = [];
         }
-        // Check if we already have a Spotify redirect intent filter
-        const hasSpotifyIntentFilter = mainActivity['intent-filter'].some((filter) => filter.data?.some((d) => d.$?.['android:scheme'] === props.scheme && d.$?.['android:host'] === callbackHost));
+        // Check if we already have an intent filter covering the Spotify redirect.
+        // A broad scheme-only filter (no android:host) already covers superfan://callback,
+        // so we must treat it as sufficient to avoid registering two overlapping filters
+        // (which causes Android to show the app twice in the disambiguation dialog).
+        const hasSpotifyIntentFilter = mainActivity['intent-filter'].some((filter) => filter.data?.some((d) => {
+            const scheme = d.$?.['android:scheme'];
+            const host = d.$?.['android:host'];
+            // Matches if same scheme + matching host, OR same scheme with no host restriction
+            return scheme === props.scheme && (!host || host === callbackHost);
+        }));
         if (!hasSpotifyIntentFilter) {
             // Build the data element: android:host must be the hostname only (no path).
             // If the callback has a path component (e.g. "auth/spotify"), add android:pathPrefix.
@@ -135,6 +143,26 @@ const withSpotifyAndroidManifest = (config, props) => {
         return config;
     });
 };
+const withSpotifyManifestPlaceholders = (config, props) => {
+    return (0, config_plugins_1.withAppBuildGradle)(config, (config) => {
+        const { host: callbackHost, path: callbackPath } = parseCallback(props.callback);
+        const pathPattern = callbackPath ? callbackPath.replace(/\//g, '\\/') + '.*' : '.*';
+        const placeholderBlock = `manifestPlaceholders = [
+            redirectSchemeName: "${props.scheme}",
+            redirectHostName: "${callbackHost}",
+            redirectPathPattern: "${pathPattern}"
+        ]`;
+        if (config.modResults.contents.includes('manifestPlaceholders')) {
+            // Replace existing block
+            config.modResults.contents = config.modResults.contents.replace(/manifestPlaceholders\s*=\s*\[[\s\S]*?\]/, placeholderBlock);
+        }
+        else {
+            // Inject into defaultConfig
+            config.modResults.contents = config.modResults.contents.replace(/defaultConfig\s*\{/, `defaultConfig {\n        ${placeholderBlock}`);
+        }
+        return config;
+    });
+};
 // endregion
 const withSpotifyAuth = (config, props) => {
     // Ensure the config exists
@@ -147,6 +175,7 @@ const withSpotifyAuth = (config, props) => {
     config = withSpotifyURLSchemes(config, props);
     // Apply Android configurations
     config = withSpotifyAndroidManifest(config, props);
+    config = withSpotifyManifestPlaceholders(config, props);
     return config;
 };
 exports.default = (0, config_plugins_1.createRunOncePlugin)(withSpotifyAuth, pkg.name, pkg.version);

package/plugin/src/index.ts

@@ -1,6 +1,6 @@
 // plugin/src/index.ts
 
-import { type ConfigPlugin, createRunOncePlugin, withInfoPlist, withAndroidManifest, AndroidConfig } from '@expo/config-plugins'
+import { type ConfigPlugin, createRunOncePlugin, withInfoPlist, withAndroidManifest, withAppBuildGradle, AndroidConfig } from '@expo/config-plugins'
 import { SpotifyConfig } from './types.js'
 
 const pkg = require('../../package.json');
@@ -128,12 +128,18 @@ const withSpotifyAndroidManifest: ConfigPlugin<SpotifyConfig> = (config, props)
       mainActivity['intent-filter'] = [];
     }
 
-    // Check if we already have a Spotify redirect intent filter
+    // Check if we already have an intent filter covering the Spotify redirect.
+    // A broad scheme-only filter (no android:host) already covers superfan://callback,
+    // so we must treat it as sufficient to avoid registering two overlapping filters
+    // (which causes Android to show the app twice in the disambiguation dialog).
     const hasSpotifyIntentFilter = mainActivity['intent-filter'].some(
       (filter: any) =>
-        filter.data?.some(
-          (d: any) => d.$?.['android:scheme'] === props.scheme && d.$?.['android:host'] === callbackHost
-        )
+        filter.data?.some((d: any) => {
+          const scheme = d.$?.['android:scheme'];
+          const host = d.$?.['android:host'];
+          // Matches if same scheme + matching host, OR same scheme with no host restriction
+          return scheme === props.scheme && (!host || host === callbackHost);
+        })
     );
 
     if (!hasSpotifyIntentFilter) {
@@ -161,6 +167,35 @@ const withSpotifyAndroidManifest: ConfigPlugin<SpotifyConfig> = (config, props)
   });
 };
 
+const withSpotifyManifestPlaceholders: ConfigPlugin<SpotifyConfig> = (config, props) => {
+  return withAppBuildGradle(config, (config) => {
+    const { host: callbackHost, path: callbackPath } = parseCallback(props.callback)
+    const pathPattern = callbackPath ? callbackPath.replace(/\//g, '\\/') + '.*' : '.*'
+
+    const placeholderBlock = `manifestPlaceholders = [
+            redirectSchemeName: "${props.scheme}",
+            redirectHostName: "${callbackHost}",
+            redirectPathPattern: "${pathPattern}"
+        ]`
+
+    if (config.modResults.contents.includes('manifestPlaceholders')) {
+      // Replace existing block
+      config.modResults.contents = config.modResults.contents.replace(
+        /manifestPlaceholders\s*=\s*\[[\s\S]*?\]/,
+        placeholderBlock
+      )
+    } else {
+      // Inject into defaultConfig
+      config.modResults.contents = config.modResults.contents.replace(
+        /defaultConfig\s*\{/,
+        `defaultConfig {\n        ${placeholderBlock}`
+      )
+    }
+
+    return config
+  })
+}
+
 // endregion
 
 const withSpotifyAuth: ConfigPlugin<SpotifyConfig> = (config, props) => {
@@ -179,6 +214,7 @@ const withSpotifyAuth: ConfigPlugin<SpotifyConfig> = (config, props) => {
 
   // Apply Android configurations
   config = withSpotifyAndroidManifest(config, props);
+  config = withSpotifyManifestPlaceholders(config, props);
 
   return config;
 };