Merge branch 'firebase:main' into fix-avoid-redundant-confirmation-on-account-deletion

Author: EArminjon

.github/workflows/e2e.yml

@@ -32,7 +32,7 @@ jobs:
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
         name: Install Node.js
         with:
-          node-version: "18"
+          node-version: "22"
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
         with:
           distribution: "temurin"
@@ -45,7 +45,7 @@ jobs:
       - name: Gradle cache
         uses: gradle/actions/setup-gradle@v3
       - name: AVD cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         id: avd-cache
         with:
           path: |
@@ -59,7 +59,7 @@ jobs:
       - name: "Install Tools"
         run: sudo npm i -g firebase-tools
       - name: Firebase Emulator Cache
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
+        uses: actions/cache@v4
         with:
           path: ~/.cache/firebase/emulators
           key: firebase-emulators-v2-${{ github.run_id }}
@@ -94,7 +94,7 @@ jobs:
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
         name: Install Node.js
         with:
-          node-version: "18"
+          node-version: "22"
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
         with:
           distribution: "temurin"
@@ -121,7 +121,7 @@ jobs:
         with:
           key: ${{ runner.os }}-ios-v3
           max-size: 700M
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
+      - uses: actions/cache@v4
         name: Pods Cache
         id: pods-cache
         with:
@@ -131,7 +131,7 @@ jobs:
       - name: "Install Tools"
         run: sudo npm i -g firebase-tools
       - name: Firebase Emulator Cache
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
+        uses: actions/cache@v4
         with:
           path: ~/.cache/firebase/emulators
           key: firebase-emulators-v1-${{ github.run_id }}
@@ -190,7 +190,7 @@ jobs:
       - uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8
         name: Install Node.js
         with:
-          node-version: "18"
+          node-version: "22"
       - uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73
         with:
           distribution: "temurin"
@@ -200,7 +200,7 @@ jobs:
         with:
           key: ${{ runner.os }}-macos-v2
           max-size: 700M
-      - uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
+      - uses: actions/cache@v4
         name: Pods Cache
         id: pods-cache
         with:
@@ -210,7 +210,7 @@ jobs:
       - name: "Install Tools"
         run: sudo npm i -g firebase-tools
       - name: Cache Firebase Emulator
-        uses: actions/cache@704facf57e6136b1bc63b828d79edcd491f0ee84
+        uses: actions/cache@v4
         with:
           path: ~/.cache/firebase/emulators
           key: firebase-emulators-v1-${{ github.run_id }}

CHANGELOG.md

