Kyaw_Min_Khant/e_receipt_mobile
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Kyaw_Min_Khant:4a4c785304774e1e375f5d466ebca1f531ed9d8c
Branches Tags
Kyaw_Min_Khant:main
Kyaw_Min_Khant:dev
..
compare: Kyaw_Min_Khant:b3494d71dd75e9481cc1dff39b0f07032cab99b1
Branches Tags
Kyaw_Min_Khant:dev
Kyaw_Min_Khant:main

No commits in common. "4a4c785304774e1e375f5d466ebca1f531ed9d8c" and "b3494d71dd75e9481cc1dff39b0f07032cab99b1" have entirely different histories.
4a4c785304 ... b3494d71dd

15 changed files with 839 additions and 1551 deletions
Show Stats Expand all files Collapse all files

36
lib/data/repositories/api_auth_repository.dart
View File

@ -89,14 +89,9 @@ class ApiAuthRepository implements AuthRepository {
Future<void> resetPassword({ Future<void> resetPassword({
required String userId, required String userId,
required String password, required String password,
required String oldPassword,
}) async { }) async {
final uri = Uri.parse('$baseUrl/auth/reset-password'); final uri = Uri.parse('$baseUrl/auth/reset-password');
final requestBody = jsonEncode({ final requestBody = jsonEncode({'userId': userId, 'password': password});
'userId': userId,
'password': password,
'password2': oldPassword,
});
final response = await _client.put( final response = await _client.put(
uri, uri,
@ -134,35 +129,6 @@ class ApiAuthRepository implements AuthRepository {
throw Exception(_extractErrorMessage(response.body)); 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 @override
Future<void> logout({required String refreshToken}) async { Future<void> logout({required String refreshToken}) async {
final uri = Uri.parse('$baseUrl/auth/logout'); final uri = Uri.parse('$baseUrl/auth/logout');

22
lib/data/repositories/mock_auth_repository.dart
View File

@ -49,16 +49,12 @@ class MockAuthRepository implements AuthRepository {
Future<void> resetPassword({ Future<void> resetPassword({
required String userId, required String userId,
required String password, required String password,
required String oldPassword,
}) async { }) async {
await Future<void>.delayed(const Duration(milliseconds: 500)); await Future<void>.delayed(const Duration(milliseconds: 500));
if (userId.trim().isEmpty) { if (userId.trim().isEmpty) {
throw Exception('User ID is required.'); throw Exception('User ID is required.');
} }
if (oldPassword.isEmpty) {
throw Exception('Old password is required.');
}
if (password.length < 8) { if (password.length < 8) {
throw Exception('Password must be at least 8 characters.'); throw Exception('Password must be at least 8 characters.');
} }
@ -75,24 +71,6 @@ class MockAuthRepository implements AuthRepository {
return 'Password reset successfully'; 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 @override
Future<void> logout({required String refreshToken}) async { Future<void> logout({required String refreshToken}) async {
await Future<void>.delayed(const Duration(milliseconds: 250)); await Future<void>.delayed(const Duration(milliseconds: 250));

7
lib/domain/repositories/auth_repository.dart
View File

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

68
lib/presentation/change_password/change_password_form_providers.dart
View File

@ -1,68 +0,0 @@
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,
);

372
lib/presentation/change_password/change_password_page.dart
View File

@ -1,372 +0,0 @@
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,
),
),
),
);
}
}

30
lib/presentation/change_password/change_password_state.dart
View File

@ -1,30 +0,0 @@
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,
);
}
}

60
lib/presentation/change_password/change_password_view_model.dart
View File

@ -1,60 +0,0 @@
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);
}
}

17
lib/presentation/home/home_screen.dart
View File

@ -1,7 +1,6 @@
import 'package:e_receipt_mobile/domain/entities/login_user.dart'; 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/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/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/home_pagination_providers.dart';
import 'package:e_receipt_mobile/presentation/home/merchant_paging_view_model.dart'; import 'package:e_receipt_mobile/presentation/home/merchant_paging_view_model.dart';
import 'package:e_receipt_mobile/presentation/home/widgets/home_drawer.dart'; import 'package:e_receipt_mobile/presentation/home/widgets/home_drawer.dart';
@ -39,22 +38,6 @@ class HomeScreen extends ConsumerWidget {
), ),
drawer: HomeDrawer( drawer: HomeDrawer(
user: user, 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 onResetCashierPassword: user.isAdmin
? () { ? () {
Navigator.of(context).pop(); Navigator.of(context).pop();

12
lib/presentation/home/widgets/home_drawer.dart
View File

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

57
lib/presentation/login/login_page.dart
View File

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

16
lib/presentation/login/login_state.dart
View File

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

1
lib/presentation/login/login_view_model.dart
View File

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

130
lib/presentation/reset_password/reset_password_page.dart
View File

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

29
lib/presentation/reset_password/reset_password_view_model.dart
View File

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

49
lib/presentation/terminal/terminal_next_screen.dart
View File

@ -1,7 +1,6 @@
import 'package:e_receipt_mobile/domain/entities/terminal.dart'; import 'package:e_receipt_mobile/domain/entities/terminal.dart';
import 'package:e_receipt_mobile/presentation/auth/logout_view_model.dart'; import 'package:e_receipt_mobile/presentation/auth/logout_view_model.dart';
import 'package:e_receipt_mobile/presentation/auth/session_controller.dart'; import 'package:e_receipt_mobile/presentation/auth/session_controller.dart';
import 'package:e_receipt_mobile/presentation/change_password/change_password_page.dart';
import 'package:e_receipt_mobile/presentation/terminal/transaction_paging_state.dart'; import 'package:e_receipt_mobile/presentation/terminal/transaction_paging_state.dart';
import 'package:e_receipt_mobile/presentation/terminal/transaction_paging_view_model.dart'; import 'package:e_receipt_mobile/presentation/terminal/transaction_paging_view_model.dart';
import 'package:e_receipt_mobile/presentation/terminal/transaction_receipt_screen.dart'; import 'package:e_receipt_mobile/presentation/terminal/transaction_receipt_screen.dart';
@ -56,9 +55,9 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
onPressed: logoutState.isLoading onPressed: logoutState.isLoading
? null ? null
: () => _showCashierMenu( : () => _showCashierMenu(
context, context,
username: (user?.username ?? '').trim(), username: (user?.username ?? '').trim(),
), ),
), ),
], ],
), ),
@ -184,8 +183,8 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
child: Text( child: Text(
'Transactions (4M)', 'Transactions (4M)',
style: Theme.of(context).textTheme.titleMedium?.copyWith( style: Theme.of(context).textTheme.titleMedium?.copyWith(
fontWeight: FontWeight.w800, fontWeight: FontWeight.w800,
), ),
), ),
), ),
), ),
@ -267,19 +266,10 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
subtitle: const Text('Cashier'), subtitle: const Text('Cashier'),
), ),
const Divider(height: 1), const Divider(height: 1),
ListTile(
leading: const Icon(Icons.password_outlined),
title: const Text('Change password'),
onTap: () => Navigator.of(
context,
).pop(_CashierMenuAction.changePassword),
),
const Divider(height: 1),
ListTile( ListTile(
leading: const Icon(Icons.logout, color: Colors.redAccent), leading: const Icon(Icons.logout, color: Colors.redAccent),
title: const Text('Logout'), title: const Text('Logout'),
onTap: () => onTap: () => Navigator.of(context).pop(_CashierMenuAction.logout),
Navigator.of(context).pop(_CashierMenuAction.logout),
), ),
], ],
), ),
@ -292,25 +282,12 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
} }
switch (action) { switch (action) {
case _CashierMenuAction.changePassword:
final successMessage = await Navigator.of(this.context).push<String>(
MaterialPageRoute<String>(builder: (_) => const ChangePasswordPage()),
);
if (successMessage != null && mounted) {
ScaffoldMessenger.of(this.context).showSnackBar(
SnackBar(
content: Text(successMessage),
behavior: SnackBarBehavior.floating,
),
);
}
break;
case _CashierMenuAction.logout: case _CashierMenuAction.logout:
await _logout(); await _logout(context);
} }
} }
Future<void> _logout() async { Future<void> _logout(BuildContext context) async {
final shouldLogout = await showDialog<bool>( final shouldLogout = await showDialog<bool>(
context: context, context: context,
builder: (context) { builder: (context) {
@ -331,7 +308,7 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
}, },
); );
if (shouldLogout != true || !mounted) { if (shouldLogout != true || !context.mounted) {
return; return;
} }
@ -462,7 +439,8 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
_first(raw, const ['DE4']) ?? item.amount?.toString() ?? '-'; _first(raw, const ['DE4']) ?? item.amount?.toString() ?? '-';
final currency = _first(raw, const ['DE49']) ?? 'MMK'; final currency = _first(raw, const ['DE49']) ?? 'MMK';
final status = _statusLabel( final status = _statusLabel(
_first(raw, const ['DE39']) ?? item.status, _first(raw, const ['DE39']) ??
item.status,
); );
final type = _first(raw, const ['DE3']) ?? item.type ?? '-'; final type = _first(raw, const ['DE3']) ?? item.type ?? '-';
final rrn = _first(raw, const ['DE37']) ?? item.rrn ?? '-'; final rrn = _first(raw, const ['DE37']) ?? item.rrn ?? '-';
@ -631,10 +609,11 @@ class _TerminalNextScreenState extends ConsumerState<TerminalNextScreen> {
if (normalized == 'A') { if (normalized == 'A') {
return 'SUCCESS'; return 'SUCCESS';
} }
if (normalized == 'E') { if (normalized == 'E' ) {
return 'FAILED'; return 'FAILED';
} }
return 'SUCCESS'; return 'SUCCESS';
} }
String? _sanitizeMultiline(String? value) { String? _sanitizeMultiline(String? value) {
@ -774,4 +753,4 @@ class _StatusChip extends StatelessWidget {
} }
} }
enum _CashierMenuAction { changePassword, logout } enum _CashierMenuAction { logout }