Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix autofill not opening when tapping on email field in SupaEmailAuth #80

Merged
merged 3 commits into from
Apr 1, 2024
Merged

Fix autofill not opening when tapping on email field in SupaEmailAuth #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
33aa83d
Fix autofill not opening when tapping on email field in SupaEmailAuth
pohuing Mar 30, 2024
a4d9aac
Fix autofill not opening when tapping on phone number field in SupaPh…
pohuing Mar 31, 2024
aee0e78
Fix Formatter issue in EmailAuth
pohuing Mar 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
295 changes: 149 additions & 146 deletions lib/src/components/supa_email_auth.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,177 +133,180 @@ class _SupaEmailAuthState extends State<SupaEmailAuth> {
@override
Widget build(BuildContext context) {
final localization = widget.localization;
return Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextFormField(
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.email],
validator: (value) {
if (value == null ||
value.isEmpty ||
!EmailValidator.validate(_emailController.text)) {
return localization.validEmailError;
}
return null;
},
decoration: InputDecoration(
prefixIcon: const Icon(Icons.email),
label: Text(localization.enterEmail),
),
controller: _emailController,
),
if (!_forgotPassword) ...[
spacer(16),
return AutofillGroup(
child: Form(
key: _formKey,
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
TextFormField(
autofillHints: _isSigningIn
? [AutofillHints.password]
: [AutofillHints.newPassword],
keyboardType: TextInputType.emailAddress,
autofillHints: const [AutofillHints.email],
validator: (value) {
if (value == null || value.isEmpty || value.length < 6) {
return localization.passwordLengthError;
if (value == null ||
value.isEmpty ||
!EmailValidator.validate(_emailController.text)) {
return localization.validEmailError;
}
return null;
},
decoration: InputDecoration(
prefixIcon: const Icon(Icons.lock),
label: Text(localization.enterPassword),
prefixIcon: const Icon(Icons.email),
label: Text(localization.enterEmail),
),
obscureText: true,
controller: _passwordController,
controller: _emailController,
),
spacer(16),
if (widget.metadataFields != null && !_isSigningIn)
...widget.metadataFields!
.map((metadataField) => [
TextFormField(
controller: _metadataControllers[metadataField],
decoration: InputDecoration(
label: Text(metadataField.label),
prefixIcon: metadataField.prefixIcon,
if (!_forgotPassword) ...[
spacer(16),
TextFormField(
autofillHints: _isSigningIn
? [AutofillHints.password]
: [AutofillHints.newPassword],
validator: (value) {
if (value == null || value.isEmpty || value.length < 6) {
return localization.passwordLengthError;
}
return null;
},
decoration: InputDecoration(
prefixIcon: const Icon(Icons.lock),
label: Text(localization.enterPassword),
),
obscureText: true,
controller: _passwordController,
),
spacer(16),
if (widget.metadataFields != null && !_isSigningIn)
...widget.metadataFields!
.map((metadataField) => [
TextFormField(
controller: _metadataControllers[metadataField],
decoration: InputDecoration(
label: Text(metadataField.label),
prefixIcon: metadataField.prefixIcon,
),
validator: metadataField.validator,
),
validator: metadataField.validator,
spacer(16),
])
.expand((element) => element),
ElevatedButton(
child: (_isLoading)
? SizedBox(
height: 16,
width: 16,
child: CircularProgressIndicator(
color: Theme.of(context).colorScheme.onPrimary,
strokeWidth: 1.5,
),
spacer(16),
])
.expand((element) => element),
ElevatedButton(
child: (_isLoading)
? SizedBox(
height: 16,
width: 16,
child: CircularProgressIndicator(
color: Theme.of(context).colorScheme.onPrimary,
strokeWidth: 1.5,
),
)
: Text(
_isSigningIn ? localization.signIn : localization.signUp),
onPressed: () async {
if (!_formKey.currentState!.validate()) {
return;
}
setState(() {
_isLoading = true;
});
try {
if (_isSigningIn) {
final response = await supabase.auth.signInWithPassword(
email: _emailController.text.trim(),
password: _passwordController.text.trim(),
);
widget.onSignInComplete.call(response);
} else {
final response = await supabase.auth.signUp(
email: _emailController.text.trim(),
password: _passwordController.text.trim(),
emailRedirectTo: widget.redirectTo,
data: _resolveData(),
);
widget.onSignUpComplete.call(response);
}
} on AuthException catch (error) {
if (widget.onError == null && context.mounted) {
context.showErrorSnackBar(error.message);
} else {
widget.onError?.call(error);
}
} catch (error) {
if (widget.onError == null && context.mounted) {
context.showErrorSnackBar(
'${localization.unexpectedError}: $error');
} else {
widget.onError?.call(error);
)
: Text(_isSigningIn
? localization.signIn
: localization.signUp),
onPressed: () async {
if (!_formKey.currentState!.validate()) {
return;
}
}
if (mounted) {
setState(() {
_isLoading = false;
_isLoading = true;
});
}
},
),
spacer(16),
if (_isSigningIn) ...[
try {
if (_isSigningIn) {
final response = await supabase.auth.signInWithPassword(
email: _emailController.text.trim(),
password: _passwordController.text.trim(),
);
widget.onSignInComplete.call(response);
} else {
final response = await supabase.auth.signUp(
email: _emailController.text.trim(),
password: _passwordController.text.trim(),
emailRedirectTo: widget.redirectTo,
data: _resolveData(),
);
widget.onSignUpComplete.call(response);
}
} on AuthException catch (error) {
if (widget.onError == null && context.mounted) {
context.showErrorSnackBar(error.message);
} else {
widget.onError?.call(error);
}
} catch (error) {
if (widget.onError == null && context.mounted) {
context.showErrorSnackBar(
'${localization.unexpectedError}: $error');
} else {
widget.onError?.call(error);
}
}
if (mounted) {
setState(() {
_isLoading = false;
});
}
},
),
spacer(16),
if (_isSigningIn) ...[
TextButton(
onPressed: () {
setState(() {
_forgotPassword = true;
});
},
child: Text(localization.forgotPassword),
),
],
TextButton(
key: const ValueKey('toggleSignInButton'),
onPressed: () {
setState(() {
_forgotPassword = true;
_forgotPassword = false;
_isSigningIn = !_isSigningIn;
});
},
child: Text(localization.forgotPassword),
child: Text(_isSigningIn
? localization.dontHaveAccount
: localization.haveAccount),
),
],
TextButton(
key: const ValueKey('toggleSignInButton'),
onPressed: () {
setState(() {
_forgotPassword = false;
_isSigningIn = !_isSigningIn;
});
},
child: Text(_isSigningIn
? localization.dontHaveAccount
: localization.haveAccount),
),
],
if (_isSigningIn && _forgotPassword) ...[
spacer(16),
ElevatedButton(
onPressed: () async {
try {
if (!_formKey.currentState!.validate()) {
return;
if (_isSigningIn && _forgotPassword) ...[
spacer(16),
ElevatedButton(
onPressed: () async {
try {
if (!_formKey.currentState!.validate()) {
return;
}
setState(() {
_isLoading = true;
});

final email = _emailController.text.trim();
await supabase.auth.resetPasswordForEmail(email);
widget.onPasswordResetEmailSent?.call();
} on AuthException catch (error) {
widget.onError?.call(error);
} catch (error) {
widget.onError?.call(error);
}
},
child: Text(localization.sendPasswordReset),
),
spacer(16),
TextButton(
onPressed: () {
setState(() {
_isLoading = true;
_forgotPassword = false;
});

final email = _emailController.text.trim();
await supabase.auth.resetPasswordForEmail(email);
widget.onPasswordResetEmailSent?.call();
} on AuthException catch (error) {
widget.onError?.call(error);
} catch (error) {
widget.onError?.call(error);
}
},
child: Text(localization.sendPasswordReset),
),
},
child: Text(localization.backToSignIn),
),
],
spacer(16),
TextButton(
onPressed: () {
setState(() {
_forgotPassword = false;
});
},
child: Text(localization.backToSignIn),
),
],
spacer(16),
],
),
),
);
}
Expand Down
Loading
Loading