@@ -3,6 +3,76 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2025-06-10
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`firebase_ui_auth` - `v1.17.0`](#firebase_ui_auth---v1170)
+ - [`firebase_ui_database` - `v1.5.2`](#firebase_ui_database---v152)
+ - [`firebase_ui_firestore` - `v1.7.2`](#firebase_ui_firestore---v172)
+ - [`firebase_ui_localizations` - `v1.14.0`](#firebase_ui_localizations---v1140)
+ - [`firebase_ui_oauth` - `v1.7.0`](#firebase_ui_oauth---v170)
+ - [`firebase_ui_oauth_apple` - `v1.3.2`](#firebase_ui_oauth_apple---v132)
+ - [`firebase_ui_oauth_facebook` - `v1.3.2`](#firebase_ui_oauth_facebook---v132)
+ - [`firebase_ui_oauth_google` - `v1.4.2`](#firebase_ui_oauth_google---v142)
+ - [`firebase_ui_oauth_twitter` - `v1.3.2`](#firebase_ui_oauth_twitter---v132)
+ - [`firebase_ui_storage` - `v2.1.2`](#firebase_ui_storage---v212)
+
+---
+
+#### `firebase_ui_auth` - `v1.17.0`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+ - **FEAT**(firebase_ui_auth): Use icon from OAuth provider as a fallback in ProfileScreen ([#474](https://github.com/firebase/FirebaseUI-Flutter/issues/474)). ([55f04ebb](https://github.com/firebase/FirebaseUI-Flutter/commit/55f04ebbf29fcc7f8abe11df1b4e7dfaf04028f5))
+
+#### `firebase_ui_database` - `v1.5.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
+#### `firebase_ui_firestore` - `v1.7.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
+#### `firebase_ui_localizations` - `v1.14.0`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+ - **FEAT**: Add missing translation values ([#507](https://github.com/firebase/FirebaseUI-Flutter/issues/507)). ([fc0e3da0](https://github.com/firebase/FirebaseUI-Flutter/commit/fc0e3da07388b624e049c3878cbf03f6817a840f))
+
+#### `firebase_ui_oauth` - `v1.7.0`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+ - **FEAT**(firebase_ui_auth): Use icon from OAuth provider as a fallback in ProfileScreen ([#474](https://github.com/firebase/FirebaseUI-Flutter/issues/474)). ([55f04ebb](https://github.com/firebase/FirebaseUI-Flutter/commit/55f04ebbf29fcc7f8abe11df1b4e7dfaf04028f5))
+
+#### `firebase_ui_oauth_apple` - `v1.3.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
+#### `firebase_ui_oauth_facebook` - `v1.3.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
+#### `firebase_ui_oauth_google` - `v1.4.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
+#### `firebase_ui_oauth_twitter` - `v1.3.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
+#### `firebase_ui_storage` - `v2.1.2`
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+ - **FIX**: progress is NaN when both bytesTransferred & totalBytes are 0 ([#491](https://github.com/firebase/FirebaseUI-Flutter/issues/491)). ([95b5f53a](https://github.com/firebase/FirebaseUI-Flutter/commit/95b5f53a35c06d5f4ac2b8f714400fd1f05524ab))
+
+
 ## 2025-01-13
 
 ### Changes

packages/firebase_ui_auth/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.17.0
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+ - **FEAT**(firebase_ui_auth): Use icon from OAuth provider as a fallback in ProfileScreen ([#474](https://github.com/firebase/FirebaseUI-Flutter/issues/474)). ([55f04ebb](https://github.com/firebase/FirebaseUI-Flutter/commit/55f04ebbf29fcc7f8abe11df1b4e7dfaf04028f5))
+
 ## 1.16.1
 
  - **FIX**: replace deprecated API and bump FlutterFire dependencies ([#453](https://github.com/firebase/FirebaseUI-Flutter/issues/453)). ([530be48a](https://github.com/firebase/FirebaseUI-Flutter/commit/530be48a4710387832f98059bd34ce07bba1778c))

packages/firebase_ui_auth/example/pubspec.yaml

@@ -22,19 +22,19 @@ environment:
 
 dependencies:
   cupertino_icons: ^1.0.6
-  firebase_auth: ^5.4.0
-  firebase_core: ^3.10.0
+  firebase_auth: ^5.6.0
+  firebase_core: ^3.14.0
   flutter:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
-  firebase_ui_auth: ^1.16.1
-  firebase_ui_localizations: ^1.13.1
-  firebase_ui_oauth: ^1.6.1
-  firebase_ui_oauth_apple: ^1.3.1
-  firebase_ui_oauth_facebook: ^1.3.1
-  firebase_ui_oauth_google: ^1.4.1
-  firebase_ui_oauth_twitter: ^1.3.1
+  firebase_ui_auth: ^1.17.0
+  firebase_ui_localizations: ^1.14.0
+  firebase_ui_oauth: ^1.7.0
+  firebase_ui_oauth_apple: ^1.3.2
+  firebase_ui_oauth_facebook: ^1.3.2
+  firebase_ui_oauth_google: ^1.4.2
+  firebase_ui_oauth_twitter: ^1.3.2
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   firebase_ui_shared: ^1.4.1

packages/firebase_ui_auth/lib/src/oauth/provider_resolvers.dart

@@ -4,11 +4,11 @@
 
 // ignore_for_file: constant_identifier_names
 
+import 'package:firebase_ui_auth/firebase_ui_auth.dart';
+import 'package:firebase_ui_oauth/firebase_ui_oauth.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 
-import 'social_icons.dart';
-
 const GOOGLE_PROVIDER_ID = 'google.com';
 const APPLE_PROVIDER_ID = 'apple.com';
 const TWITTER_PROVIDER_ID = 'twitter.com';
@@ -22,31 +22,51 @@ const PASSWORD_PROVIDER_ID = 'password';
 /// final icon = providerIcon(context, 'google.com');
 /// Icon(icon);
 /// ```
-IconData providerIcon(BuildContext context, String providerId) {
+Widget providerIcon(BuildContext context, AuthProvider provider) {
+  final providerId = provider.providerId;
   final isCupertino = CupertinoUserInterfaceLevel.maybeOf(context) != null;
 
+  final IconData? data;
   switch (providerId) {
     case GOOGLE_PROVIDER_ID:
-      return SocialIcons.google;
+      data = SocialIcons.google;
+      break;
     case APPLE_PROVIDER_ID:
-      return SocialIcons.apple;
+      data = SocialIcons.apple;
+      break;
     case TWITTER_PROVIDER_ID:
-      return SocialIcons.twitter;
+      data = SocialIcons.twitter;
+      break;
     case FACEBOOK_PROVIDER_ID:
-      return SocialIcons.facebook;
+      data = SocialIcons.facebook;
+      break;
     case PHONE_PROVIDER_ID:
       if (isCupertino) {
-        return CupertinoIcons.phone;
+        data = CupertinoIcons.phone;
       } else {
-        return Icons.phone;
+        data = Icons.phone;
       }
+      break;
     case PASSWORD_PROVIDER_ID:
       if (isCupertino) {
-        return CupertinoIcons.mail;
+        data = CupertinoIcons.mail;
       } else {
-        return Icons.email_outlined;
+        data = Icons.email_outlined;
       }
+      break;
     default:
-      throw Exception('Unknown provider: $providerId');
+      data = null;
+  }
+
+  if (data != null) {
+    return Icon(data);
   }
+
+  if (provider is OAuthProvider) {
+    final brightness =
+        CupertinoTheme.of(context).brightness ?? Theme.of(context).brightness;
+    return provider.style.iconWidget.getValue(brightness);
+  }
+
+  throw Exception('Unknown provider: $providerId');
 }

packages/firebase_ui_auth/lib/src/screens/profile_screen.dart

@@ -89,15 +89,11 @@ class _AvailableProvidersRowState extends State<_AvailableProvidersRow> {
                   context: context,
                   provider: provider,
                 ).then((_) => widget.onProviderLinked()),
-                child: Icon(
-                  providerIcon(context, provider.providerId),
-                ),
+                child: providerIcon(context, provider),
               )
             else
               IconButton(
-                icon: Icon(
-                  providerIcon(context, provider.providerId),
-                ),
+                icon: providerIcon(context, provider),
                 onPressed: () => connectProvider(
                   context: context,
                   provider: provider,
@@ -246,7 +242,8 @@ class _LinkedProvidersRowState extends State<_LinkedProvidersRow> {
     }
   }
 
-  Widget buildProviderIcon(BuildContext context, String providerId) {
+  Widget buildProviderIcon(BuildContext context, AuthProvider provider) {
+    final providerId = provider.providerId;
     final isCupertino = CupertinoUserInterfaceLevel.maybeOf(context) != null;
     const animationDuration = Duration(milliseconds: 150);
     const curve = Curves.easeOut;
@@ -267,7 +264,7 @@ class _LinkedProvidersRowState extends State<_LinkedProvidersRow> {
                   size: size - (size / 4),
                   borderWidth: 1,
                 )
-              : Icon(providerIcon(context, providerId)),
+              : providerIcon(context, provider),
         ),
         if (unlinkingProvider != providerId)
           AnimatedOpacity(
@@ -306,7 +303,7 @@ class _LinkedProvidersRowState extends State<_LinkedProvidersRow> {
     Widget child = Row(
       children: [
         for (var provider in widget.providers)
-          buildProviderIcon(context, provider.providerId)
+          buildProviderIcon(context, provider)
       ]
           .map((e) => [e, const SizedBox(width: 8)])
           .expand((element) => element)

packages/firebase_ui_auth/pubspec.yaml

@@ -1,6 +1,6 @@
 name: firebase_ui_auth
 description: Pre-built widgets library that are integrated with the variety of the Firebase Auth providers.
-version: 1.16.1
+version: 1.17.0
 repository: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_auth
 homepage: https://github.com/firebase/FirebaseUI-Flutter/tree/master/packages/firebase_ui_auth
 
@@ -10,11 +10,11 @@ environment:
 
 dependencies:
   email_validator: ^2.1.17
-  firebase_auth: ^5.4.0
-  firebase_core: ^3.10.0
-  firebase_dynamic_links: ^6.1.0
-  firebase_ui_localizations: ^1.13.1
-  firebase_ui_oauth: ^1.6.1
+  firebase_auth: ^5.6.0
+  firebase_core: ^3.14.0
+  firebase_dynamic_links: ^6.1.7
+  firebase_ui_localizations: ^1.14.0
+  firebase_ui_oauth: ^1.7.0
   firebase_ui_shared: ^1.4.1
   flutter:
     sdk: flutter

packages/firebase_ui_auth/test/widgets/error_text_test.dart

@@ -23,7 +23,7 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: ErrorText(exception: exception),
-          localizationsDelegates: [
+          localizationsDelegates: const [
             FirebaseUILocalizations.delegate,
           ],
         ),
@@ -48,7 +48,7 @@ void main() {
       await tester.pumpWidget(
         MaterialApp(
           home: ErrorText(exception: exception),
-          localizationsDelegates: [
+          localizationsDelegates: const [
             FirebaseUILocalizations.delegate,
           ],
         ),

packages/firebase_ui_database/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.5.2
+
+ - **FIX**: bump FF dependencies to latest ([#520](https://github.com/firebase/FirebaseUI-Flutter/issues/520)). ([ac4f1fdd](https://github.com/firebase/FirebaseUI-Flutter/commit/ac4f1fddcee04b020a6384ac74f2571bccafe44e))
+
 ## 1.5.1
 
  - **FIX**: replace deprecated API and bump FlutterFire dependencies ([#453](https://github.com/firebase/FirebaseUI-Flutter/issues/453)). ([530be48a](https://github.com/firebase/FirebaseUI-Flutter/commit/530be48a4710387832f98059bd34ce07bba1778c))

packages/firebase_ui_database/example/pubspec.yaml

@@ -29,12 +29,12 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  firebase_ui_database: ^1.5.1
+  firebase_ui_database: ^1.5.2
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
-  firebase_core: ^3.10.0
-  firebase_database: ^11.3.0
+  firebase_core: ^3.14.0
+  firebase_database: ^11.3.7
 dev_dependencies:
   drive: ^1.0.0-1.0.nullsafety.5
   flutter_test: