ramadhan sjamsani
212e1e8ac6
- Backend: getOrCreateCustomer with phone fallback for re-login - Backend: PATCH /api/client/auth/profile for display name update - Client app: AuthNeedsDisplayNameData state + SetDisplayNameScreen - Client app: ApiClient.patch method - Both apps: handle verificationCompleted for auto-verify (test numbers) - Both apps: skip credential sign-in if already auto-verified - Remove debug prints from mitra auth + OTP screens - Fix ChatRequestNotifier.startListening skips when accepting Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
100 lines
4.1 KiB
Dart
100 lines
4.1 KiB
Dart
import 'package:flutter/material.dart';
|
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
import 'package:go_router/go_router.dart';
|
|
import 'core/auth/auth_notifier.dart';
|
|
import 'features/auth/screens/welcome_screen.dart';
|
|
import 'features/auth/screens/display_name_screen.dart';
|
|
import 'features/auth/screens/register_screen.dart';
|
|
import 'features/auth/screens/otp_screen.dart';
|
|
import 'features/auth/screens/force_register_screen.dart';
|
|
import 'features/auth/screens/set_display_name_screen.dart';
|
|
import 'features/splash/splash_screen.dart';
|
|
import 'features/home/home_screen.dart';
|
|
import 'features/chat/screens/searching_screen.dart';
|
|
import 'features/chat/screens/bestie_found_screen.dart';
|
|
import 'features/chat/screens/no_bestie_screen.dart';
|
|
import 'features/chat/screens/chat_screen.dart';
|
|
import 'features/chat/screens/chat_history_screen.dart';
|
|
import 'features/chat/screens/chat_transcript_screen.dart';
|
|
|
|
class RouterNotifier extends ChangeNotifier {
|
|
final Ref _ref;
|
|
|
|
RouterNotifier(this._ref) {
|
|
_ref.listen(authProvider, (_, __) => notifyListeners());
|
|
}
|
|
}
|
|
|
|
final routerProvider = Provider<GoRouter>((ref) => buildRouter(ref));
|
|
|
|
GoRouter buildRouter(Ref ref) {
|
|
final notifier = RouterNotifier(ref);
|
|
|
|
return GoRouter(
|
|
initialLocation: '/splash',
|
|
refreshListenable: notifier,
|
|
redirect: (context, state) {
|
|
final authState = ref.read(authProvider);
|
|
final isSplash = state.matchedLocation == '/splash';
|
|
final isAuthRoute = state.matchedLocation.startsWith('/auth') ||
|
|
state.matchedLocation == '/welcome';
|
|
|
|
// Show splash only during initial load — don't redirect away from auth routes
|
|
if (authState is AsyncLoading) {
|
|
if (isSplash || isAuthRoute) return null;
|
|
return '/splash';
|
|
}
|
|
|
|
final data = authState.valueOrNull;
|
|
if (data == null) {
|
|
// Error state — show login
|
|
if (!isAuthRoute && !isSplash) return '/welcome';
|
|
if (isSplash) return '/welcome';
|
|
return null;
|
|
}
|
|
|
|
if (data is AuthAuthenticatedData || data is AuthAnonymousData) {
|
|
return (isSplash || isAuthRoute) ? '/home' : null;
|
|
}
|
|
if (data is AuthNeedsDisplayNameData) return '/auth/set-name';
|
|
if (data is AuthForceRegisterData) return '/auth/force-register';
|
|
if (!isAuthRoute && !isSplash) return '/welcome';
|
|
if (isSplash) return '/welcome';
|
|
return null;
|
|
},
|
|
routes: [
|
|
GoRoute(path: '/splash', builder: (_, __) => const SplashScreen()),
|
|
GoRoute(path: '/welcome', builder: (_, __) => const WelcomeScreen()),
|
|
GoRoute(path: '/auth/display-name', builder: (_, __) => const DisplayNameScreen()),
|
|
GoRoute(path: '/auth/register', builder: (_, __) => const RegisterScreen()),
|
|
GoRoute(path: '/auth/otp', builder: (context, state) => OtpScreen(phone: state.extra as String)),
|
|
GoRoute(path: '/auth/set-name', builder: (_, __) => const SetDisplayNameScreen()),
|
|
GoRoute(path: '/auth/force-register', builder: (_, __) => const ForceRegisterScreen()),
|
|
GoRoute(path: '/home', builder: (_, __) => const HomeScreen()),
|
|
GoRoute(path: '/chat/searching', builder: (_, __) => const SearchingScreen()),
|
|
GoRoute(path: '/chat/found', builder: (context, state) {
|
|
final extra = state.extra as Map<String, dynamic>;
|
|
return BestieFoundScreen(
|
|
sessionId: extra['sessionId'] as String,
|
|
mitraName: extra['mitraName'] as String,
|
|
);
|
|
}),
|
|
GoRoute(path: '/chat/no-bestie', builder: (_, __) => const NoBestieScreen()),
|
|
GoRoute(path: '/chat/session/:sessionId', builder: (context, state) {
|
|
final extra = state.extra;
|
|
final mitraName = extra is String
|
|
? extra
|
|
: (extra is Map<String, dynamic> ? extra['mitraName'] as String? : null);
|
|
return ChatScreen(
|
|
sessionId: state.pathParameters['sessionId']!,
|
|
mitraName: mitraName ?? 'Bestie',
|
|
);
|
|
}),
|
|
GoRoute(path: '/chat/history', builder: (_, __) => const ChatHistoryScreen()),
|
|
GoRoute(path: '/chat/history/:sessionId', builder: (context, state) {
|
|
return ChatTranscriptScreen(sessionId: state.pathParameters['sessionId']!);
|
|
}),
|
|
],
|
|
);
|
|
}
|