Skip to content

Commit 471893b

Browse files
Rexios80Rexios80
committed
Revert "Merge branch 'firebase:main' into feature/database-query-builder-reverse"
This reverts commit 60b78aa, reversing changes made to 1525a3c.
1 parent 60b78aa commit 471893b

File tree

67 files changed

+310
-1635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+310
-1635
lines changed

‎.github/workflows/code_health.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
timeout-minutes: 30
101101
steps:
102102
- uses: actions/[email protected]
103-
- uses: actions/setup-go@v5
103+
- uses: actions/setup-go@v4
104104
with:
105105
go-version: "^1.13.1"
106106
- run: go install github.com/google/addlicense@latest

‎.github/workflows/e2e.yml

+9-9
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ jobs:
4141
arch: x86_64
4242
profile: pixel_5
4343
script: echo "Generated AVD snapshot for caching."
44-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
45-
name: Install Node.js
44+
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
45+
name: Install Node.js 16
4646
with:
47-
node-version: "18"
47+
node-version: "16"
4848
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
4949
with:
5050
distribution: "temurin"
@@ -98,10 +98,10 @@ jobs:
9898
timeout-minutes: 45
9999
steps:
100100
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
101-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
102-
name: Install Node.js
101+
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
102+
name: Install Node.js 16
103103
with:
104-
node-version: "18"
104+
node-version: "16"
105105
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
106106
with:
107107
distribution: "temurin"
@@ -168,10 +168,10 @@ jobs:
168168
timeout-minutes: 45
169169
steps:
170170
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
171-
- uses: actions/setup-node@b39b52d1213e96004bfcb1c61a8a6fa8ab84f3e8
172-
name: Install Node.js
171+
- uses: actions/setup-node@8f152de45cc393bb48ce5d89d36b731f54556e65
172+
name: Install Node.js 16
173173
with:
174-
node-version: "18"
174+
node-version: "16"
175175
- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93
176176
with:
177177
distribution: "temurin"

‎.github/workflows/ossf-scorecard.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ jobs:
5959
# Upload the results as artifacts (optional). Commenting out will disable uploads of run results in SARIF
6060
# format to the repository Actions tab.
6161
- name: "Upload artifact"
62-
uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4.0.0
62+
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
6363
with:
6464
name: SARIF file
6565
path: results.sarif
6666
retention-days: 5
6767

6868
# Upload the results to GitHub's code scanning dashboard.
6969
- name: "Upload to code-scanning"
70-
uses: github/codeql-action/upload-sarif@012739e5082ff0c22ca6d6ab32e07c36df03c4a4 # v3.22.12
70+
uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
7171
with:
7272
sarif_file: results.sarif

‎CHANGELOG.md

