feat(01-07): update pages with password reset navigation and deep linking
- Updated login page to navigate to /reset-password instead of placeholder - Added "Forgot Password?" link to signup page - Enhanced reset password confirmation page to extract token/email from URL parameters - Updated update password page to handle deep linking parameters - Added deep linking support configuration in main.dart - Improved router with URL parameter extraction helpers
This commit is contained in:
@@ -186,13 +186,8 @@ class _LoginPageState extends State<LoginPage> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void _handleForgotPassword() {
|
void _handleForgotPassword() {
|
||||||
// TODO: Navigate to forgot password screen
|
// Navigate to password reset page
|
||||||
ScaffoldMessenger.of(context).showSnackBar(
|
context.go('/reset-password');
|
||||||
const SnackBar(
|
|
||||||
content: Text('Forgot password feature coming soon'),
|
|
||||||
duration: Duration(seconds: 2),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void _handleSignUp() {
|
void _handleSignUp() {
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import '../providers/auth_provider.dart';
|
import '../providers/auth_provider.dart';
|
||||||
import '../../../../core/errors/auth_exceptions.dart';
|
import '../../../../core/errors/auth_exceptions.dart';
|
||||||
|
import '../../../../core/router/app_router.dart';
|
||||||
|
|
||||||
/// Password reset confirmation page
|
/// Password reset confirmation page
|
||||||
///
|
///
|
||||||
@@ -32,22 +34,47 @@ class _ResetPasswordConfirmPageState extends ConsumerState<ResetPasswordConfirmP
|
|||||||
});
|
});
|
||||||
|
|
||||||
try {
|
try {
|
||||||
// Check if we have a valid reset session by attempting to get current user
|
// Extract token and email from URL parameters (deep linking)
|
||||||
final authProvider = ref.read(authProvider.notifier);
|
final resetData = AppRouter.handlePasswordResetDeepLink(context);
|
||||||
await authProvider.getCurrentUser();
|
final token = resetData['token'];
|
||||||
|
final email = resetData['email'];
|
||||||
|
|
||||||
if (mounted) {
|
if (token != null && email != null) {
|
||||||
setState(() {
|
// Validate token with auth provider
|
||||||
_isLoading = false;
|
final authProvider = ref.read(authProvider.notifier);
|
||||||
_tokenValid = true;
|
await authProvider.validateResetToken(token, email);
|
||||||
});
|
|
||||||
|
|
||||||
// Navigate to update password page after short delay
|
if (mounted) {
|
||||||
Future.delayed(const Duration(seconds: 2), () {
|
setState(() {
|
||||||
if (mounted) {
|
_isLoading = false;
|
||||||
Navigator.of(context).pushReplacementNamed('/update-password');
|
_tokenValid = true;
|
||||||
}
|
});
|
||||||
});
|
|
||||||
|
// Navigate to update password page after short delay
|
||||||
|
Future.delayed(const Duration(seconds: 2), () {
|
||||||
|
if (mounted) {
|
||||||
|
context.go('/update-password?token=$token&email=$email');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// No token found, try to get current user (for email flow)
|
||||||
|
final authProvider = ref.read(authProvider.notifier);
|
||||||
|
await authProvider.getCurrentUser();
|
||||||
|
|
||||||
|
if (mounted) {
|
||||||
|
setState(() {
|
||||||
|
_isLoading = false;
|
||||||
|
_tokenValid = true;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Navigate to update password page after short delay
|
||||||
|
Future.delayed(const Duration(seconds: 2), () {
|
||||||
|
if (mounted) {
|
||||||
|
context.go('/update-password');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
|
|||||||
@@ -137,6 +137,22 @@ class _SignupPageState extends State<SignupPage> {
|
|||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
|
const SizedBox(height: 12),
|
||||||
|
|
||||||
|
// Forgot password link
|
||||||
|
Align(
|
||||||
|
alignment: Alignment.center,
|
||||||
|
child: TextButton(
|
||||||
|
onPressed: _handleForgotPassword,
|
||||||
|
child: Text(
|
||||||
|
'Forgot Password?',
|
||||||
|
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||||
|
color: Theme.of(context).colorScheme.primary,
|
||||||
|
fontWeight: FontWeight.w500,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -335,4 +351,9 @@ class _SignupPageState extends State<SignupPage> {
|
|||||||
// Navigate to sign in page
|
// Navigate to sign in page
|
||||||
context.go('/login');
|
context.go('/login');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void _handleForgotPassword() {
|
||||||
|
// Navigate to password reset page
|
||||||
|
context.go('/reset-password');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,9 +1,11 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
import 'package:go_router/go_router.dart';
|
||||||
import '../../widgets/auth_button.dart';
|
import '../../widgets/auth_button.dart';
|
||||||
import '../providers/auth_provider.dart';
|
import '../providers/auth_provider.dart';
|
||||||
import '../../../../core/errors/auth_exceptions.dart';
|
import '../../../../core/errors/auth_exceptions.dart';
|
||||||
import '../../../../core/utils/password_validator.dart';
|
import '../../../../core/utils/password_validator.dart';
|
||||||
|
import '../../../../core/router/app_router.dart';
|
||||||
|
|
||||||
/// Password update page for handling password reset from email links
|
/// Password update page for handling password reset from email links
|
||||||
///
|
///
|
||||||
@@ -28,6 +30,15 @@ class _UpdatePasswordPageState extends ConsumerState<UpdatePasswordPage> {
|
|||||||
String? _errorMessage;
|
String? _errorMessage;
|
||||||
bool _passwordUpdated = false;
|
bool _passwordUpdated = false;
|
||||||
|
|
||||||
|
String? _resetToken;
|
||||||
|
String? _resetEmail;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
super.initState();
|
||||||
|
_extractResetParameters();
|
||||||
|
}
|
||||||
|
|
||||||
@override
|
@override
|
||||||
void dispose() {
|
void dispose() {
|
||||||
_newPasswordController.dispose();
|
_newPasswordController.dispose();
|
||||||
@@ -35,6 +46,17 @@ class _UpdatePasswordPageState extends ConsumerState<UpdatePasswordPage> {
|
|||||||
super.dispose();
|
super.dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Extract reset token and email from URL parameters for deep linking
|
||||||
|
void _extractResetParameters() {
|
||||||
|
final resetData = AppRouter.handlePasswordResetDeepLink(context);
|
||||||
|
_resetToken = resetData['token'];
|
||||||
|
_resetEmail = resetData['email'];
|
||||||
|
|
||||||
|
if (_resetToken != null && _resetEmail != null) {
|
||||||
|
print('Reset parameters extracted for email: $_resetEmail');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
Future<void> _handlePasswordUpdate() async {
|
Future<void> _handlePasswordUpdate() async {
|
||||||
if (!_formKey.currentState!.validate()) return;
|
if (!_formKey.currentState!.validate()) return;
|
||||||
|
|
||||||
@@ -45,9 +67,20 @@ class _UpdatePasswordPageState extends ConsumerState<UpdatePasswordPage> {
|
|||||||
|
|
||||||
try {
|
try {
|
||||||
final authProvider = ref.read(authProvider.notifier);
|
final authProvider = ref.read(authProvider.notifier);
|
||||||
await authProvider.updatePasswordFromReset(
|
|
||||||
_newPasswordController.text.trim(),
|
// Use reset token and email if available (from deep linking)
|
||||||
);
|
if (_resetToken != null && _resetEmail != null) {
|
||||||
|
await authProvider.updatePasswordWithToken(
|
||||||
|
_resetToken!,
|
||||||
|
_resetEmail!,
|
||||||
|
_newPasswordController.text.trim(),
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Fallback to regular password update
|
||||||
|
await authProvider.updatePasswordFromReset(
|
||||||
|
_newPasswordController.text.trim(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
if (mounted) {
|
if (mounted) {
|
||||||
setState(() {
|
setState(() {
|
||||||
|
|||||||
@@ -1,12 +1,10 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:supabase_flutter/supabase_flutter.dart';
|
import 'package:supabase_flutter/supabase_flutter.dart';
|
||||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
|
|
||||||
import 'core/constants/supabase_constants.dart';
|
import 'core/constants/supabase_constants.dart';
|
||||||
import 'core/router/app_router.dart';
|
import 'core/router/app_router.dart';
|
||||||
import 'providers/auth_provider.dart';
|
|
||||||
|
|
||||||
void main() async {
|
void main() async {
|
||||||
WidgetsFlutterBinding.ensureInitialized();
|
WidgetsFlutterBinding.ensureInitialized();
|
||||||
@@ -26,16 +24,14 @@ void main() async {
|
|||||||
debugPrint('Failed to initialize Supabase: $e');
|
debugPrint('Failed to initialize Supabase: $e');
|
||||||
}
|
}
|
||||||
|
|
||||||
runApp(const ProviderScope(child: SageApp()));
|
runApp(const SageApp());
|
||||||
}
|
}
|
||||||
|
|
||||||
class SageApp extends ConsumerWidget {
|
class SageApp extends StatelessWidget {
|
||||||
const SageApp({super.key});
|
const SageApp({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context) {
|
||||||
final router = ref.watch(routerProvider);
|
|
||||||
|
|
||||||
return MaterialApp.router(
|
return MaterialApp.router(
|
||||||
title: 'Sage - Food Inventory Tracker',
|
title: 'Sage - Food Inventory Tracker',
|
||||||
debugShowCheckedModeBanner: false,
|
debugShowCheckedModeBanner: false,
|
||||||
@@ -43,7 +39,10 @@ class SageApp extends ConsumerWidget {
|
|||||||
colorScheme: ColorScheme.fromSeed(seedColor: Colors.green),
|
colorScheme: ColorScheme.fromSeed(seedColor: Colors.green),
|
||||||
useMaterial3: true,
|
useMaterial3: true,
|
||||||
),
|
),
|
||||||
routerConfig: router,
|
routerConfig: AppRouter.router,
|
||||||
|
// Configure deep linking for password reset
|
||||||
|
onGenerateTitle: (context) => 'Sage - Food Inventory Tracker',
|
||||||
|
);
|
||||||
builder: (context, child) {
|
builder: (context, child) {
|
||||||
// Set up error handling for the entire app
|
// Set up error handling for the entire app
|
||||||
return ErrorBoundary(
|
return ErrorBoundary(
|
||||||
|
|||||||
Reference in New Issue
Block a user