reset password fix

lib/data/repositories/api_auth_repository.dart

@@ -89,9 +89,14 @@ class ApiAuthRepository implements AuthRepository {
   Future<void> resetPassword({
     required String userId,
     required String password,
+    required String oldPassword,
   }) async {
     final uri = Uri.parse('$baseUrl/auth/reset-password');
-    final requestBody = jsonEncode({'userId': userId, 'password': password});
+    final requestBody = jsonEncode({
+      'userId': userId,
+      'password': password,
+      'password2': oldPassword,
+    });
 
     final response = await _client.put(
       uri,
@@ -129,6 +134,35 @@ class ApiAuthRepository implements AuthRepository {
     throw Exception(_extractErrorMessage(response.body));
   }
 
+  @override
+  Future<String> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  }) async {
+    final uri = Uri.parse('$baseUrl/user/change-password');
+    final requestBody = jsonEncode({
+      'oldPassword': oldPassword,
+      'newPassword': newPassword,
+      'confirmPassword': confirmPassword,
+    });
+
+    final response = await _client.post(
+      uri,
+      headers: {'Content-Type': 'application/json', 'x-api-key': apiSecret},
+      body: requestBody,
+    );
+
+    if (response.statusCode >= 200 && response.statusCode < 300) {
+      return _extractSuccessMessage(
+        response.body,
+        fallback: 'Password changed successfully',
+      );
+    }
+
+    throw Exception(_extractErrorMessage(response.body));
+  }
+
   @override
   Future<void> logout({required String refreshToken}) async {
     final uri = Uri.parse('$baseUrl/auth/logout');

lib/data/repositories/mock_auth_repository.dart

@@ -49,12 +49,16 @@ class MockAuthRepository implements AuthRepository {
   Future<void> resetPassword({
     required String userId,
     required String password,
+    required String oldPassword,
   }) async {
     await Future<void>.delayed(const Duration(milliseconds: 500));
 
     if (userId.trim().isEmpty) {
       throw Exception('User ID is required.');
     }
+    if (oldPassword.isEmpty) {
+      throw Exception('Old password is required.');
+    }
     if (password.length < 8) {
       throw Exception('Password must be at least 8 characters.');
     }
@@ -71,6 +75,24 @@ class MockAuthRepository implements AuthRepository {
     return 'Password reset successfully';
   }
 
+  @override
+  Future<String> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  }) async {
+    await Future<void>.delayed(const Duration(milliseconds: 500));
+
+    if (oldPassword.isEmpty || newPassword.isEmpty || confirmPassword.isEmpty) {
+      throw Exception('All fields are required');
+    }
+    if (newPassword != confirmPassword) {
+      throw Exception('New passwords do not match');
+    }
+
+    return 'Password changed successfully';
+  }
+
   @override
   Future<void> logout({required String refreshToken}) async {
     await Future<void>.delayed(const Duration(milliseconds: 250));

lib/domain/repositories/auth_repository.dart

@@ -12,9 +12,16 @@ abstract class AuthRepository {
   Future<void> resetPassword({
     required String userId,
     required String password,
+    required String oldPassword,
   });
 
   Future<String> resetCashierPassword({required String username});
 
+  Future<String> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  });
+
   Future<void> logout({required String refreshToken});
 }

lib/presentation/change_password/change_password_form_providers.dart

@@ -0,0 +1,68 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final changePasswordFormKeyProvider =
+    Provider.autoDispose<GlobalKey<FormState>>((ref) {
+      return GlobalKey<FormState>();
+    });
+
+final changeOldPasswordControllerProvider =
+    Provider.autoDispose<TextEditingController>((ref) {
+      final controller = TextEditingController();
+      ref.onDispose(controller.dispose);
+      return controller;
+    });
+
+final changeNewPasswordControllerProvider =
+    Provider.autoDispose<TextEditingController>((ref) {
+      final controller = TextEditingController();
+      ref.onDispose(controller.dispose);
+      return controller;
+    });
+
+final changeConfirmPasswordControllerProvider =
+    Provider.autoDispose<TextEditingController>((ref) {
+      final controller = TextEditingController();
+      ref.onDispose(controller.dispose);
+      return controller;
+    });
+
+final changeOldPasswordFocusNodeProvider = Provider.autoDispose<FocusNode>((
+  ref,
+) {
+  final focusNode = FocusNode();
+  ref.onDispose(focusNode.dispose);
+  return focusNode;
+});
+
+final changeNewPasswordFocusNodeProvider = Provider.autoDispose<FocusNode>((
+  ref,
+) {
+  final focusNode = FocusNode();
+  ref.onDispose(focusNode.dispose);
+  return focusNode;
+});
+
+final changeConfirmPasswordFocusNodeProvider = Provider.autoDispose<FocusNode>((
+  ref,
+) {
+  final focusNode = FocusNode();
+  ref.onDispose(focusNode.dispose);
+  return focusNode;
+});
+
+final changeOldPasswordObscureProvider = StateProvider.autoDispose<bool>(
+  (ref) => true,
+);
+
+final changeNewPasswordObscureProvider = StateProvider.autoDispose<bool>(
+  (ref) => true,
+);
+
+final changeConfirmPasswordObscureProvider = StateProvider.autoDispose<bool>(
+  (ref) => true,
+);
+
+final changePasswordAttemptedSubmitProvider = StateProvider.autoDispose<bool>(
+  (ref) => false,
+);

lib/presentation/change_password/change_password_page.dart

@@ -0,0 +1,372 @@
+import 'package:e_receipt_mobile/presentation/change_password/change_password_form_providers.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_view_model.dart';
+import 'package:e_receipt_mobile/presentation/login/widgets/login_background.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+class ChangePasswordPage extends ConsumerWidget {
+  const ChangePasswordPage({super.key});
+
+  void _submit({
+    required BuildContext context,
+    required WidgetRef ref,
+    required GlobalKey<FormState> formKey,
+    required TextEditingController oldPasswordController,
+    required TextEditingController newPasswordController,
+    required TextEditingController confirmPasswordController,
+    required bool isLoading,
+  }) {
+    if (isLoading) {
+      return;
+    }
+
+    ref.read(changePasswordViewModelProvider.notifier).clearMessages();
+    FocusManager.instance.primaryFocus?.unfocus();
+    ref.read(changePasswordAttemptedSubmitProvider.notifier).state = true;
+
+    if (!(formKey.currentState?.validate() ?? false)) {
+      return;
+    }
+
+    ref
+        .read(changePasswordViewModelProvider.notifier)
+        .changePassword(
+          oldPassword: oldPasswordController.text,
+          newPassword: newPasswordController.text,
+          confirmPassword: confirmPasswordController.text,
+        );
+  }
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final state = ref.watch(changePasswordViewModelProvider);
+    final colorScheme = Theme.of(context).colorScheme;
+
+    ref.listen(changePasswordViewModelProvider, (previous, next) {
+      final error = next.errorMessage;
+      if (error != null && error != previous?.errorMessage) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          SnackBar(content: Text(error), behavior: SnackBarBehavior.floating),
+        );
+      }
+
+      final success = next.successMessage;
+      if (success != null && success != previous?.successMessage) {
+        Navigator.of(context).pop(success);
+      }
+    });
+
+    final formKey = ref.watch(changePasswordFormKeyProvider);
+    final oldPasswordController = ref.watch(
+      changeOldPasswordControllerProvider,
+    );
+    final newPasswordController = ref.watch(
+      changeNewPasswordControllerProvider,
+    );
+    final confirmPasswordController = ref.watch(
+      changeConfirmPasswordControllerProvider,
+    );
+    final oldPasswordFocusNode = ref.watch(changeOldPasswordFocusNodeProvider);
+    final newPasswordFocusNode = ref.watch(changeNewPasswordFocusNodeProvider);
+    final confirmPasswordFocusNode = ref.watch(
+      changeConfirmPasswordFocusNodeProvider,
+    );
+    final obscureOld = ref.watch(changeOldPasswordObscureProvider);
+    final obscureNew = ref.watch(changeNewPasswordObscureProvider);
+    final obscureConfirm = ref.watch(changeConfirmPasswordObscureProvider);
+    final attemptedSubmit = ref.watch(changePasswordAttemptedSubmitProvider);
+
+    return Scaffold(
+      appBar: AppBar(title: const Text('Change password')),
+      body: AnnotatedRegion<SystemUiOverlayStyle>(
+        value: Theme.of(context).brightness == Brightness.dark
+            ? SystemUiOverlayStyle.light
+            : SystemUiOverlayStyle.dark,
+        child: LoginBackground(
+          child: SafeArea(
+            child: Center(
+              child: SingleChildScrollView(
+                padding: const EdgeInsets.symmetric(
+                  horizontal: 20,
+                  vertical: 24,
+                ),
+                child: ConstrainedBox(
+                  constraints: const BoxConstraints(maxWidth: 440),
+                  child: Card(
+                    elevation: 0,
+                    color: colorScheme.surface.withValues(
+                      alpha: Theme.of(context).brightness == Brightness.dark
+                          ? 0.75
+                          : 0.92,
+                    ),
+                    shape: RoundedRectangleBorder(
+                      borderRadius: BorderRadius.circular(28),
+                      side: BorderSide(
+                        color: colorScheme.outlineVariant.withValues(
+                          alpha: 0.35,
+                        ),
+                      ),
+                    ),
+                    child: Padding(
+                      padding: const EdgeInsets.fromLTRB(20, 22, 20, 18),
+                      child: Form(
+                        key: formKey,
+                        autovalidateMode: attemptedSubmit
+                            ? AutovalidateMode.onUserInteraction
+                            : AutovalidateMode.disabled,
+                        child: Column(
+                          crossAxisAlignment: CrossAxisAlignment.stretch,
+                          children: [
+                            Row(
+                              children: [
+                                Container(
+                                  height: 44,
+                                  width: 44,
+                                  decoration: BoxDecoration(
+                                    borderRadius: BorderRadius.circular(14),
+                                    gradient: LinearGradient(
+                                      begin: Alignment.topLeft,
+                                      end: Alignment.bottomRight,
+                                      colors: [
+                                        colorScheme.primary,
+                                        colorScheme.tertiary,
+                                      ],
+                                    ),
+                                  ),
+                                  child: const Icon(
+                                    Icons.password_outlined,
+                                    color: Colors.white,
+                                  ),
+                                ),
+                                const SizedBox(width: 12),
+                                Expanded(
+                                  child: Column(
+                                    crossAxisAlignment:
+                                        CrossAxisAlignment.start,
+                                    children: [
+                                      Text(
+                                        'Change your password',
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .titleLarge
+                                            ?.copyWith(
+                                              fontWeight: FontWeight.w800,
+                                            ),
+                                      ),
+                                      Text(
+                                        'Use your current password to set a new permanent one.',
+                                        style: Theme.of(context)
+                                            .textTheme
+                                            .bodyMedium
+                                            ?.copyWith(
+                                              color:
+                                                  colorScheme.onSurfaceVariant,
+                                            ),
+                                      ),
+                                    ],
+                                  ),
+                                ),
+                              ],
+                            ),
+                            const SizedBox(height: 18),
+                            _PasswordField(
+                              controller: oldPasswordController,
+                              focusNode: oldPasswordFocusNode,
+                              enabled: !state.isLoading,
+                              obscureText: obscureOld,
+                              labelText: 'Current password',
+                              hintText: 'Enter your current password',
+                              textInputAction: TextInputAction.next,
+                              onFieldSubmitted: (_) => FocusScope.of(
+                                context,
+                              ).requestFocus(newPasswordFocusNode),
+                              onToggleVisibility: () =>
+                                  ref
+                                          .read(
+                                            changeOldPasswordObscureProvider
+                                                .notifier,
+                                          )
+                                          .state =
+                                      !obscureOld,
+                              validator: (value) {
+                                if ((value ?? '').isEmpty) {
+                                  return 'Current password is required';
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 12),
+                            _PasswordField(
+                              controller: newPasswordController,
+                              focusNode: newPasswordFocusNode,
+                              enabled: !state.isLoading,
+                              obscureText: obscureNew,
+                              labelText: 'New password',
+                              hintText: 'Enter your new password',
+                              textInputAction: TextInputAction.next,
+                              onFieldSubmitted: (_) => FocusScope.of(
+                                context,
+                              ).requestFocus(confirmPasswordFocusNode),
+                              onToggleVisibility: () =>
+                                  ref
+                                          .read(
+                                            changeNewPasswordObscureProvider
+                                                .notifier,
+                                          )
+                                          .state =
+                                      !obscureNew,
+                              validator: (value) {
+                                if ((value ?? '').isEmpty) {
+                                  return 'New password is required';
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 12),
+                            _PasswordField(
+                              controller: confirmPasswordController,
+                              focusNode: confirmPasswordFocusNode,
+                              enabled: !state.isLoading,
+                              obscureText: obscureConfirm,
+                              labelText: 'Confirm new password',
+                              hintText: 'Re-enter your new password',
+                              textInputAction: TextInputAction.done,
+                              onFieldSubmitted: (_) => _submit(
+                                context: context,
+                                ref: ref,
+                                formKey: formKey,
+                                oldPasswordController: oldPasswordController,
+                                newPasswordController: newPasswordController,
+                                confirmPasswordController:
+                                    confirmPasswordController,
+                                isLoading: state.isLoading,
+                              ),
+                              onToggleVisibility: () =>
+                                  ref
+                                          .read(
+                                            changeConfirmPasswordObscureProvider
+                                                .notifier,
+                                          )
+                                          .state =
+                                      !obscureConfirm,
+                              validator: (value) {
+                                if ((value ?? '').isEmpty) {
+                                  return 'Confirm password is required';
+                                }
+                                return null;
+                              },
+                            ),
+                            const SizedBox(height: 16),
+                            FilledButton.icon(
+                              onPressed: state.isLoading
+                                  ? null
+                                  : () => _submit(
+                                      context: context,
+                                      ref: ref,
+                                      formKey: formKey,
+                                      oldPasswordController:
+                                          oldPasswordController,
+                                      newPasswordController:
+                                          newPasswordController,
+                                      confirmPasswordController:
+                                          confirmPasswordController,
+                                      isLoading: state.isLoading,
+                                    ),
+                              icon: state.isLoading
+                                  ? const SizedBox(
+                                      height: 18,
+                                      width: 18,
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2,
+                                      ),
+                                    )
+                                  : const Icon(Icons.check),
+                              label: Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 12,
+                                ),
+                                child: Text(
+                                  state.isLoading
+                                      ? 'Updating...'
+                                      : 'Change password',
+                                  style: const TextStyle(
+                                    fontWeight: FontWeight.w600,
+                                  ),
+                                ),
+                              ),
+                            ),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}
+
+class _PasswordField extends StatelessWidget {
+  const _PasswordField({
+    required this.controller,
+    required this.focusNode,
+    required this.enabled,
+    required this.obscureText,
+    required this.labelText,
+    required this.hintText,
+    required this.textInputAction,
+    required this.onFieldSubmitted,
+    required this.onToggleVisibility,
+    required this.validator,
+  });
+
+  final TextEditingController controller;
+  final FocusNode focusNode;
+  final bool enabled;
+  final bool obscureText;
+  final String labelText;
+  final String hintText;
+  final TextInputAction textInputAction;
+  final ValueChanged<String> onFieldSubmitted;
+  final VoidCallback onToggleVisibility;
+  final FormFieldValidator<String> validator;
+
+  @override
+  Widget build(BuildContext context) {
+    final colorScheme = Theme.of(context).colorScheme;
+
+    return TextFormField(
+      controller: controller,
+      focusNode: focusNode,
+      enabled: enabled,
+      textInputAction: textInputAction,
+      obscureText: obscureText,
+      onFieldSubmitted: onFieldSubmitted,
+      validator: validator,
+      decoration: InputDecoration(
+        labelText: labelText,
+        hintText: hintText,
+        prefixIcon: const Icon(Icons.lock_outline),
+        filled: true,
+        fillColor: colorScheme.surfaceContainerHighest.withValues(
+          alpha: Theme.of(context).brightness == Brightness.dark ? 0.55 : 0.9,
+        ),
+        border: OutlineInputBorder(borderRadius: BorderRadius.circular(18)),
+        suffixIcon: IconButton(
+          tooltip: obscureText ? 'Show password' : 'Hide password',
+          onPressed: enabled ? onToggleVisibility : null,
+          icon: Icon(
+            obscureText
+                ? Icons.visibility_outlined
+                : Icons.visibility_off_outlined,
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/presentation/change_password/change_password_state.dart

@@ -0,0 +1,30 @@
+import 'package:flutter/foundation.dart';
+
+@immutable
+class ChangePasswordState {
+  const ChangePasswordState({
+    this.isLoading = false,
+    this.errorMessage,
+    this.successMessage,
+  });
+
+  final bool isLoading;
+  final String? errorMessage;
+  final String? successMessage;
+
+  ChangePasswordState copyWith({
+    bool? isLoading,
+    String? errorMessage,
+    String? successMessage,
+    bool clearError = false,
+    bool clearSuccess = false,
+  }) {
+    return ChangePasswordState(
+      isLoading: isLoading ?? this.isLoading,
+      errorMessage: clearError ? null : errorMessage ?? this.errorMessage,
+      successMessage: clearSuccess
+          ? null
+          : successMessage ?? this.successMessage,
+    );
+  }
+}

lib/presentation/change_password/change_password_view_model.dart

@@ -0,0 +1,60 @@
+import 'package:e_receipt_mobile/domain/repositories/auth_repository.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_state.dart';
+import 'package:e_receipt_mobile/presentation/login/login_view_model.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
+
+final changePasswordViewModelProvider =
+    StateNotifierProvider.autoDispose<
+      ChangePasswordViewModel,
+      ChangePasswordState
+    >((ref) {
+      return ChangePasswordViewModel(
+        ref.watch(authenticatedAuthRepositoryProvider),
+      );
+    });
+
+class ChangePasswordViewModel extends StateNotifier<ChangePasswordState> {
+  ChangePasswordViewModel(this._authRepository)
+    : super(const ChangePasswordState());
+
+  final AuthRepository _authRepository;
+
+  Future<void> changePassword({
+    required String oldPassword,
+    required String newPassword,
+    required String confirmPassword,
+  }) async {
+    if (oldPassword.isEmpty || newPassword.isEmpty || confirmPassword.isEmpty) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: 'All fields are required',
+        clearSuccess: true,
+      );
+      return;
+    }
+
+    state = state.copyWith(
+      isLoading: true,
+      clearError: true,
+      clearSuccess: true,
+    );
+
+    try {
+      final responseMessage = await _authRepository.changePassword(
+        oldPassword: oldPassword,
+        newPassword: newPassword,
+        confirmPassword: confirmPassword,
+      );
+      state = state.copyWith(isLoading: false, successMessage: responseMessage);
+    } catch (error) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: error.toString().replaceFirst('Exception: ', ''),
+      );
+    }
+  }
+
+  void clearMessages() {
+    state = state.copyWith(clearError: true, clearSuccess: true);
+  }
+}

lib/presentation/home/home_screen.dart

@@ -1,6 +1,7 @@
 import 'package:e_receipt_mobile/domain/entities/login_user.dart';
 import 'package:e_receipt_mobile/presentation/admin_reset_password/admin_reset_password_page.dart';
 import 'package:e_receipt_mobile/presentation/auth/logout_view_model.dart';
+import 'package:e_receipt_mobile/presentation/change_password/change_password_page.dart';
 import 'package:e_receipt_mobile/presentation/home/home_pagination_providers.dart';
 import 'package:e_receipt_mobile/presentation/home/merchant_paging_view_model.dart';
 import 'package:e_receipt_mobile/presentation/home/widgets/home_drawer.dart';
@@ -38,6 +39,22 @@ class HomeScreen extends ConsumerWidget {
       ),
       drawer: HomeDrawer(
         user: user,
+        onChangePassword: () async {
+          Navigator.of(context).pop();
+          final successMessage = await Navigator.of(context).push<String>(
+            MaterialPageRoute<String>(
+              builder: (_) => const ChangePasswordPage(),
+            ),
+          );
+          if (successMessage != null && context.mounted) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(successMessage),
+                behavior: SnackBarBehavior.floating,
+              ),
+            );
+          }
+        },
         onResetCashierPassword: user.isAdmin
             ? () {
                 Navigator.of(context).pop();

lib/presentation/home/widgets/home_drawer.dart

@@ -6,12 +6,14 @@ class HomeDrawer extends StatelessWidget {
   const HomeDrawer({
     required this.user,
     required this.onLogout,
+    this.onChangePassword,
     this.onResetCashierPassword,
     super.key,
   });
 
   final LoginUser user;
   final VoidCallback onLogout;
+  final VoidCallback? onChangePassword;
   final VoidCallback? onResetCashierPassword;
 
   @override
@@ -23,9 +25,17 @@ class HomeDrawer extends StatelessWidget {
         child: Column(
           children: [
             _DrawerHeader(user: user),
+            Padding(
+              padding: const EdgeInsets.fromLTRB(8, 12, 8, 0),
+              child: _DrawerItem(
+                icon: Icons.password_outlined,
+                label: 'Change password',
+                onTap: onChangePassword ?? () {},
+              ),
+            ),
             if (user.isAdmin)
               Padding(
-                padding: const EdgeInsets.fromLTRB(8, 12, 8, 0),
+                padding: const EdgeInsets.fromLTRB(8, 4, 8, 0),
                 child: _DrawerItem(
                   icon: Icons.lock_reset_outlined,
                   label: 'Reset cashier password',

lib/presentation/login/login_page.dart

@@ -31,7 +31,9 @@ class LoginPage extends ConsumerWidget {
     }
 
     TextInput.finishAutofillContext();
-    ref.read(loginViewModelProvider.notifier).login(
+    ref
+        .read(loginViewModelProvider.notifier)
+        .login(
           username: usernameController.text,
           password: passwordController.text,
         );
@@ -51,6 +53,7 @@ class LoginPage extends ConsumerWidget {
       switch (action) {
         case LoginRequiredAction.passwordUpdateRequired:
           final userId = (next.requiredUserId ?? '').trim();
+          final oldPassword = next.requiredOldPassword ?? '';
           if (userId.isEmpty) {
             ScaffoldMessenger.of(context).showSnackBar(
               const SnackBar(
@@ -61,6 +64,18 @@ class LoginPage extends ConsumerWidget {
             ref.read(loginViewModelProvider.notifier).clearRequirement();
             return;
           }
+          if (oldPassword.isEmpty) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              const SnackBar(
+                content: Text(
+                  'Password update required (missing login password)',
+                ),
+                behavior: SnackBarBehavior.floating,
+              ),
+            );
+            ref.read(loginViewModelProvider.notifier).clearRequirement();
+            return;
+          }
 
           ScaffoldMessenger.of(context).showSnackBar(
             const SnackBar(
@@ -70,7 +85,10 @@ class LoginPage extends ConsumerWidget {
           );
           ref.read(loginViewModelProvider.notifier).clearRequirement();
           Navigator.of(context).push(
-            MaterialPageRoute<void>(builder: (_) => ResetPasswordPage(userId: userId)),
+            MaterialPageRoute<void>(
+              builder: (_) =>
+                  ResetPasswordPage(userId: userId, oldPassword: oldPassword),
+            ),
           );
       }
     });
@@ -199,11 +217,11 @@ class LoginPage extends ConsumerWidget {
                                   filled: true,
                                   fillColor: colorScheme.surfaceContainerHighest
                                       .withOpacity(
-                                    Theme.of(context).brightness ==
+                                        Theme.of(context).brightness ==
-                                            Brightness.dark
+                                                Brightness.dark
-                                        ? 0.55
+                                            ? 0.55
-                                        : 0.9,
+                                            : 0.9,
-                                  ),
+                                      ),
                                   border: OutlineInputBorder(
                                     borderRadius: BorderRadius.circular(18),
                                   ),
@@ -240,11 +258,11 @@ class LoginPage extends ConsumerWidget {
                                   filled: true,
                                   fillColor: colorScheme.surfaceContainerHighest
                                       .withOpacity(
-                                    Theme.of(context).brightness ==
+                                        Theme.of(context).brightness ==
-                                            Brightness.dark
+                                                Brightness.dark
-                                        ? 0.55
+                                            ? 0.55
-                                        : 0.9,
+                                            : 0.9,
-                                  ),
+                                      ),
                                   border: OutlineInputBorder(
                                     borderRadius: BorderRadius.circular(18),
                                   ),
@@ -254,13 +272,14 @@ class LoginPage extends ConsumerWidget {
                                         : 'Hide password',
                                     onPressed: state.isLoading
                                         ? null
-                                        : () => ref
+                                        : () =>
-                                                .read(
+                                              ref
-                                                  loginObscurePasswordProvider
+                                                      .read(
-                                                      .notifier,
+                                                        loginObscurePasswordProvider
-                                                )
+                                                            .notifier,
-                                                .state =
+                                                      )
-                                            !obscurePassword,
+                                                      .state =
+                                                  !obscurePassword,
                                     icon: Icon(
                                       obscurePassword
                                           ? Icons.visibility_outlined

lib/presentation/login/login_state.dart

@@ -12,6 +12,7 @@ class LoginState {
     this.user,
     this.requiredAction,
     this.requiredUserId,
+    this.requiredOldPassword,
   });
 
   final bool isLoading;
@@ -20,6 +21,7 @@ class LoginState {
   final LoginUser? user;
   final LoginRequiredAction? requiredAction;
   final String? requiredUserId;
+  final String? requiredOldPassword;
 
   LoginState copyWith({
     bool? isLoading,
@@ -28,6 +30,7 @@ class LoginState {
     LoginUser? user,
     LoginRequiredAction? requiredAction,
     String? requiredUserId,
+    String? requiredOldPassword,
     bool clearError = false,
     bool clearSuccess = false,
     bool clearUser = false,
@@ -40,13 +43,20 @@ class LoginState {
           ? null
           : successMessage ?? this.successMessage,
       user: clearUser ? null : user ?? this.user,
-      requiredAction: clearRequired ? null : requiredAction ?? this.requiredAction,
+      requiredAction: clearRequired
-      requiredUserId: clearRequired ? null : requiredUserId ?? this.requiredUserId,
+          ? null
+          : requiredAction ?? this.requiredAction,
+      requiredUserId: clearRequired
+          ? null
+          : requiredUserId ?? this.requiredUserId,
+      requiredOldPassword: clearRequired
+          ? null
+          : requiredOldPassword ?? this.requiredOldPassword,
     );
   }
 
   @override
   String toString() {
-    return 'LoginState(isLoading: $isLoading, errorMessage: $errorMessage, successMessage: $successMessage, user: $user, requiredAction: $requiredAction, requiredUserId: $requiredUserId)';
+    return 'LoginState(isLoading: $isLoading, errorMessage: $errorMessage, successMessage: $successMessage, user: $user, requiredAction: $requiredAction, requiredUserId: $requiredUserId, requiredOldPassword: $requiredOldPassword)';
   }
 }

lib/presentation/login/login_view_model.dart

@@ -129,6 +129,7 @@ class LoginViewModel extends StateNotifier<LoginState> {
         isLoading: false,
         requiredAction: LoginRequiredAction.passwordUpdateRequired,
         requiredUserId: error.userId,
+        requiredOldPassword: password,
         clearError: true,
         clearSuccess: true,
       );

lib/presentation/reset_password/reset_password_page.dart

@@ -6,9 +6,14 @@ import 'package:flutter/services.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 class ResetPasswordPage extends ConsumerWidget {
-  const ResetPasswordPage({required this.userId, super.key});
+  const ResetPasswordPage({
+    required this.userId,
+    required this.oldPassword,
+    super.key,
+  });
 
   final String userId;
+  final String oldPassword;
 
   bool _isStrongPassword(String value) {
     return value.length >= 8 &&
@@ -52,7 +57,11 @@ class ResetPasswordPage extends ConsumerWidget {
 
     ref
         .read(resetPasswordViewModelProvider.notifier)
-        .resetPassword(userId: userId, password: password);
+        .resetPassword(
+          userId: userId,
+          password: password,
+          oldPassword: oldPassword,
+        );
   }
 
   @override
@@ -64,19 +73,13 @@ class ResetPasswordPage extends ConsumerWidget {
       final message = next.errorMessage;
       if (message != null && message != previous?.errorMessage) {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
+          SnackBar(content: Text(message), behavior: SnackBarBehavior.floating),
-            content: Text(message),
-            behavior: SnackBarBehavior.floating,
-          ),
         );
       }
       final success = next.successMessage;
       if (success != null && success != previous?.successMessage) {
         ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
+          SnackBar(content: Text(success), behavior: SnackBarBehavior.floating),
-            content: Text(success),
-            behavior: SnackBarBehavior.floating,
-          ),
         );
         Navigator.of(context).pop();
       }
@@ -101,14 +104,18 @@ class ResetPasswordPage extends ConsumerWidget {
           child: SafeArea(
             child: Center(
               child: SingleChildScrollView(
-                padding:
+                padding: const EdgeInsets.symmetric(
-                    const EdgeInsets.symmetric(horizontal: 20, vertical: 24),
+                  horizontal: 20,
+                  vertical: 24,
+                ),
                 child: ConstrainedBox(
                   constraints: const BoxConstraints(maxWidth: 440),
                   child: Card(
                     elevation: 0,
                     color: colorScheme.surface.withOpacity(
-                      Theme.of(context).brightness == Brightness.dark ? 0.75 : 0.92,
+                      Theme.of(context).brightness == Brightness.dark
+                          ? 0.75
+                          : 0.92,
                     ),
                     shape: RoundedRectangleBorder(
                       borderRadius: BorderRadius.circular(28),
@@ -159,7 +166,9 @@ class ResetPasswordPage extends ConsumerWidget {
                                         style: Theme.of(context)
                                             .textTheme
                                             .titleLarge
-                                            ?.copyWith(fontWeight: FontWeight.w800),
+                                            ?.copyWith(
+                                              fontWeight: FontWeight.w800,
+                                            ),
                                       ),
                                       Text(
                                         'Your account requires a password change.',
@@ -167,7 +176,8 @@ class ResetPasswordPage extends ConsumerWidget {
                                             .textTheme
                                             .bodyMedium
                                             ?.copyWith(
-                                              color: colorScheme.onSurfaceVariant,
+                                              color:
+                                                  colorScheme.onSurfaceVariant,
                                             ),
                                       ),
                                     ],
@@ -182,8 +192,9 @@ class ResetPasswordPage extends ConsumerWidget {
                               enabled: !state.isLoading,
                               textInputAction: TextInputAction.next,
                               obscureText: obscure,
-                              onFieldSubmitted: (_) =>
+                              onFieldSubmitted: (_) => FocusScope.of(
-                                  FocusScope.of(context).requestFocus(confirmFocusNode),
+                                context,
+                              ).requestFocus(confirmFocusNode),
                               validator: (value) {
                                 final text = (value ?? '').trim();
                                 if (text.isEmpty) {
@@ -201,24 +212,28 @@ class ResetPasswordPage extends ConsumerWidget {
                                 filled: true,
                                 fillColor: colorScheme.surfaceContainerHighest
                                     .withOpacity(
-                                  Theme.of(context).brightness == Brightness.dark
+                                      Theme.of(context).brightness ==
-                                      ? 0.55
+                                              Brightness.dark
-                                      : 0.9,
+                                          ? 0.55
-                                ),
+                                          : 0.9,
+                                    ),
                                 border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(18),
                                 ),
                                 suffixIcon: IconButton(
-                                  tooltip:
+                                  tooltip: obscure
-                                      obscure ? 'Show password' : 'Hide password',
+                                      ? 'Show password'
+                                      : 'Hide password',
                                   onPressed: state.isLoading
                                       ? null
-                                      : () => ref
+                                      : () =>
-                                              .read(
+                                            ref
-                                                resetObscurePasswordProvider.notifier,
+                                                    .read(
-                                              )
+                                                      resetObscurePasswordProvider
-                                              .state =
+                                                          .notifier,
-                                          !obscure,
+                                                    )
+                                                    .state =
+                                                !obscure,
                                   icon: Icon(
                                     obscure
                                         ? Icons.visibility_outlined
@@ -255,10 +270,11 @@ class ResetPasswordPage extends ConsumerWidget {
                                 filled: true,
                                 fillColor: colorScheme.surfaceContainerHighest
                                     .withOpacity(
-                                  Theme.of(context).brightness == Brightness.dark
+                                      Theme.of(context).brightness ==
-                                      ? 0.55
+                                              Brightness.dark
-                                      : 0.9,
+                                          ? 0.55
-                                ),
+                                          : 0.9,
+                                    ),
                                 border: OutlineInputBorder(
                                   borderRadius: BorderRadius.circular(18),
                                 ),
@@ -268,13 +284,14 @@ class ResetPasswordPage extends ConsumerWidget {
                                       : 'Hide password',
                                   onPressed: state.isLoading
                                       ? null
-                                      : () => ref
+                                      : () =>
-                                              .read(
+                                            ref
-                                                resetObscureConfirmPasswordProvider
+                                                    .read(
-                                                    .notifier,
+                                                      resetObscureConfirmPasswordProvider
-                                              )
+                                                          .notifier,
-                                              .state =
+                                                    )
-                                          !obscureConfirm,
+                                                    .state =
+                                                !obscureConfirm,
                                   icon: Icon(
                                     obscureConfirm
                                         ? Icons.visibility_outlined
@@ -288,25 +305,33 @@ class ResetPasswordPage extends ConsumerWidget {
                               onPressed: state.isLoading
                                   ? null
                                   : () => _submit(
-                                        context: context,
+                                      context: context,
-                                        ref: ref,
+                                      ref: ref,
-                                        formKey: formKey,
+                                      formKey: formKey,
-                                        passwordController: passwordController,
+                                      passwordController: passwordController,
-                                        confirmController: confirmController,
+                                      confirmController: confirmController,
-                                        isLoading: state.isLoading,
+                                      isLoading: state.isLoading,
-                                      ),
+                                    ),
                               icon: state.isLoading
                                   ? const SizedBox(
                                       height: 18,
                                       width: 18,
-                                      child: CircularProgressIndicator(strokeWidth: 2),
+                                      child: CircularProgressIndicator(
+                                        strokeWidth: 2,
+                                      ),
                                     )
                                   : const Icon(Icons.check),
                               label: Padding(
-                                padding: const EdgeInsets.symmetric(vertical: 12),
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 12,
+                                ),
                                 child: Text(
-                                  state.isLoading ? 'Updating...' : 'Reset password',
+                                  state.isLoading
-                                  style: const TextStyle(fontWeight: FontWeight.w600),
+                                      ? 'Updating...'
+                                      : 'Reset password',
+                                  style: const TextStyle(
+                                    fontWeight: FontWeight.w600,
+                                  ),
                                 ),
                               ),
                             ),
@@ -314,7 +339,8 @@ class ResetPasswordPage extends ConsumerWidget {
                             Text(
                               'Tip: use a unique password you don’t use elsewhere.',
                               textAlign: TextAlign.center,
-                              style: Theme.of(context).textTheme.bodySmall?.copyWith(
+                              style: Theme.of(context).textTheme.bodySmall
+                                  ?.copyWith(
                                     color: colorScheme.onSurfaceVariant,
                                   ),
                             ),

lib/presentation/reset_password/reset_password_view_model.dart

@@ -4,20 +4,23 @@ import 'package:e_receipt_mobile/presentation/reset_password/reset_password_stat
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 
 final resetPasswordViewModelProvider =
-    StateNotifierProvider.autoDispose<ResetPasswordViewModel, ResetPasswordState>(
+    StateNotifierProvider.autoDispose<
-  (ref) {
+      ResetPasswordViewModel,
-    return ResetPasswordViewModel(ref.watch(authRepositoryProvider));
+      ResetPasswordState
-  },
+    >((ref) {
-);
+      return ResetPasswordViewModel(ref.watch(authRepositoryProvider));
+    });
 
 class ResetPasswordViewModel extends StateNotifier<ResetPasswordState> {
-  ResetPasswordViewModel(this._authRepository) : super(const ResetPasswordState());
+  ResetPasswordViewModel(this._authRepository)
+    : super(const ResetPasswordState());
 
   final AuthRepository _authRepository;
 
   Future<void> resetPassword({
     required String userId,
     required String password,
+    required String oldPassword,
   }) async {
     if (userId.trim().isEmpty) {
       state = state.copyWith(
@@ -27,6 +30,14 @@ class ResetPasswordViewModel extends StateNotifier<ResetPasswordState> {
       );
       return;
     }
+    if (oldPassword.isEmpty) {
+      state = state.copyWith(
+        isLoading: false,
+        errorMessage: 'Missing original login password',
+        clearSuccess: true,
+      );
+      return;
+    }
 
     state = state.copyWith(
       isLoading: true,
@@ -35,7 +46,11 @@ class ResetPasswordViewModel extends StateNotifier<ResetPasswordState> {
     );
 
     try {
-      await _authRepository.resetPassword(userId: userId.trim(), password: password);
+      await _authRepository.resetPassword(
+        userId: userId.trim(),
+        password: password,
+        oldPassword: oldPassword,
+      );
       state = state.copyWith(
         isLoading: false,
         successMessage: 'Password updated',