-102
Original file line numberDiff line numberDiff line change
@@ -3,108 +3,6 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6-
## 2024-01-09
7-
8-
### Changes
9-
10-
---
11-
12-
Packages with breaking changes:
13-
14-
- There are no breaking changes in this release.
15-
16-
Packages with other changes:
17-
18-
- [`firebase_ui_firestore` - `v1.6.1`](#firebase_ui_firestore---v161)
19-
- [`firebase_ui_localizations` - `v1.10.1`](#firebase_ui_localizations---v1101)
20-
- [`firebase_ui_auth` - `v1.12.1`](#firebase_ui_auth---v1121)
21-
- [`firebase_ui_storage` - `v2.0.2`](#firebase_ui_storage---v202)
22-
- [`firebase_ui_database` - `v1.4.1`](#firebase_ui_database---v141)
23-
- [`firebase_ui_oauth` - `v1.4.17`](#firebase_ui_oauth---v1417)
24-
- [`firebase_ui_oauth_facebook` - `v1.2.17`](#firebase_ui_oauth_facebook---v1217)
25-
- [`firebase_ui_oauth_twitter` - `v1.2.17`](#firebase_ui_oauth_twitter---v1217)
26-
- [`firebase_ui_oauth_apple` - `v1.2.17`](#firebase_ui_oauth_apple---v1217)
27-
- [`firebase_ui_oauth_google` - `v1.2.17`](#firebase_ui_oauth_google---v1217)
28-
29-
Packages with dependency updates only:
30-
31-
> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
32-
33-
- `firebase_ui_auth` - `v1.12.1`
34-
- `firebase_ui_storage` - `v2.0.2`
35-
- `firebase_ui_database` - `v1.4.1`
36-
- `firebase_ui_oauth` - `v1.4.17`
37-
- `firebase_ui_oauth_facebook` - `v1.2.17`
38-
- `firebase_ui_oauth_twitter` - `v1.2.17`
39-
- `firebase_ui_oauth_apple` - `v1.2.17`
40-
- `firebase_ui_oauth_google` - `v1.2.17`
41-
42-
---
43-
44-
#### `firebase_ui_firestore` - `v1.6.1`
45-
46-
- **FIX**(ui_firestore): null-assert count for aggregate query ([#246](https://github.com/firebase/FirebaseUI-Flutter/issues/246)). ([8afbe368](https://github.com/firebase/FirebaseUI-Flutter/commit/8afbe36824ec481055dcbf0558e0611bab712553))
47-
48-
#### `firebase_ui_localizations` - `v1.10.1`
49-
50-
- **FIX**: Update translation strings in RO for confirm account deletion ([#219](https://github.com/firebase/FirebaseUI-Flutter/issues/219)). ([704b34ea](https://github.com/firebase/FirebaseUI-Flutter/commit/704b34ea174ecf3a78357de0236156f4d17a6ba5))
51-
52-
53-
## 2024-01-04
54-
55-
### Changes
56-
57-
---
58-
59-
Packages with breaking changes:
60-
61-
- There are no breaking changes in this release.
62-
63-
Packages with other changes:
64-
65-
- [`firebase_ui_auth` - `v1.12.0`](#firebase_ui_auth---v1120)
66-
- [`firebase_ui_database` - `v1.4.0`](#firebase_ui_database---v140)
67-
- [`firebase_ui_firestore` - `v1.6.0`](#firebase_ui_firestore---v160)
68-
- [`firebase_ui_localizations` - `v1.10.0`](#firebase_ui_localizations---v1100)
69-
- [`firebase_ui_oauth` - `v1.4.16`](#firebase_ui_oauth---v1416)
70-
- [`firebase_ui_oauth_twitter` - `v1.2.16`](#firebase_ui_oauth_twitter---v1216)
71-
- [`firebase_ui_oauth_facebook` - `v1.2.16`](#firebase_ui_oauth_facebook---v1216)
72-
- [`firebase_ui_oauth_apple` - `v1.2.16`](#firebase_ui_oauth_apple---v1216)
73-
- [`firebase_ui_oauth_google` - `v1.2.16`](#firebase_ui_oauth_google---v1216)
74-
- [`firebase_ui_storage` - `v2.0.1`](#firebase_ui_storage---v201)
75-
76-
Packages with dependency updates only:
77-
78-
> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
79-
80-
- `firebase_ui_oauth` - `v1.4.16`
81-
- `firebase_ui_oauth_twitter` - `v1.2.16`
82-
- `firebase_ui_oauth_facebook` - `v1.2.16`
83-
- `firebase_ui_oauth_apple` - `v1.2.16`
84-
- `firebase_ui_oauth_google` - `v1.2.16`
85-
- `firebase_ui_storage` - `v2.0.1`
86-
87-
---
88-
89-
#### `firebase_ui_auth` - `v1.12.0`
90-
91-
- **FIX**(ui_auth): correctly handle phone auth in showReauthenticateDialog ([#209](https://github.com/firebase/FirebaseUI-Flutter/issues/209)). ([c0612cfd](https://github.com/firebase/FirebaseUI-Flutter/commit/c0612cfd71dc5ea2448ba73882b39a9766b97a98))
92-
- **FIX**(ui_auth): deprecate email enumeration protection affected APIs ([#210](https://github.com/firebase/FirebaseUI-Flutter/issues/210)). ([eed65674](https://github.com/firebase/FirebaseUI-Flutter/commit/eed656748caa12eb31d7a9677a16bf6b1d129b77))
93-
- **FEAT**(ui_auth): add a way to get an AuthController for AuthState ([#207](https://github.com/firebase/FirebaseUI-Flutter/issues/207)). ([0816bfd4](https://github.com/firebase/FirebaseUI-Flutter/commit/0816bfd4a1acfbe390d9725d48892b0831e99679))
94-
95-
#### `firebase_ui_database` - `v1.4.0`
96-
97-
- **FEAT**(firebase_ui_database): Allow reversing the database query ([#193](https://github.com/firebase/FirebaseUI-Flutter/issues/193)). ([0588812b](https://github.com/firebase/FirebaseUI-Flutter/commit/0588812beac550afcf8dba2cabde28f258a90ed1))
98-
99-
#### `firebase_ui_firestore` - `v1.6.0`
100-
101-
- **FEAT**(ui_firestore): implemented separators and fetching indicator ([#99](https://github.com/firebase/FirebaseUI-Flutter/issues/99)). ([d8d8bf59](https://github.com/firebase/FirebaseUI-Flutter/commit/d8d8bf594273618e866545172e57c10409f3a78f))
102-
103-
#### `firebase_ui_localizations` - `v1.10.0`
104-
105-
- **FEAT**(ui_localizations): Add Norwegian (NB) localization ([#191](https://github.com/firebase/FirebaseUI-Flutter/issues/191)). ([715ab1b8](https://github.com/firebase/FirebaseUI-Flutter/commit/715ab1b8ab7df536da50177e75d6d0632ecdf83c))
106-
107-
1086
## 2023-11-30
1097

1108
### Changes

‎docs/firebase-ui-auth/providers/oauth.md

-51
Original file line numberDiff line numberDiff line change
@@ -35,59 +35,8 @@ Now all pre-built screens that support multiple providers (such as `RegisterScre
3535

3636
The configuration requires the `clientId` property (which can be found in the Firebase Console) to be set for seamless cross-platform support.
3737

38-
For iOS and macOS, `clientId` can be found in the `GoogleService-Info.plist` file available in the Firebase console under Firebase project settings.
39-
40-
For example, if your `GoogleService-Info.plist` looks like this:
41-
42-
```xml
43-
<?xml version="1.0" encoding="UTF-8"?>
44-
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
45-
<plist version="1.0">
46-
<dict>
47-
<key>CLIENT_ID</key>
48-
<string>your-client-id.apps.googleusercontent.com</string>
49-
<!-- more keys -->
50-
</dict>
51-
```
52-
53-
you should set `clientId` to `your-client-id.apps.googleusercontent.com`:
54-
55-
```dart
56-
GoogleProvider(clientId: 'your-client-id.apps.googleusercontent.com'),
57-
```
58-
59-
Additionally, you need to add the following to your `Info.plist` file:
60-
61-
```xml
62-
<key>CFBundleURLTypes</key>
63-
<array>
64-
<dict>
65-
<key>CFBundleTypeRole</key>
66-
<string>Editor</string>
67-
<key>CFBundleURLSchemes</key>
68-
<array>
69-
<string>com.googleusercontent.apps.your-client-id</string>
70-
</array>
71-
</dict>
72-
</array>
73-
```
74-
75-
For Linux and Windows, `clientId` should be set to a web client id:
76-
7738
![Google app client ID](../images/ui-google-provider-client-id.png)
7839

79-
```dart
80-
const iOSClientId = 'your-client-id.apps.googleusercontent.com';
81-
const webClientId = 'your-web-client-id.apps.googleusercontent.com';
82-
83-
String get googleClientId {
84-
return switch (defaultTargetPlatform) {
85-
TargetPlatfrom.iOS || TargetPlatform.macOS => iOSClientId,
86-
_ => webClientId,
87-
}
88-
}
89-
```
90-
9140
See [Custom screens section](#custom-screens) to learn how to use a button on your custom screen.
9241

9342
## Sign in with Apple

‎packages/firebase_ui_auth/CHANGELOG.md

-10
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
## 1.12.1
2-
3-
- Update a dependency to the latest release.
4-
5-
## 1.12.0
6-
7-
- **FIX**(ui_auth): correctly handle phone auth in showReauthenticateDialog ([#209](https://github.com/firebase/FirebaseUI-Flutter/issues/209)). ([c0612cfd](https://github.com/firebase/FirebaseUI-Flutter/commit/c0612cfd71dc5ea2448ba73882b39a9766b97a98))
8-
- **FIX**(ui_auth): deprecate email enumeration protection affected APIs ([#210](https://github.com/firebase/FirebaseUI-Flutter/issues/210)). ([eed65674](https://github.com/firebase/FirebaseUI-Flutter/commit/eed656748caa12eb31d7a9677a16bf6b1d129b77))
9-
- **FEAT**(ui_auth): add a way to get an AuthController for AuthState ([#207](https://github.com/firebase/FirebaseUI-Flutter/issues/207)). ([0816bfd4](https://github.com/firebase/FirebaseUI-Flutter/commit/0816bfd4a1acfbe390d9725d48892b0831e99679))
10-
111
## 1.11.0
122

133
- **FIX**(ui_auth): correctly position phone input screen footer ([#183](https://github.com/firebase/FirebaseUI-Flutter/issues/183)). ([d5e2338d](https://github.com/firebase/FirebaseUI-Flutter/commit/d5e2338df4fbbed69c7526ecc1d4559730c43d03))

‎packages/firebase_ui_auth/example/lib/config.dart

+3-11
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,10 @@
22
// for details. All rights reserved. Use of this source code is governed by a
33
// BSD-style license that can be found in the LICENSE file.
44

5-
// ignore_for_file: do_not_use_environment, constant_identifier_names, non_constant_identifier_names
6-
7-
import 'package:flutter/foundation.dart';
8-
9-
String get GOOGLE_CLIENT_ID {
10-
if (defaultTargetPlatform == TargetPlatform.macOS) {
11-
return '406099696497-65v1b9ffv6sgfqngfjab5ol5qdikh2rm.apps.googleusercontent.com';
12-
} else {
13-
return '448618578101-sg12d2qin42cpr00f8b0gehs5s7inm0v.apps.googleusercontent.com';
14-
}
15-
}
5+
// ignore_for_file: do_not_use_environment, constant_identifier_names
166

7+
const GOOGLE_CLIENT_ID =
8+
'448618578101-sg12d2qin42cpr00f8b0gehs5s7inm0v.apps.googleusercontent.com';
179
const GOOGLE_REDIRECT_URI =
1810
'https://react-native-firebase-testing.firebaseapp.com/__/auth/handler';
1911

‎packages/firebase_ui_auth/example/macos/Podfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
platform :osx, '10.15'
1+
platform :osx, '10.14'
22

33
# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
44
ENV['COCOAPODS_DISABLE_STATS'] = 'true'

‎packages/firebase_ui_auth/example/macos/Runner.xcodeproj/project.pbxproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@
404404
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
405405
GCC_WARN_UNUSED_FUNCTION = YES;
406406
GCC_WARN_UNUSED_VARIABLE = YES;
407-
MACOSX_DEPLOYMENT_TARGET = 10.15;
407+
MACOSX_DEPLOYMENT_TARGET = 10.14;
408408
MTL_ENABLE_DEBUG_INFO = NO;
409409
SDKROOT = macosx;
410410
SWIFT_COMPILATION_MODE = wholemodule;
@@ -485,7 +485,7 @@
485485
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
486486
GCC_WARN_UNUSED_FUNCTION = YES;
487487
GCC_WARN_UNUSED_VARIABLE = YES;
488-
MACOSX_DEPLOYMENT_TARGET = 10.15;
488+
MACOSX_DEPLOYMENT_TARGET = 10.14;
489489
MTL_ENABLE_DEBUG_INFO = YES;
490490
ONLY_ACTIVE_ARCH = YES;
491491
SDKROOT = macosx;
@@ -532,7 +532,7 @@
532532
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
533533
GCC_WARN_UNUSED_FUNCTION = YES;
534534
GCC_WARN_UNUSED_VARIABLE = YES;
535-
MACOSX_DEPLOYMENT_TARGET = 10.15;
535+
MACOSX_DEPLOYMENT_TARGET = 10.14;
536536
MTL_ENABLE_DEBUG_INFO = NO;
537537
SDKROOT = macosx;
538538
SWIFT_COMPILATION_MODE = wholemodule;

‎packages/firebase_ui_auth/example/macos/Runner/Info.plist

-11
Original file line numberDiff line numberDiff line change
@@ -28,16 +28,5 @@
2828
<string>MainMenu</string>
2929
<key>NSPrincipalClass</key>
3030
<string>NSApplication</string>
31-
<key>CFBundleURLTypes</key>
32-
<array>
33-
<dict>
34-
<key>CFBundleTypeRole</key>
35-
<string>Editor</string>
36-
<key>CFBundleURLSchemes</key>
37-
<array>
38-
<string>com.googleusercontent.apps.406099696497-65v1b9ffv6sgfqngfjab5ol5qdikh2rm</string>
39-
</array>
40-
</dict>
41-
</array>
4231
</dict>
4332
</plist>

‎packages/firebase_ui_auth/example/macos/Runner/Release.entitlements

-4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,5 @@
1010
<true/>
1111
<key>com.apple.security.network.client</key>
1212
<true/>
13-
<key>keychain-access-groups</key>
14-
<array>
15-
<string>$(AppIdentifierPrefix)com.google.GIDSignIn</string>
16-
</array>
1713
</dict>
1814
</plist>

‎packages/firebase_ui_auth/example/pubspec.yaml

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ environment:
2222

2323
dependencies:
2424
cupertino_icons: ^1.0.6
25-
firebase_auth: ^4.15.3
26-
firebase_core: ^2.24.2
25+
firebase_auth: ^4.15.0
26+
firebase_core: ^2.24.0
2727
flutter:
2828
sdk: flutter
2929
flutter_localizations:
3030
sdk: flutter
31-
firebase_ui_auth: ^1.12.1
32-
firebase_ui_localizations: ^1.10.1
33-
firebase_ui_oauth: ^1.4.17
34-
firebase_ui_oauth_apple: ^1.2.17
35-
firebase_ui_oauth_facebook: ^1.2.17
36-
firebase_ui_oauth_google: ^1.2.17
37-
firebase_ui_oauth_twitter: ^1.2.17
31+
firebase_ui_auth: ^1.11.0
32+
firebase_ui_localizations: ^1.9.0
33+
firebase_ui_oauth: ^1.4.15
34+
firebase_ui_oauth_apple: ^1.2.15
35+
firebase_ui_oauth_facebook: ^1.2.15
36+
firebase_ui_oauth_google: ^1.2.15
37+
firebase_ui_oauth_twitter: ^1.2.15
3838
dev_dependencies:
3939
drive: ^1.0.0-1.0.nullsafety.5
4040
firebase_ui_shared: ^1.4.1
@@ -44,7 +44,7 @@ dev_dependencies:
4444
flutter_test:
4545
sdk: flutter
4646
flutter_lints: ^3.0.1
47-
google_sign_in: ^6.2.1
47+
google_sign_in: ^6.1.6
4848
http: ^1.1.2
4949
integration_test:
5050
sdk: flutter

‎packages/firebase_ui_auth/lib/firebase_ui_auth.dart

-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export 'src/auth_state.dart'
2929
SigningIn,
3030
UserCreated,
3131
AuthFailed,
32-
// ignore: deprecated_member_use_from_same_package
3332
DifferentSignInMethodsFound,
3433
MFARequired;
3534
export 'src/email_verification.dart';

‎packages/firebase_ui_auth/lib/src/auth_flow.dart

-5
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,6 @@ class AuthFlow<T extends AuthProvider> extends ValueNotifier<AuthState>
128128
value = CredentialLinked(credential, auth.currentUser!);
129129
}
130130

131-
@override
132-
@Deprecated(
133-
'Email enumeration protection is on by default.'
134-
'Read more here https://cloud.google.com/identity-platform/docs/admin/email-enumeration-protection',
135-
)
136131
@override
137132
void onDifferentProvidersFound(
138133
String email,

0 commit comments

Comments
 (0)