mirror of
https://github.com/we-promise/sure.git
synced 2026-05-24 13:04:56 +00:00
* Add mobile custom proxy headers * Clear login placeholders on focus Email/password fields ship with example values pre-filled. Tapping the field now clears the placeholder so users don't have to delete it manually. Skips clearing if the user has already edited the value. * Push Configuration as a route from Sign in Opening Configuration from the Sign in screen now uses Navigator.push instead of toggling a state flag, so Android back returns to Sign in instead of quitting the app. Saving the URL auto-pops the route. * Address PR review on custom proxy headers - Test Connection no longer leaves global ApiConfig headers mutated; unsaved edits are restored in a finally block after the probe. - _loadSavedUrl / _loadCustomHeaders wrap storage reads in try/catch and always finish initialization with sensible defaults. - Sanitization is now a single CustomProxyHeader.sanitize() reused by ApiConfig.setCustomProxyHeaders and CustomProxyHeadersService. - Brief comment on redactedValue explaining the length-obscuring design. * Harden custom proxy header validation and load path - validateValue now rejects ASCII control characters (CR/LF/tab/etc.) to prevent header-injection via crafted values. - loadHeaders moves the secure-storage read inside the try block so platform exceptions are caught the same way JSON parse errors are.
316 lines
9.5 KiB
Dart
316 lines
9.5 KiB
Dart
import 'dart:async';
|
|
import 'package:app_links/app_links.dart';
|
|
import 'package:flutter/material.dart';
|
|
import 'package:provider/provider.dart';
|
|
import 'providers/auth_provider.dart';
|
|
import 'providers/accounts_provider.dart';
|
|
import 'providers/categories_provider.dart';
|
|
import 'providers/transactions_provider.dart';
|
|
import 'providers/chat_provider.dart';
|
|
import 'providers/theme_provider.dart';
|
|
import 'screens/backend_config_screen.dart';
|
|
import 'screens/login_screen.dart';
|
|
import 'screens/biometric_lock_screen.dart';
|
|
import 'screens/main_navigation_screen.dart';
|
|
import 'screens/sso_onboarding_screen.dart';
|
|
import 'services/api_config.dart';
|
|
import 'services/connectivity_service.dart';
|
|
import 'services/log_service.dart';
|
|
import 'services/preferences_service.dart';
|
|
|
|
void main() async {
|
|
WidgetsFlutterBinding.ensureInitialized();
|
|
await ApiConfig.initialize();
|
|
|
|
// Add initial log entry
|
|
LogService.instance.info('App', 'Sure app starting...');
|
|
|
|
runApp(const SureApp());
|
|
}
|
|
|
|
class SureApp extends StatelessWidget {
|
|
const SureApp({super.key});
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
return MultiProvider(
|
|
providers: [
|
|
ChangeNotifierProvider(create: (_) => LogService.instance),
|
|
ChangeNotifierProvider(create: (_) => ConnectivityService()),
|
|
ChangeNotifierProvider(create: (_) => AuthProvider()),
|
|
ChangeNotifierProvider(create: (_) => ChatProvider()),
|
|
ChangeNotifierProvider(create: (_) => CategoriesProvider()),
|
|
ChangeNotifierProvider(create: (_) => ThemeProvider()),
|
|
ChangeNotifierProxyProvider<ConnectivityService, AccountsProvider>(
|
|
create: (_) => AccountsProvider(),
|
|
update: (_, connectivityService, accountsProvider) {
|
|
if (accountsProvider == null) {
|
|
final provider = AccountsProvider();
|
|
provider.setConnectivityService(connectivityService);
|
|
return provider;
|
|
} else {
|
|
accountsProvider.setConnectivityService(connectivityService);
|
|
return accountsProvider;
|
|
}
|
|
},
|
|
),
|
|
ChangeNotifierProxyProvider<ConnectivityService, TransactionsProvider>(
|
|
create: (_) => TransactionsProvider(),
|
|
update: (_, connectivityService, transactionsProvider) {
|
|
if (transactionsProvider == null) {
|
|
final provider = TransactionsProvider();
|
|
provider.setConnectivityService(connectivityService);
|
|
return provider;
|
|
} else {
|
|
transactionsProvider.setConnectivityService(connectivityService);
|
|
return transactionsProvider;
|
|
}
|
|
},
|
|
),
|
|
],
|
|
child: Consumer<ThemeProvider>(
|
|
builder: (context, themeProvider, _) => MaterialApp(
|
|
title: 'Sure Finances',
|
|
debugShowCheckedModeBanner: false,
|
|
theme: ThemeData(
|
|
fontFamily: 'Geist',
|
|
fontFamilyFallback: const [
|
|
'Inter',
|
|
'Arial',
|
|
'sans-serif',
|
|
],
|
|
colorScheme: ColorScheme.fromSeed(
|
|
seedColor: const Color(0xFF6366F1),
|
|
brightness: Brightness.light,
|
|
),
|
|
useMaterial3: true,
|
|
appBarTheme: const AppBarTheme(
|
|
centerTitle: true,
|
|
elevation: 0,
|
|
),
|
|
cardTheme: CardThemeData(
|
|
elevation: 2,
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
),
|
|
inputDecorationTheme: InputDecorationTheme(
|
|
border: OutlineInputBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
filled: true,
|
|
),
|
|
elevatedButtonTheme: ElevatedButtonThemeData(
|
|
style: ElevatedButton.styleFrom(
|
|
minimumSize: const Size(double.infinity, 50),
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
darkTheme: ThemeData(
|
|
fontFamily: 'Geist',
|
|
fontFamilyFallback: const [
|
|
'Inter',
|
|
'Arial',
|
|
'sans-serif',
|
|
],
|
|
colorScheme: ColorScheme.fromSeed(
|
|
seedColor: const Color(0xFF6366F1),
|
|
brightness: Brightness.dark,
|
|
),
|
|
useMaterial3: true,
|
|
appBarTheme: const AppBarTheme(
|
|
centerTitle: true,
|
|
elevation: 0,
|
|
),
|
|
cardTheme: CardThemeData(
|
|
elevation: 2,
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
),
|
|
inputDecorationTheme: InputDecorationTheme(
|
|
border: OutlineInputBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
filled: true,
|
|
),
|
|
elevatedButtonTheme: ElevatedButtonThemeData(
|
|
style: ElevatedButton.styleFrom(
|
|
minimumSize: const Size(double.infinity, 50),
|
|
shape: RoundedRectangleBorder(
|
|
borderRadius: BorderRadius.circular(12),
|
|
),
|
|
),
|
|
),
|
|
),
|
|
themeMode: themeProvider.themeMode,
|
|
routes: {
|
|
'/config': (context) => const BackendConfigScreen(),
|
|
'/login': (context) => const LoginScreen(),
|
|
'/home': (context) => const MainNavigationScreen(),
|
|
},
|
|
home: const AppWrapper(),
|
|
)),
|
|
);
|
|
}
|
|
}
|
|
|
|
class AppWrapper extends StatefulWidget {
|
|
const AppWrapper({super.key});
|
|
|
|
@override
|
|
State<AppWrapper> createState() => _AppWrapperState();
|
|
}
|
|
|
|
class _AppWrapperState extends State<AppWrapper> with WidgetsBindingObserver {
|
|
bool _isCheckingConfig = true;
|
|
bool _hasBackendUrl = false;
|
|
bool _isLocked = false;
|
|
late final AppLinks _appLinks;
|
|
StreamSubscription<Uri>? _linkSubscription;
|
|
|
|
@override
|
|
void initState() {
|
|
super.initState();
|
|
WidgetsBinding.instance.addObserver(this);
|
|
_checkBackendConfig();
|
|
_initDeepLinks();
|
|
}
|
|
|
|
@override
|
|
void dispose() {
|
|
WidgetsBinding.instance.removeObserver(this);
|
|
_linkSubscription?.cancel();
|
|
super.dispose();
|
|
}
|
|
|
|
@override
|
|
void didChangeAppLifecycleState(AppLifecycleState state) {
|
|
if (state == AppLifecycleState.paused) {
|
|
_markLockedIfEnabled();
|
|
} else if (state == AppLifecycleState.resumed && _isLocked) {
|
|
// Lock screen is already showing via build(); biometric auto-triggers there.
|
|
}
|
|
}
|
|
|
|
Future<void> _markLockedIfEnabled() async {
|
|
final authProvider = Provider.of<AuthProvider>(context, listen: false);
|
|
if (!authProvider.isAuthenticated) return;
|
|
final enabled = await PreferencesService.instance.getBiometricEnabled();
|
|
if (enabled && mounted) {
|
|
setState(() => _isLocked = true);
|
|
}
|
|
}
|
|
|
|
void _onUnlocked() {
|
|
if (mounted) setState(() => _isLocked = false);
|
|
}
|
|
|
|
Future<void> _onLockLogout() async {
|
|
final authProvider = Provider.of<AuthProvider>(context, listen: false);
|
|
await authProvider.logout();
|
|
if (mounted) setState(() => _isLocked = false);
|
|
}
|
|
|
|
void _initDeepLinks() {
|
|
_appLinks = AppLinks();
|
|
|
|
// Handle deep link that launched the app (cold start)
|
|
_appLinks.getInitialLink().then((uri) {
|
|
if (uri != null) _handleDeepLink(uri);
|
|
}).catchError((e, stackTrace) {
|
|
LogService.instance.error('DeepLinks', 'Initial link error: $e\n$stackTrace');
|
|
});
|
|
|
|
// Listen for deep links while app is running
|
|
_linkSubscription = _appLinks.uriLinkStream.listen(
|
|
(uri) => _handleDeepLink(uri),
|
|
onError: (e, stackTrace) {
|
|
LogService.instance.error('DeepLinks', 'Link stream error: $e\n$stackTrace');
|
|
},
|
|
);
|
|
}
|
|
|
|
void _handleDeepLink(Uri uri) {
|
|
if (uri.scheme == 'sureapp' && uri.host == 'oauth') {
|
|
final authProvider = Provider.of<AuthProvider>(context, listen: false);
|
|
authProvider.handleSsoCallback(uri);
|
|
}
|
|
}
|
|
|
|
Future<void> _checkBackendConfig() async {
|
|
final hasUrl = await ApiConfig.initialize();
|
|
if (mounted) {
|
|
setState(() {
|
|
_hasBackendUrl = hasUrl;
|
|
_isCheckingConfig = false;
|
|
});
|
|
}
|
|
}
|
|
|
|
void _onBackendConfigSaved() {
|
|
setState(() {
|
|
_hasBackendUrl = true;
|
|
});
|
|
}
|
|
|
|
@override
|
|
Widget build(BuildContext context) {
|
|
if (_isCheckingConfig) {
|
|
return const Scaffold(
|
|
body: Center(
|
|
child: CircularProgressIndicator(),
|
|
),
|
|
);
|
|
}
|
|
|
|
if (!_hasBackendUrl) {
|
|
return BackendConfigScreen(
|
|
onConfigSaved: _onBackendConfigSaved,
|
|
);
|
|
}
|
|
|
|
return Consumer<AuthProvider>(
|
|
builder: (context, authProvider, _) {
|
|
// Only show loading spinner during initial auth check
|
|
if (authProvider.isInitializing) {
|
|
return const Scaffold(
|
|
body: Center(
|
|
child: CircularProgressIndicator(),
|
|
),
|
|
);
|
|
}
|
|
|
|
if (authProvider.isAuthenticated) {
|
|
return Stack(
|
|
children: [
|
|
const MainNavigationScreen(),
|
|
if (_isLocked)
|
|
BiometricLockScreen(
|
|
onUnlocked: _onUnlocked,
|
|
onLogout: _onLockLogout,
|
|
),
|
|
],
|
|
);
|
|
}
|
|
|
|
// Clear stale lock state so it doesn't flash on the next login.
|
|
if (_isLocked) {
|
|
WidgetsBinding.instance.addPostFrameCallback((_) {
|
|
if (mounted) setState(() => _isLocked = false);
|
|
});
|
|
}
|
|
|
|
if (authProvider.ssoOnboardingPending) {
|
|
return const SsoOnboardingScreen();
|
|
}
|
|
|
|
return const LoginScreen();
|
|
},
|
|
);
|
|
}
|
|
}
|