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

fix(firebase_ui_auth): Catch sms code validation #482

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix(firebase_ui_auth): Catch sms code validation #482

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
661c31e
FIX - Completer already close
wer-mathurin Mar 14, 2025
b066fa3
FIX - Display error under the pin widget
wer-mathurin Mar 14, 2025
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
26 changes: 23 additions & 3 deletions packages/firebase_ui_auth/lib/src/mfa.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import 'dart:async';

import 'package:firebase_auth/firebase_auth.dart' as fba;
import 'package:firebase_core/firebase_core.dart';
import 'package:firebase_ui_auth/firebase_ui_auth.dart';
import 'package:firebase_ui_auth/src/widgets/internal/universal_page_route.dart';
import 'package:flutter/scheduler.dart';
Expand All @@ -17,32 +18,36 @@ typedef SMSCodeInputScreenBuilder = Widget Function(
AuthAction action,
);

Future<fba.UserCredential> startMFAVerification({
Future<fba.UserCredential?> startMFAVerification({
required BuildContext context,
required fba.MultiFactorResolver resolver,
fba.FirebaseAuth? auth,
SMSCodeInputScreenBuilder? smsCodeInputScreenBuilder,
void Function(FirebaseException e)? onError,
}) async {
if (resolver.hints.first is fba.PhoneMultiFactorInfo) {
return startPhoneMFAVerification(
context: context,
resolver: resolver,
auth: auth,
onError: onError,
);
} else {
throw Exception('Unsupported MFA type');
}
}

Future<fba.UserCredential> startPhoneMFAVerification({
Future<fba.UserCredential?> startPhoneMFAVerification({
required BuildContext context,
required fba.MultiFactorResolver resolver,
fba.FirebaseAuth? auth,
SMSCodeInputScreenBuilder? smsCodeInputScreenBuilder,
void Function(FirebaseException e)? onError,
}) async {
final session = resolver.session;
final hint = resolver.hints.first;
final completer = Completer<fba.UserCredential>();
var completer = Completer<fba.UserCredential?>();

final navigator = Navigator.of(context);

final provider = PhoneAuthProvider();
Expand All @@ -56,10 +61,25 @@ Future<fba.UserCredential> startPhoneMFAVerification({

provider.authListener = flow;

completer.future.catchError((e) {
onError?.call(e as FirebaseException);
flow.onError(e);
return null;
});

final flowKey = Object();

final actions = [
AuthStateChangeAction<CredentialReceived>((context, inner) {
if (completer.isCompleted) {
completer = Completer<fba.UserCredential>();
completer.future.catchError((e) {
onError?.call(e as FirebaseException);
flow.onError(e);
return null;
});
}

final cred = inner.credential as fba.PhoneAuthCredential;
final assertion = fba.PhoneMultiFactorGenerator.getAssertion(cred);
try {
Expand Down
Loading