Backend & Mobile – OAuth Handling, Compatibility Rules, and UX Improvements

backend/automations/serializers.py

@@ -448,11 +448,12 @@ class AboutServiceSerializer(serializers.ModelSerializer):
 
     actions = AboutActionSerializer(many=True, read_only=True)
     reactions = AboutReactionSerializer(many=True, read_only=True)
+    requires_oauth = serializers.SerializerMethodField()
     logo = serializers.SerializerMethodField()
 
     class Meta:
         model = Service
-        fields = ["name", "actions", "reactions", "logo"]
+        fields = ["name", "requires_oauth", "actions", "reactions", "logo"]
 
     def get_logo(self, obj):
         """Return the configured logo URL for the service or a fallback.
@@ -509,6 +510,30 @@ def _normalize_key(s: str) -> str:
 
         return found
 
+    def get_requires_oauth(self, obj):
+        """Check if this service requires OAuth authentication.
+
+        Services that require OAuth:
+        - Direct OAuth providers (google, github, slack, spotify, twitch)
+        - Services that map to OAuth tokens (gmail->google, google_calendar->google)
+        """
+        from django.conf import settings
+
+        oauth_names = settings.OAUTH2_PROVIDERS.keys()
+
+        # Direct OAuth providers
+        if obj.name in oauth_names:
+            return True
+
+        # Services that map to OAuth tokens
+        service_oauth_map = {
+            "gmail": "google",
+            "google_calendar": "google",
+        }
+
+        mapped_oauth = service_oauth_map.get(obj.name)
+        return mapped_oauth in oauth_names if mapped_oauth else False
+
 
 # Serializers pour Execution (journaling)
 

backend/automations/tasks.py

@@ -674,7 +674,14 @@ def check_gmail_actions(self):
 
     try:
         # Get all active Areas with Gmail actions
-        gmail_areas = get_active_areas(service_name="gmail")
+        gmail_areas = get_active_areas(
+            [
+                "gmail_new_email",
+                "gmail_new_from_sender",
+                "gmail_new_with_label",
+                "gmail_new_with_subject",
+            ]
+        )
 
         if not gmail_areas:
             logger.info("No active Gmail areas found")

backend/automations/urls.py

@@ -101,4 +101,9 @@
         views.DebugExecutionsView.as_view({"get": "list"}),
         name="debug-executions",
     ),
+    path(
+        "api/compatibility-rules/",
+        views.CompatibilityRulesView.as_view({"get": "list"}),
+        name="compatibility-rules",
+    ),
 ]

backend/automations/views.py

@@ -688,3 +688,28 @@ def list(self, request, area_id=None):
                 {"error": "Area not found or access denied"},
                 status=status.HTTP_404_NOT_FOUND,
             )
+
+
+# Compatibility Rules View
+# ============================================================================
+
+
+@extend_schema(
+    tags=["Compatibility"],
+    summary="Get action-reaction compatibility rules",
+    description="Returns the compatibility rules mapping actions to compatible reactions. Public endpoint.",
+)
+class CompatibilityRulesView(viewsets.ViewSet):
+    """Returns compatibility rules for action-reaction combinations."""
+
+    permission_classes = [permissions.AllowAny]
+
+    def list(self, request):
+        """
+        Get all compatibility rules.
+
+        GET /api/compatibility-rules/
+        """
+        from .validators import COMPATIBILITY_RULES
+
+        return Response(COMPATIBILITY_RULES, status=status.HTTP_200_OK)

mobile/android/app/src/main/AndroidManifest.xml

@@ -46,6 +46,19 @@
                 <!-- Handles OAuth callbacks like: area://auth/oauth/google/callback -->
                 <data android:scheme="area" android:host="auth"/>
             </intent-filter>
+
+            <!-- HTTP Deep Link for OAuth2 Callbacks (Android Emulator) -->
+            <!-- This intercepts http://localhost:8082/auth/oauth/... callbacks from Google -->
+            <!-- The emulator browser can't reach localhost:8082 directly, but Android App Links -->
+            <!-- can intercept the intent and convert it to the area:// scheme -->
+            <intent-filter android:autoVerify="false">
+                <action android:name="android.intent.action.VIEW"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="android.intent.category.BROWSABLE"/>
+                <!-- Intercept localhost:8082 OAuth callbacks -->
+                <data android:scheme="http" android:host="localhost" android:port="8082" android:pathPattern="/auth/oauth/.*"/>
+                <data android:scheme="http" android:host="localhost" android:port="8080" android:pathPattern="/auth/oauth/.*"/>
+            </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
              This is used by the Flutter tool to generate GeneratedPluginRegistrant.java -->

mobile/lib/config/api_config.dart

@@ -10,14 +10,20 @@ class ApiConfig {
     if (portString.isNotEmpty) {
       _configuredPort = int.tryParse(portString);
       if (_configuredPort != null) {
-        ApiConfig.debugPrint('Backend port configured: $_configuredPort');
+        ApiConfig.debugPrint('✅ Backend port configured: $_configuredPort');
+      } else {
+        ApiConfig.debugPrint('❌ Failed to parse BACKEND_PORT: "$portString"');
       }
+    } else {
+      ApiConfig.debugPrint(
+        '⚠️  BACKEND_PORT is empty, using default: ${AppConfig.defaultPort}',
+      );
     }
   }
 
   static void setPort(int port) {
     _configuredPort = port;
-    ApiConfig.debugPrint('Backend port set to: $port');
+    ApiConfig.debugPrint('✅ Backend port set to: $port');
   }
 
   static String? _overrideBaseUrl;
@@ -26,7 +32,7 @@ class ApiConfig {
 
   static void setBaseUrl(String url) {
     _overrideBaseUrl = url.trim();
-    ApiConfig.debugPrint('Base URL override set to: $_overrideBaseUrl');
+    ApiConfig.debugPrint('✅ Base URL override set to: $_overrideBaseUrl');
   }
 
   static void forceAndroidLocalhost(bool enable) {
@@ -44,21 +50,37 @@ class ApiConfig {
     if (kIsWeb) {
       // Web always uses localhost
       host = AppConfig.defaultHost;
+      ApiConfig.debugPrint('🌐 Detected: Web - using localhost');
     } else if (Platform.isAndroid && !_forceAndroidLocalhost) {
       // Android emulator needs special host IP
       host = AppConfig.androidEmulatorHost;
+      ApiConfig.debugPrint('🌐 Detected: Android emulator - using 10.0.2.2');
     } else {
       // iOS, physical devices, or forced localhost
       host = AppConfig.defaultHost;
+      ApiConfig.debugPrint(
+        '🌐 Detected: Physical device/iOS - using localhost',
+      );
     }
 
-    return _autoDetectedBase = 'http://$host:$port';
+    final baseUrl = 'http://$host:$port';
+    ApiConfig.debugPrint('🌐 Base URL: $baseUrl');
+    return _autoDetectedBase = baseUrl;
   }
 
   static String get baseUrl => _overrideBaseUrl ?? _detectBaseUrl();
 
-  static String get authBaseUrl => '$baseUrl/${AppConfig.authPrefix}';
-  static String get apiBaseUrl => '$baseUrl/${AppConfig.apiPrefix}';
+  static String get authBaseUrl {
+    final url = '$baseUrl/${AppConfig.authPrefix}';
+    ApiConfig.debugPrint('🔐 Auth base URL: $url');
+    return url;
+  }
+
+  static String get apiBaseUrl {
+    final url = '$baseUrl/${AppConfig.apiPrefix}';
+    ApiConfig.debugPrint('📡 API base URL: $url');
+    return url;
+  }
 
   static String get loginUrl => '$authBaseUrl/login/';
   static String get registerUrl => '$authBaseUrl/register/';
@@ -78,9 +100,18 @@ class ApiConfig {
   static String get statisticsUrl => '$authBaseUrl/statistics';
   static String get userStatisticsUrl => '$apiBaseUrl/users/statistics/';
 
-  static String get googleLoginUrl => '$authBaseUrl/google-login/';
+  static String get googleLoginUrl {
+    final url = '$authBaseUrl/google-login/';
+    ApiConfig.debugPrint('🔑 Google Login URL: $url');
+    return url;
+  }
+
+  static String automationUrl(int id) {
+    final url = '$apiBaseUrl/areas/$id/';
+    ApiConfig.debugPrint('📋 Automation URL ($id): $url');
+    return url;
+  }
 
-  static String automationUrl(int id) => '$apiBaseUrl/areas/$id/';
   static String automationDuplicateUrl(int id) =>
       '$apiBaseUrl/areas/$id/duplicate/';
   static String automationPauseUrl(int id) => '$apiBaseUrl/areas/$id/pause/';

mobile/lib/config/service_provider_config.dart

@@ -1,30 +1,14 @@
+import '../utils/service_token_mapper.dart';
+
 /// Service Provider Configuration
 ///
-/// Centralized configuration for all OAuth service providers (Google, GitHub, etc.)
+/// Lightweight configuration for service-related utilities.
+/// Most service metadata (logos, OAuth info) comes from about.json
 class ServiceProviderConfig {
-  static const List<String> oauthServices = [
-    'github',
-    'gmail',
-    'google',
-    'slack',
-    'twitch',
-  ];
-
-  static bool requiresOAuth(String serviceName) {
-    // Map gmail to google for OAuth purposes
-    final mappedName = mapServiceName(serviceName);
-    return oauthServices.contains(mappedName.toLowerCase());
-  }
-
-  /// Map service names for consistency (gmail -> google)
+  /// Map service names for consistency (gmail/google_calendar -> google)
   /// This is used to normalize service names across the application
   static String mapServiceName(String serviceName) {
-    switch (serviceName.toLowerCase()) {
-      case 'gmail':
-        return 'google';
-      default:
-        return serviceName;
-    }
+    return ServiceTokenMapper.resolveTokenService(serviceName);
   }
 
   /// Get user-friendly provider name
@@ -37,33 +21,12 @@ class ServiceProviderConfig {
         return 'GitHub';
       case 'slack':
         return 'Slack';
+      case 'spotify':
+        return 'Spotify';
       case 'twitch':
         return 'Twitch';
       default:
         return provider;
     }
   }
-
-  /// Get provider icon URL from web (PNG images)
-  static String getIconUrl(String provider) {
-    final mappedProvider = mapServiceName(provider);
-    switch (mappedProvider.toLowerCase()) {
-      case 'github':
-        return 'https://external-content.duckduckgo.com/iu/?u=https%3A%2F%2Flogos-world.net%2Fwp-content%2Fuploads%2F2020%2F11%2FGitHub-Symbol.png&f=1&nofb=1&ipt=1e8fe0d0c31dac1d47abf59a23130ec2b31975a34721d1ea9284db059ba4a957';
-      case 'google':
-        return 'https://upload.wikimedia.org/wikipedia/commons/thumb/2/2f/Google_2015_logo.svg/256px-Google_2015_logo.svg.png';
-      case 'slack':
-        return 'https://cdn-icons-png.flaticon.com/512/2111/2111615.png';
-      case 'twitch':
-        return 'https://cdn-icons-png.flaticon.com/512/5968/5968819.png';
-      case 'timer':
-        return 'https://cdn-icons-png.flaticon.com/512/109/109613.png';
-      case 'email':
-        return 'https://cdn-icons-png.flaticon.com/512/542/542638.png';
-      case 'webhook':
-        return 'https://cdn-icons-png.flaticon.com/512/149/149852.png';
-      default:
-        return 'https://cdn-icons-png.flaticon.com/512/1828/1828970.png';
-    }
-  }
 }

mobile/lib/main.dart

@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
 import 'dart:async';
 import 'package:app_links/app_links.dart';
 import 'providers/providers.dart';
+import 'providers/compatibility_provider.dart';
 import 'pages/splash_page.dart';
 import 'pages/login_page.dart';
 import 'pages/reset_password_page.dart';
@@ -21,9 +22,9 @@ void main() async {
 
   try {
     AppConfig.validateEnvironment();
-    AppConfig.debugPrint('Environment validation passed');
+    debugPrint('✅ Environment validation passed');
   } catch (e) {
-    AppConfig.debugPrint('Environment validation failed: $e');
+    debugPrint('❌ Environment validation failed: $e');
     if (AppConfig.isProduction) {
       rethrow;
     }
@@ -49,14 +50,16 @@ class _MyAppState extends State<MyApp> {
   bool _initialLinkHandled = false;
   late OAuthDeepLinkHandler _oauthHandler;
 
+  Uri? _lastHandledUri;
+  DateTime? _lastHandledTime;
+
   @override
   void initState() {
     super.initState();
     _appLinks = AppLinks();
     _oauthHandler = OAuthDeepLinkHandler();
     _oauthHandler.onOAuthComplete = _handleOAuthComplete;
     _initDeepLinkListener();
-    _initOAuthHandler();
   }
 
   @override
@@ -66,10 +69,6 @@ class _MyAppState extends State<MyApp> {
     super.dispose();
   }
 
-  Future<void> _initOAuthHandler() async {
-    await _oauthHandler.initialize();
-  }
-
   void _handleOAuthComplete(String provider, bool success, String? message) {
     WidgetsBinding.instance.addPostFrameCallback((_) {
       final context = navigatorKey.currentContext;
@@ -116,6 +115,22 @@ class _MyAppState extends State<MyApp> {
   void _handleDeepLink(Uri uri) {
     debugPrint('Handling deep link: $uri');
 
+    final now = DateTime.now();
+    if (_lastHandledUri?.toString() == uri.toString() &&
+        _lastHandledTime != null &&
+        now.difference(_lastHandledTime!).inSeconds < 2) {
+      debugPrint('Duplicate deep link ignored (same URI within 2 seconds)');
+      return;
+    }
+
+    _lastHandledUri = uri;
+    _lastHandledTime = now;
+
+    if (_oauthHandler.isOAuthCallback(uri)) {
+      _oauthHandler.handleDeepLink(uri);
+      return;
+    }
+
     if (uri.scheme == AppConfig.urlScheme &&
         uri.host == AppConfig.resetPasswordDeepLink) {
       final token = uri.queryParameters['token'];
@@ -146,6 +161,7 @@ class _MyAppState extends State<MyApp> {
         ChangeNotifierProvider(create: (_) => ServiceCatalogProvider()),
         ChangeNotifierProvider(create: (_) => ConnectedServicesProvider()),
         ChangeNotifierProvider(create: (_) => AutomationStatsProvider()),
+        ChangeNotifierProvider(create: (_) => CompatibilityProvider()),
       ],
       child: Builder(
         builder: (context) {
@@ -167,6 +183,18 @@ class _MyAppState extends State<MyApp> {
             }
           };
 
+          // Load compatibility rules when app starts
+          WidgetsBinding.instance.addPostFrameCallback((_) {
+            final compatibilityProvider = Provider.of<CompatibilityProvider>(
+              context,
+              listen: false,
+            );
+            if (!compatibilityProvider.isLoaded &&
+                !compatibilityProvider.isLoading) {
+              compatibilityProvider.loadRules();
+            }
+          });
+
           return MaterialApp(
             navigatorKey: navigatorKey,
             title: '${AppConfig.appName} Mobile',