adipu/blinds_flutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

password check before email change, blindMasterMainInput use for all text inputs

Browse Source
This commit is contained in:
pulipakaa24
2026-01-08 21:32:12 -06:00
parent 75c81e3127
commit 4e7e8661e5
8 changed files with 386 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/BlindMasterScreens/Startup/forgot_password_screen.dart
View File

@@ -1,6 +1,7 @@
import 'package:flutter/material.dart';
import 'dart:convert';
import '../../BlindMasterResources/secure_transmissions.dart';
import '../../BlindMasterResources/text_inputs.dart';
import 'verify_reset_code_screen.dart';
class ForgotPasswordScreen extends StatefulWidget {
@@ -139,13 +140,10 @@ class _ForgotPasswordScreenState extends State<ForgotPasswordScreen> {
textAlign: TextAlign.center,
),
const SizedBox(height: 32),
TextFormField(
BlindMasterInput(
'Email',
controller: _emailController,
decoration: const InputDecoration(
labelText: 'Email',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.email),
),
prefixIcon: Icons.email,
keyboardType: TextInputType.emailAddress,
validator: _emailValidator,
enabled: !_isLoading,

17
lib/BlindMasterScreens/Startup/verify_reset_code_screen.dart
View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'dart:convert';
import '../../BlindMasterResources/secure_transmissions.dart';
import '../../BlindMasterResources/text_inputs.dart';
import 'reset_password_form_screen.dart';
class VerifyResetCodeScreen extends StatefulWidget {
@@ -220,14 +221,11 @@ class _VerifyResetCodeScreenState extends State<VerifyResetCodeScreen> {
textAlign: TextAlign.center,
),
const SizedBox(height: 32),
TextFormField(
BlindMasterInput(
'Reset Code',
controller: _codeController,
decoration: const InputDecoration(
labelText: 'Reset Code',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.security),
hintText: 'ABC123',
),
prefixIcon: Icons.security,
hintText: 'ABC123',
keyboardType: TextInputType.text,
textCapitalization: TextCapitalization.characters,
inputFormatters: [
@@ -237,11 +235,6 @@ class _VerifyResetCodeScreenState extends State<VerifyResetCodeScreen> {
validator: _codeValidator,
enabled: !_isLoading && !_isResending,
textAlign: TextAlign.center,
style: const TextStyle(
fontSize: 24,
letterSpacing: 8,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 24),
ElevatedButton(

141
lib/BlindMasterScreens/accountManagement/account_screen.dart
View File

@@ -2,7 +2,7 @@ import 'dart:convert';
import 'package:blind_master/BlindMasterResources/error_snackbar.dart';
import 'package:blind_master/BlindMasterResources/secure_transmissions.dart';
import 'package:blind_master/BlindMasterScreens/accountManagement/change_password_screen.dart';
import 'package:blind_master/BlindMasterScreens/accountManagement/verify_email_change_screen.dart';
import 'package:blind_master/BlindMasterScreens/accountManagement/change_email_screen.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
@@ -157,130 +157,27 @@ class _AccountScreenState extends State<AccountScreen> {
}
Future<void> _handleChangeEmail() async {
final TextEditingController emailController = TextEditingController();
final formKey = GlobalKey<FormState>();
final primaryColor = Theme.of(context).primaryColorLight;
if (email == null || email == 'N/A') {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(
backgroundColor: Colors.red[700],
content: Text('Unable to load current email'),
),
);
return;
}
final result = await showDialog<bool>(
context: context,
builder: (BuildContext dialogContext) {
return AlertDialog(
title: Text('Change Email'),
content: Form(
key: formKey,
child: TextFormField(
controller: emailController,
decoration: InputDecoration(
labelText: 'New Email Address',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.email),
),
keyboardType: TextInputType.emailAddress,
validator: (value) {
if (value == null || value.isEmpty) {
return 'Please enter an email address';
}
final emailRegex = RegExp(r'^[^\s@]+@[^\s@]+\.[^\s@]+$');
if (!emailRegex.hasMatch(value)) {
return 'Please enter a valid email';
}
if (value == email) {
return 'This is your current email';
}
return null;
},
),
),
actions: [
TextButton(
onPressed: () => Navigator.of(dialogContext).pop(false),
child: Text('Cancel'),
),
ElevatedButton(
style: ElevatedButton.styleFrom(
backgroundColor: primaryColor,
foregroundColor: Colors.white,
),
onPressed: () async {
if (formKey.currentState!.validate()) {
Navigator.of(dialogContext).pop(true);
}
},
child: Text('Send Verification'),
),
],
);
},
// Navigate to change email screen
final success = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => ChangeEmailScreen(currentEmail: email!),
),
);
// Allow dialog to fully close before disposing controller
await Future.delayed(Duration(milliseconds: 100));
if (result == true && mounted) {
final newEmail = emailController.text.trim();
try {
// Show loading indicator
showDialog(
context: context,
barrierDismissible: false,
builder: (BuildContext loadingContext) {
return Center(
child: CircularProgressIndicator(
color: primaryColor,
),
);
},
);
final localHour = DateTime.now().hour;
final response = await securePost(
{
'newEmail': newEmail,
'localHour': localHour,
},
'request-email-change',
);
// Remove loading indicator
if (mounted) Navigator.of(context).pop();
if (response == null) {
throw Exception('No response from server');
}
if (response.statusCode == 200) {
if (!mounted) return;
// Navigate to waiting screen
final success = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EmailChangeWaitingScreen(newEmail: newEmail),
),
);
// If email was changed successfully, refresh account info
if (success == true && mounted) {
await fetchAccountInfo();
}
} else {
final body = json.decode(response.body);
throw Exception(body['error'] ?? 'Failed to send verification email');
}
} catch (e) {
// Remove loading indicator if still showing
if (mounted && Navigator.of(context).canPop()) {
Navigator.of(context).pop();
}
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(errorSnackbar(e));
} finally {
emailController.dispose();
}
} else {
emailController.dispose();
// If email was changed successfully, refresh account info
if (success == true && mounted) {
await fetchAccountInfo();
}
}

258
lib/BlindMasterScreens/accountManagement/change_email_screen.dart Normal file
View File

@@ -0,0 +1,258 @@
import 'dart:convert';
import 'package:blind_master/BlindMasterResources/error_snackbar.dart';
import 'package:blind_master/BlindMasterResources/secure_transmissions.dart';
import 'package:blind_master/BlindMasterResources/text_inputs.dart';
import 'package:blind_master/BlindMasterScreens/accountManagement/verify_email_change_screen.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
class ChangeEmailScreen extends StatefulWidget {
final String currentEmail;
const ChangeEmailScreen({super.key, required this.currentEmail});
@override
State<ChangeEmailScreen> createState() => _ChangeEmailScreenState();
}
class _ChangeEmailScreenState extends State<ChangeEmailScreen> {
final passwordController = TextEditingController();
final newEmailController = TextEditingController();
final _formKey = GlobalKey<FormState>();
@override
void dispose() {
passwordController.dispose();
newEmailController.dispose();
super.dispose();
}
String? passwordValidator(String? input) {
if (input == null || input.isEmpty) {
return 'Password is required';
}
return null;
}
String? emailValidator(String? input) {
if (input == null || input.isEmpty) {
return 'Email address is required';
}
final emailRegex = RegExp(r'^[^\s@]+@[^\s@]+\.[^\s@]+$');
if (!emailRegex.hasMatch(input)) {
return 'Please enter a valid email';
}
if (input == widget.currentEmail) {
return 'This is your current email';
}
return null;
}
Future<void> handleChangeEmail() async {
if (!_formKey.currentState!.validate()) {
return;
}
try {
// Show loading indicator
showDialog(
context: context,
barrierDismissible: false,
builder: (BuildContext context) {
return Center(
child: CircularProgressIndicator(
color: Theme.of(context).primaryColorLight,
),
);
},
);
final localHour = DateTime.now().hour;
final payload = {
'password': passwordController.text,
'newEmail': newEmailController.text,
'localHour': localHour,
};
final response = await securePost(payload, 'request-email-change');
// Remove loading indicator
if (mounted) Navigator.of(context).pop();
if (response == null) {
throw Exception('No response from server');
}
if (response.statusCode == 200) {
if (!mounted) return;
// Navigate to waiting screen
final success = await Navigator.push(
context,
MaterialPageRoute(
builder: (context) => EmailChangeWaitingScreen(newEmail: newEmailController.text),
),
);
// If email was changed successfully, return true to refresh account info
if (success == true && mounted) {
Navigator.pop(context, true);
}
} else if (response.statusCode == 401) {
throw Exception('Password is incorrect');
} else if (response.statusCode == 409) {
throw Exception('Email already in use');
} else if (response.statusCode == 400) {
final body = json.decode(response.body);
throw Exception(body['error'] ?? 'Invalid request');
} else {
throw Exception('Failed to send verification email');
}
} catch (e) {
// Remove loading indicator if still showing
if (mounted && Navigator.of(context).canPop()) {
Navigator.of(context).pop();
}
if (!mounted) return;
ScaffoldMessenger.of(context).showSnackBar(errorSnackbar(e));
}
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
backgroundColor: Theme.of(context).primaryColorLight,
foregroundColor: Colors.white,
title: Text(
'Change Email',
style: GoogleFonts.aBeeZee(),
),
),
body: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.all(20.0),
child: Form(
key: _formKey,
autovalidateMode: AutovalidateMode.onUnfocus,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
SizedBox(height: 20),
// Current email display
Card(
elevation: 2,
color: Colors.blue[50],
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(Icons.info_outline, color: Colors.blue[700]),
SizedBox(width: 10),
Text(
'Current Email',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.blue[700],
),
),
],
),
SizedBox(height: 8),
Text(
widget.currentEmail,
style: TextStyle(
fontSize: 16,
color: Colors.grey[800],
),
),
],
),
),
),
SizedBox(height: 20),
// Warning card
Card(
elevation: 2,
color: Colors.orange[50],
child: Padding(
padding: const EdgeInsets.all(16.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Icon(Icons.warning_amber, color: Colors.orange[700]),
SizedBox(width: 10),
Text(
'Important',
style: TextStyle(
fontWeight: FontWeight.bold,
color: Colors.orange[700],
),
),
],
),
SizedBox(height: 8),
Text(
'After changing your email, ${widget.currentEmail} will no longer receive any communications from BlindMaster, including password reset codes.',
style: TextStyle(
fontSize: 14,
color: Colors.grey[800],
),
),
],
),
),
),
SizedBox(height: 30),
Text(
'Verify your identity and enter new email',
style: TextStyle(
fontSize: 16,
color: Colors.grey[700],
fontWeight: FontWeight.w500,
),
textAlign: TextAlign.center,
),
SizedBox(height: 30),
BlindMasterMainInput(
'Current Password',
controller: passwordController,
password: true,
validator: passwordValidator,
),
SizedBox(height: 20),
Divider(),
SizedBox(height: 20),
BlindMasterMainInput(
'New Email Address',
controller: newEmailController,
validator: emailValidator,
),
SizedBox(height: 30),
ElevatedButton(
onPressed: handleChangeEmail,
style: ElevatedButton.styleFrom(
backgroundColor: Theme.of(context).primaryColorLight,
foregroundColor: Colors.white,
padding: EdgeInsets.symmetric(vertical: 15),
),
child: Text(
'Send Verification Email',
style: TextStyle(fontSize: 16),
),
),
],
),
),
),
),
);
}
}

