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.

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(auth, web): currentUser is now populated right at the start of the application without needing to wait for authStateChange` #10028

Merged
merged 7 commits into from
Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ class FirebaseAuthWeb extends FirebaseAuthPlatform {

/// Called by PluginRegistry to register this plugin for Flutter Web
static void registerWith(Registrar registrar) {
FirebaseCoreWeb.registerService('auth');
FirebaseCoreWeb.registerService('auth', () async {
await FirebaseAuthWeb.instance.delegate.onAuthStateChanged.first;
});
FirebaseAuthPlatform.instance = FirebaseAuthWeb.instance;
PhoneMultiFactorGeneratorPlatform.instance = PhoneMultiFactorGeneratorWeb();
RecaptchaVerifierFactoryPlatform.instance =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,44 @@ class FirebaseWebService {
/// property allows overriding of web naming to Flutterfire plugin naming.
String? override;

/// Function to call to ensure the Firebase Service is initalized.
/// Usually used to ensure that the Web SDK match the behavior
/// of native SDKs.
EnsurePluginInitialized ensurePluginInitialized;

/// Creates a new [FirebaseWebService].
FirebaseWebService._(this.name, [this.override]);
FirebaseWebService._(
this.name, {
this.override,
this.ensurePluginInitialized,
});
}

typedef EnsurePluginInitialized = Future<void> Function()?;

/// The entry point for accessing Firebase.
///
/// You can get an instance by calling [FirebaseCore.instance].
class FirebaseCoreWeb extends FirebasePlatform {
static Map<String, FirebaseWebService> _services = {
'core': FirebaseWebService._('app', 'core'),
'app-check': FirebaseWebService._('app-check', 'app_check'),
'remote-config': FirebaseWebService._('remote-config', 'remote_config'),
'core': FirebaseWebService._('app', override: 'core'),
'app-check': FirebaseWebService._('app-check', override: 'app_check'),
'remote-config':
FirebaseWebService._('remote-config', override: 'remote_config'),
};

/// Internally registers a Firebase Service to be initialized.
static void registerService(String service) {
_services.putIfAbsent(service, () => FirebaseWebService._(service));
static void registerService(
String service, [
EnsurePluginInitialized? ensurePluginInitialized,
]) {
_services.putIfAbsent(
service,
() => FirebaseWebService._(
service,
ensurePluginInitialized: ensurePluginInitialized,
),
);
}

/// Registers that [FirebaseCoreWeb] is the platform implementation.
Expand Down Expand Up @@ -251,6 +272,18 @@ class FirebaseCoreWeb extends FirebasePlatform {
}
}

await Future.wait(
_services.values.map((service) {
final ensureInitializedFunction = service.ensurePluginInitialized;

if (ensureInitializedFunction == null) {
return Future.value();
}

return ensureInitializedFunction();
}),
);

return _createFromJsApp(app!);
}

Expand Down
5 changes: 2 additions & 3 deletions packages/firebase_ui_auth/example/lib/main.dart
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
import 'package:firebase_auth/firebase_auth.dart'
hide PhoneAuthProvider, EmailAuthProvider;
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:firebase_ui_auth/firebase_ui_auth.dart';
import 'package:firebase_ui_localizations/firebase_ui_localizations.dart';
import 'package:firebase_ui_oauth_apple/firebase_ui_oauth_apple.dart';
import 'package:firebase_ui_oauth_facebook/firebase_ui_oauth_facebook.dart';
import 'package:firebase_ui_oauth_google/firebase_ui_oauth_google.dart';
import 'package:firebase_ui_oauth_twitter/firebase_ui_oauth_twitter.dart';
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';

import 'firebase_options.dart';

import 'config.dart';
import 'decorations.dart';
import 'firebase_options.dart';

final actionCodeSettings = ActionCodeSettings(
url: 'https://flutterfire-e2e-tests.firebaseapp.com',
Expand Down