@superfan-app/spotify-auth 0.1.73 → 0.1.74

package/android/src/main/java/expo/modules/spotifyauth/SpotifyAuthAuth.kt

@@ -1,6 +1,7 @@
 package expo.modules.spotifyauth
 
 import android.content.Intent
+import android.content.pm.ActivityInfo
 import android.content.pm.PackageManager
 import android.net.Uri
 import android.os.Handler
@@ -272,9 +273,29 @@ class SpotifyAuthAuth private constructor(private val appContext: AppContext) {
             Log.d(TAG, "Scopes: ${scopeArray.joinToString(",")}")
             Log.d(TAG, "Package name: ${appContext.reactContext?.packageName}")
             Log.d(TAG, "Activity: ${activity.javaClass.name}")
-            Log.d(TAG, "Activity launchMode: ${activity.packageManager.getActivityInfo(activity.componentName, 0).launchMode}")
+            val launchMode = activity.packageManager.getActivityInfo(activity.componentName, 0).launchMode
+            Log.d(TAG, "Activity launchMode: $launchMode")
             Log.d(TAG, "========================")
 
+            if (launchMode == ActivityInfo.LAUNCH_SINGLE_TASK || launchMode == ActivityInfo.LAUNCH_SINGLE_INSTANCE) {
+                val modeName = if (launchMode == ActivityInfo.LAUNCH_SINGLE_TASK) "singleTask" else "singleInstance"
+                Log.e(TAG, "")
+                Log.e(TAG, "╔══════════════════════════════════════════════════════════════╗")
+                Log.e(TAG, "║  SPOTIFY APP-SWITCH AUTH WILL LIKELY FAIL                    ║")
+                Log.e(TAG, "╠══════════════════════════════════════════════════════════════╣")
+                Log.e(TAG, "║  MainActivity has android:launchMode=\"$modeName\"")
+                Log.e(TAG, "║                                                              ║")
+                Log.e(TAG, "║  Android 7+ does not properly deliver startActivityForResult ║")
+                Log.e(TAG, "║  results to singleTask/singleInstance activities. The Spotify║")
+                Log.e(TAG, "║  auth dialog will flash briefly and immediately dismiss.     ║")
+                Log.e(TAG, "║                                                              ║")
+                Log.e(TAG, "║  FIX (client-side): In your app's AndroidManifest.xml,      ║")
+                Log.e(TAG, "║  change MainActivity's android:launchMode to \"singleTop\"     ║")
+                Log.e(TAG, "║  or remove the launchMode attribute entirely.               ║")
+                Log.e(TAG, "╚══════════════════════════════════════════════════════════════╝")
+                Log.e(TAG, "")
+            }
+
             // Set a timeout to detect if the auth flow doesn't complete
             authTimeoutHandler = Runnable {
                 if (isAuthenticating) {
@@ -392,7 +413,33 @@ class SpotifyAuthAuth private constructor(private val appContext: AppContext) {
                     }
                 }
                 AuthorizationResponse.Type.EMPTY -> {
-                    Log.w(TAG, "Authorization returned EMPTY - user likely cancelled")
+                    val spotifyInstalled = isSpotifyInstalled()
+                    if (spotifyInstalled) {
+                        Log.e(TAG, "")
+                        Log.e(TAG, "╔══════════════════════════════════════════════════════════════╗")
+                        Log.e(TAG, "║  SPOTIFY APP-SWITCH AUTH: EMPTY RESPONSE                     ║")
+                        Log.e(TAG, "╠══════════════════════════════════════════════════════════════╣")
+                        Log.e(TAG, "║  Spotify is installed but auth returned empty immediately.   ║")
+                        Log.e(TAG, "║  The auth dialog flashed and dismissed without going to      ║")
+                        Log.e(TAG, "║  Spotify. Common client-side causes:                         ║")
+                        Log.e(TAG, "║                                                              ║")
+                        Log.e(TAG, "║  1. MainActivity launchMode is singleTask (most likely).     ║")
+                        Log.e(TAG, "║     Change to singleTop in your AndroidManifest.xml.         ║")
+                        Log.e(TAG, "║                                                              ║")
+                        Log.e(TAG, "║  2. Redirect URI '${redirectURL.take(30)}...' not registered  ║")
+                        Log.e(TAG, "║     in Spotify Developer Dashboard.                          ║")
+                        Log.e(TAG, "║                                                              ║")
+                        Log.e(TAG, "║  3. manifestPlaceholders redirectHostName in build.gradle    ║")
+                        Log.e(TAG, "║     does not match the host portion of your redirect URI.    ║")
+                        Log.e(TAG, "║     (Run the Expo config plugin to regenerate.)              ║")
+                        Log.e(TAG, "║                                                              ║")
+                        Log.e(TAG, "║  4. Installed Spotify version is too old to support          ║")
+                        Log.e(TAG, "║     app-switch auth.                                         ║")
+                        Log.e(TAG, "╚══════════════════════════════════════════════════════════════╝")
+                        Log.e(TAG, "")
+                    } else {
+                        Log.w(TAG, "Authorization returned EMPTY - user likely cancelled")
+                    }
                     module?.onAuthorizationError(SpotifyAuthException.UserCancelled())
                 }
                 else -> {

package/package.json

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

package/plugin/build/index.js

@@ -3,6 +3,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_plugins_1 = require("@expo/config-plugins");
 const pkg = require('../../package.json');
+/**
+ * Splits a callback value (e.g. "auth" or "auth/spotify") into its host and optional path components.
+ * Android intent filter `android:host` must not include a path segment.
+ */
+function parseCallback(callback) {
+    const slashIdx = callback.indexOf('/');
+    if (slashIdx === -1)
+        return { host: callback, path: null };
+    return { host: callback.slice(0, slashIdx), path: callback.slice(slashIdx) };
+}
 function validateSpotifyConfig(config) {
     if (!config.clientID)
         throw new Error("Spotify clientID is required");
@@ -77,9 +87,12 @@ const withSpotifyManifestPlaceholders = (config, props) => {
         let buildGradle = config.modResults.contents;
         // Escape values for Gradle string literals (escape backslashes and quotes)
         const scheme = String(props.scheme).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-        const host = String(props.callback).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-        // ".*" accepts any path - retains previous behavior per Spotify changelog (auth lib 3.0.0)
-        const pathPattern = '.*';
+        // Split callback into host and optional path — android:host must not contain a slash
+        const { host: callbackHost, path: callbackPath } = parseCallback(props.callback);
+        const host = String(callbackHost).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+        // If the callback has a path component (e.g. "auth/spotify"), prefix the pathPattern
+        // so SpotifyAuthorizationActivity's intent filter correctly matches the return URI.
+        const pathPattern = callbackPath ? `${callbackPath}.*` : '.*';
         const placeholdersBlock = `        manifestPlaceholders = [
             redirectSchemeName: "${scheme}",
             redirectHostName: "${host}",
@@ -109,6 +122,8 @@ const withSpotifyAndroidManifest = (config, props) => {
         const mainApplication = config_plugins_1.AndroidConfig.Manifest.getMainApplicationOrThrow(config.modResults);
         // Construct the redirect URL from scheme and callback
         const redirectUrl = `${props.scheme}://${props.callback}`;
+        // Split callback into host and optional path for correct intent filter construction
+        const { host: callbackHost, path: callbackPath } = parseCallback(props.callback);
         // Add Spotify configuration as meta-data elements
         const metaDataEntries = [
             { name: 'SpotifyClientID', value: props.clientID },
@@ -137,22 +152,24 @@ const withSpotifyAndroidManifest = (config, props) => {
             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'] === props.callback));
+        const hasSpotifyIntentFilter = mainActivity['intent-filter'].some((filter) => filter.data?.some((d) => d.$?.['android:scheme'] === props.scheme && d.$?.['android: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.
+            const dataAttrs = {
+                'android:scheme': props.scheme,
+                'android:host': callbackHost,
+            };
+            if (callbackPath) {
+                dataAttrs['android:pathPrefix'] = callbackPath;
+            }
             mainActivity['intent-filter'].push({
                 action: [{ $: { 'android:name': 'android.intent.action.VIEW' } }],
                 category: [
                     { $: { 'android:name': 'android.intent.category.DEFAULT' } },
                     { $: { 'android:name': 'android.intent.category.BROWSABLE' } },
                 ],
-                data: [
-                    {
-                        $: {
-                            'android:scheme': props.scheme,
-                            'android:host': props.callback,
-                        },
-                    },
-                ],
+                data: [{ $: dataAttrs }],
             });
         }
         return config;

package/plugin/src/index.ts

@@ -5,6 +5,16 @@ import { SpotifyConfig } from './types.js'
 
 const pkg = require('../../package.json');
 
+/**
+ * Splits a callback value (e.g. "auth" or "auth/spotify") into its host and optional path components.
+ * Android intent filter `android:host` must not include a path segment.
+ */
+function parseCallback(callback: string): { host: string; path: string | null } {
+  const slashIdx = callback.indexOf('/')
+  if (slashIdx === -1) return { host: callback, path: null }
+  return { host: callback.slice(0, slashIdx), path: callback.slice(slashIdx) }
+}
+
 function validateSpotifyConfig(config: SpotifyConfig) {
   if (!config.clientID) throw new Error("Spotify clientID is required")
   if (!config.scheme) throw new Error("URL scheme is required")
@@ -86,9 +96,12 @@ const withSpotifyManifestPlaceholders: ConfigPlugin<SpotifyConfig> = (config, pr
 
     // Escape values for Gradle string literals (escape backslashes and quotes)
     const scheme = String(props.scheme).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-    const host = String(props.callback).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
-    // ".*" accepts any path - retains previous behavior per Spotify changelog (auth lib 3.0.0)
-    const pathPattern = '.*';
+    // Split callback into host and optional path — android:host must not contain a slash
+    const { host: callbackHost, path: callbackPath } = parseCallback(props.callback)
+    const host = String(callbackHost).replace(/\\/g, '\\\\').replace(/"/g, '\\"');
+    // If the callback has a path component (e.g. "auth/spotify"), prefix the pathPattern
+    // so SpotifyAuthorizationActivity's intent filter correctly matches the return URI.
+    const pathPattern = callbackPath ? `${callbackPath}.*` : '.*';
 
     const placeholdersBlock = `        manifestPlaceholders = [
             redirectSchemeName: "${scheme}",
@@ -131,6 +144,8 @@ const withSpotifyAndroidManifest: ConfigPlugin<SpotifyConfig> = (config, props)
 
     // Construct the redirect URL from scheme and callback
     const redirectUrl = `${props.scheme}://${props.callback}`;
+    // Split callback into host and optional path for correct intent filter construction
+    const { host: callbackHost, path: callbackPath } = parseCallback(props.callback)
 
     // Add Spotify configuration as meta-data elements
     const metaDataEntries = [
@@ -170,25 +185,28 @@ const withSpotifyAndroidManifest: ConfigPlugin<SpotifyConfig> = (config, props)
     const hasSpotifyIntentFilter = mainActivity['intent-filter'].some(
       (filter: any) =>
         filter.data?.some(
-          (d: any) => d.$?.['android:scheme'] === props.scheme && d.$?.['android:host'] === props.callback
+          (d: any) => d.$?.['android:scheme'] === props.scheme && d.$?.['android: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.
+      const dataAttrs: Record<string, string> = {
+        'android:scheme': props.scheme,
+        'android:host': callbackHost,
+      }
+      if (callbackPath) {
+        dataAttrs['android:pathPrefix'] = callbackPath
+      }
+
       mainActivity['intent-filter'].push({
         action: [{ $: { 'android:name': 'android.intent.action.VIEW' } }],
         category: [
           { $: { 'android:name': 'android.intent.category.DEFAULT' } },
           { $: { 'android:name': 'android.intent.category.BROWSABLE' } },
         ],
-        data: [
-          {
-            $: {
-              'android:scheme': props.scheme,
-              'android:host': props.callback,
-            },
-          },
-        ],
+        data: [{ $: dataAttrs }],
       });
     }