29
lib/BlindMasterScreens/addingDevices/device_setup.dart
View File

@@ -2,6 +2,7 @@ import 'dart:async';
import 'dart:convert';
import 'package:blind_master/BlindMasterResources/error_snackbar.dart';
import 'package:blind_master/BlindMasterResources/text_inputs.dart';
import 'package:blind_master/BlindMasterScreens/addingDevices/set_device_name.dart';
import 'package:flutter/material.dart';
import 'package:flutter_blue_plus/flutter_blue_plus.dart';
@@ -58,7 +59,6 @@ class _DeviceSetupState extends State<DeviceSetup> {
final passControl = TextEditingController();
final unameControl = TextEditingController();
bool _obscureWifiPassword = true;
@override void initState() {
super.initState();
@@ -203,9 +203,6 @@ class _DeviceSetupState extends State<DeviceSetup> {
bool ent = isEnterprise(network);
bool open = isOpen(network);
// Reset password visibility state for new dialog
_obscureWifiPassword = true;
Map<String, String> creds = await showDialog(
context: context,
builder: (dialogContext) {
@@ -225,9 +222,10 @@ class _DeviceSetupState extends State<DeviceSetup> {
Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
TextFormField(
BlindMasterInput(
'Enterprise Login',
controller: unameControl,
decoration: const InputDecoration(hintText: "Enter your enterprise login"),
hintText: "Enter your enterprise login",
textInputAction: TextInputAction.next,
onFieldSubmitted: (_) => FocusScope.of(context).nextFocus(),
validator: (value) => (value == null || value.isEmpty) ? "Empty username!" : null,
@@ -236,22 +234,11 @@ class _DeviceSetupState extends State<DeviceSetup> {
]
),
if (!open)
TextFormField(
BlindMasterInput(
'WiFi Password',
controller: passControl,
obscureText: _obscureWifiPassword,
decoration: InputDecoration(
hintText: "Enter password",
suffixIcon: IconButton(
icon: Icon(
_obscureWifiPassword ? Icons.visibility : Icons.visibility_off,
),
onPressed: () {
setState(() {
_obscureWifiPassword = !_obscureWifiPassword;
});
},
),
),
password: true,
hintText: "Enter password",
validator: (value) => (value == null || value.length < 8) ? "Not long enough!" : null,
textInputAction: TextInputAction.send,
onFieldSubmitted: (value) {

18
lib/BlindMasterScreens/groupControl/create_group_dialog.dart
View File

@@ -1,6 +1,7 @@
import 'dart:convert';
import 'package:blind_master/BlindMasterResources/secure_transmissions.dart';
import 'package:blind_master/BlindMasterResources/text_inputs.dart';
import 'package:flutter/material.dart';
import 'package:google_fonts/google_fonts.dart';
@@ -151,21 +152,10 @@ class _CreateGroupDialogState extends State<CreateGroupDialog> {
: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
TextField(
BlindMasterInput(
'Group Name',
controller: _nameController,
decoration: InputDecoration(
labelText: 'Group Name',
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(10),
),
focusedBorder: OutlineInputBorder(
borderRadius: BorderRadius.circular(10),
borderSide: BorderSide(
color: Theme.of(context).primaryColorDark,
width: 2,
),
),
),
focusedBorderColor: Theme.of(context).primaryColorDark,
onChanged: (_) {
if (errorMessage != null) {
setState(() {

7
lib/BlindMasterScreens/individualControl/device_screen.dart
View File

@@ -211,12 +211,9 @@ class _DeviceScreenState extends State<DeviceScreen> {
content: Column(
mainAxisSize: MainAxisSize.min, // Keep column compact
children: <Widget>[
TextFormField(
BlindMasterInput(
'Peripheral Name',
controller: _newPeripheralNameController,
decoration: const InputDecoration(
labelText: 'Peripheral Name',
border: OutlineInputBorder(),
),
),
const SizedBox(height: 20),
DropdownButtonFormField<int>(