Skip to content

Commit 5e76153

Browse files
LyokoneLyokone
authored
feat(auth): update Pigeon version to 19 (#12828)
* feat(auth): update Pigeon version to 19 * fix android * fix ios * fix windows * format * up macos version * update macos tests * update ios * update macos * update ios
1 parent 08f61ec commit 5e76153

33 files changed

+3412
-2233
lines changed

‎packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/AuthStateChannelStreamHandler.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ public void onListen(Object arguments, EventSink events) {
4343
if (user == null) {
4444
event.put(Constants.USER, null);
4545
} else {
46-
event.put(Constants.USER, PigeonParser.parseFirebaseUser(user).toList());
46+
event.put(
47+
Constants.USER, PigeonParser.manuallyToList(PigeonParser.parseFirebaseUser(user)));
4748
}
4849

4950
events.success(event);

‎packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,12 @@ public class FlutterFirebaseAuthPlugin
6767
private void initInstance(BinaryMessenger messenger) {
6868
registerPlugin(METHOD_CHANNEL_NAME, this);
6969
channel = new MethodChannel(messenger, METHOD_CHANNEL_NAME);
70-
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setup(messenger, this);
71-
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setup(messenger, firebaseAuthUser);
72-
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setup(messenger, firebaseMultiFactor);
73-
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setup(messenger, firebaseMultiFactor);
74-
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setup(messenger, firebaseTotpMultiFactor);
75-
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setup(messenger, firebaseTotpSecret);
70+
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setUp(messenger, this);
71+
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setUp(messenger, firebaseAuthUser);
72+
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setUp(messenger, firebaseMultiFactor);
73+
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setUp(messenger, firebaseMultiFactor);
74+
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setUp(messenger, firebaseTotpMultiFactor);
75+
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setUp(messenger, firebaseTotpSecret);
7676

7777
this.messenger = messenger;
7878
}
@@ -87,12 +87,12 @@ public void onDetachedFromEngine(@NonNull FlutterPluginBinding binding) {
8787
channel.setMethodCallHandler(null);
8888

8989
assert messenger != null;
90-
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setup(messenger, null);
91-
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setup(messenger, null);
92-
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setup(messenger, null);
93-
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setup(messenger, null);
94-
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setup(messenger, null);
95-
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setup(messenger, null);
90+
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setUp(messenger, null);
91+
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setUp(messenger, null);
92+
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setUp(messenger, null);
93+
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setUp(messenger, null);
94+
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setUp(messenger, null);
95+
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setUp(messenger, null);
9696

9797
channel = null;
9898
messenger = null;
@@ -189,11 +189,11 @@ public void useEmulator(
189189
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
190190
@NonNull String host,
191191
@NonNull Long port,
192-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
192+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
193193
try {
194194
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
195195
firebaseAuth.useEmulator(host, port.intValue());
196-
result.success(null);
196+
result.success();
197197
} catch (Exception e) {
198198
result.error(e);
199199
}
@@ -203,14 +203,14 @@ public void useEmulator(
203203
public void applyActionCode(
204204
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
205205
@NonNull String code,
206-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
206+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
207207
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
208208
firebaseAuth
209209
.applyActionCode(code)
210210
.addOnCompleteListener(
211211
task -> {
212212
if (task.isSuccessful()) {
213-
result.success(null);
213+
result.success();
214214
} else {
215215
result.error(
216216
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -247,15 +247,15 @@ public void confirmPasswordReset(
247247
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
248248
@NonNull String code,
249249
@NonNull String newPassword,
250-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
250+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
251251
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
252252

253253
firebaseAuth
254254
.confirmPasswordReset(code, newPassword)
255255
.addOnCompleteListener(
256256
task -> {
257257
if (task.isSuccessful()) {
258-
result.success(null);
258+
result.success();
259259
} else {
260260
result.error(
261261
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -445,7 +445,7 @@ public void signInWithProvider(
445445
@Override
446446
public void signOut(
447447
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
448-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
448+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
449449
try {
450450
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
451451
if (firebaseAuth.getCurrentUser() != null) {
@@ -456,7 +456,7 @@ public void signOut(
456456
}
457457
}
458458
firebaseAuth.signOut();
459-
result.success(null);
459+
result.success();
460460
} catch (Exception e) {
461461
result.error(e);
462462
}
@@ -489,7 +489,7 @@ public void sendPasswordResetEmail(
489489
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
490490
@NonNull String email,
491491
@Nullable GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
492-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
492+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
493493
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
494494

495495
if (actionCodeSettings == null) {
@@ -498,7 +498,7 @@ public void sendPasswordResetEmail(
498498
.addOnCompleteListener(
499499
task -> {
500500
if (task.isSuccessful()) {
501-
result.success(null);
501+
result.success();
502502
} else {
503503
result.error(
504504
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -513,7 +513,7 @@ public void sendPasswordResetEmail(
513513
.addOnCompleteListener(
514514
task -> {
515515
if (task.isSuccessful()) {
516-
result.success(null);
516+
result.success();
517517
} else {
518518
result.error(
519519
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -527,15 +527,15 @@ public void sendSignInLinkToEmail(
527527
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
528528
@NonNull String email,
529529
@NonNull GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
530-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
530+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
531531
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
532532

533533
firebaseAuth
534534
.sendSignInLinkToEmail(email, PigeonParser.getActionCodeSettings(actionCodeSettings))
535535
.addOnCompleteListener(
536536
task -> {
537537
if (task.isSuccessful()) {
538-
result.success(null);
538+
result.success();
539539
} else {
540540
result.error(
541541
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -568,7 +568,7 @@ public void setLanguageCode(
568568
public void setSettings(
569569
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
570570
@NonNull GeneratedAndroidFirebaseAuth.PigeonFirebaseAuthSettings settings,
571-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
571+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
572572
try {
573573
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
574574

@@ -589,7 +589,7 @@ public void setSettings(
589589
settings.getPhoneNumber(), settings.getSmsCode());
590590
}
591591

592-
result.success(null);
592+
result.success();
593593
} catch (Exception e) {
594594
result.error(e);
595595
}
@@ -672,8 +672,9 @@ public void verifyPhoneNumber(
672672
public void revokeTokenWithAuthorizationCode(
673673
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
674674
@NonNull String authorizationCode,
675-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
675+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
676676
// Should never get here as we throw Exception on Dart side.
677+
result.success();
677678
}
678679

679680
@Override
@@ -696,8 +697,7 @@ public Task<Map<String, Object>> getPluginConstantsForFirebaseApp(FirebaseApp fi
696697
}
697698

698699
if (user != null) {
699-
final Object parsedUser = user.toList();
700-
constants.put("APP_CURRENT_USER", parsedUser);
700+
constants.put("APP_CURRENT_USER", PigeonParser.manuallyToList(user));
701701
}
702702

703703
taskCompletionSource.setResult(constants);

‎packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthUser.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public static FirebaseUser getCurrentUserFromPigeon(
4646
@Override
4747
public void delete(
4848
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
49-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
49+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
5050
FirebaseUser firebaseUser = getCurrentUserFromPigeon(app);
5151

5252
if (firebaseUser == null) {
@@ -59,7 +59,7 @@ public void delete(
5959
.addOnCompleteListener(
6060
task -> {
6161
if (task.isSuccessful()) {
62-
result.success(null);
62+
result.success();
6363
} else {
6464
result.error(
6565
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -253,7 +253,7 @@ public void reload(
253253
public void sendEmailVerification(
254254
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
255255
@Nullable GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
256-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
256+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
257257
FirebaseUser firebaseUser = getCurrentUserFromPigeon(app);
258258

259259
if (firebaseUser == null) {
@@ -267,7 +267,7 @@ public void sendEmailVerification(
267267
.addOnCompleteListener(
268268
task -> {
269269
if (task.isSuccessful()) {
270-
result.success(null);
270+
result.success();
271271
} else {
272272
result.error(
273273
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -282,7 +282,7 @@ public void sendEmailVerification(
282282
.addOnCompleteListener(
283283
task -> {
284284
if (task.isSuccessful()) {
285-
result.success(null);
285+
result.success();
286286
} else {
287287
result.error(
288288
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -508,7 +508,7 @@ public void verifyBeforeUpdateEmail(
508508
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
509509
@NonNull String newEmail,
510510
@Nullable GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
511-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
511+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
512512
FirebaseUser firebaseUser = getCurrentUserFromPigeon(app);
513513

514514
if (firebaseUser == null) {
@@ -522,7 +522,7 @@ public void verifyBeforeUpdateEmail(
522522
.addOnCompleteListener(
523523
task -> {
524524
if (task.isSuccessful()) {
525-
result.success(null);
525+
result.success();
526526
} else {
527527
result.error(
528528
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -537,7 +537,7 @@ public void verifyBeforeUpdateEmail(
537537
.addOnCompleteListener(
538538
task -> {
539539
if (task.isSuccessful()) {
540-
result.success(null);
540+
result.success();
541541
} else {
542542
result.error(
543543
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(

‎packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseMultiFactor.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ public void enrollPhone(
6262
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
6363
@NonNull GeneratedAndroidFirebaseAuth.PigeonPhoneMultiFactorAssertion assertion,
6464
@Nullable String displayName,
65-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
65+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
6666
final MultiFactor multiFactor;
6767
try {
6868
multiFactor = getAppMultiFactor(app);
@@ -82,7 +82,7 @@ public void enrollPhone(
8282
.addOnCompleteListener(
8383
task -> {
8484
if (task.isSuccessful()) {
85-
result.success(null);
85+
result.success();
8686
} else {
8787
result.error(
8888
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -96,7 +96,7 @@ public void enrollTotp(
9696
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
9797
@NonNull String assertionId,
9898
@Nullable String displayName,
99-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
99+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
100100
final MultiFactor multiFactor;
101101
try {
102102
multiFactor = getAppMultiFactor(app);
@@ -113,7 +113,7 @@ public void enrollTotp(
113113
.addOnCompleteListener(
114114
task -> {
115115
if (task.isSuccessful()) {
116-
result.success(null);
116+
result.success();
117117
} else {
118118
result.error(
119119
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
@@ -160,7 +160,7 @@ public void getSession(
160160
public void unenroll(
161161
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
162162
@NonNull String factorUid,
163-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
163+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
164164
final MultiFactor multiFactor;
165165
try {
166166
multiFactor = getAppMultiFactor(app);
@@ -174,7 +174,7 @@ public void unenroll(
174174
.addOnCompleteListener(
175175
task -> {
176176
if (task.isSuccessful()) {
177-
result.success(null);
177+
result.success();
178178
} else {
179179
result.error(
180180
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(

‎packages/firebase_auth/firebase_auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseTotpSecret.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ public void generateQrCodeUrl(
3333
public void openInOtpApp(
3434
@NonNull String secretKey,
3535
@NonNull String qrCodeUrl,
36-
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
36+
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
3737
final TotpSecret secret = FlutterFirebaseTotpMultiFactor.multiFactorSecret.get(secretKey);
3838
assert secret != null;
3939
secret.openInOtpApp(qrCodeUrl);
40-
result.success(null);
40+
result.success();
4141
}
4242
}

0 commit comments

Comments
 (0)