Skip to content

Commit

Permalink
feat(auth): update Pigeon version to 19 (#12828)
Browse files Browse the repository at this point in the history 
* 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
  • Loading branch information
@Lyokone
Lyokone committed May 28, 2024
1 parent 08f61ec commit 5e76153
Show file tree
Hide file tree
Showing 33 changed files with 3,412 additions and 2,233 deletions.
3 changes: 2 additions & 1 deletion ...android/src/main/java/io/flutter/plugins/firebase/auth/AuthStateChannelStreamHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public void onListen(Object arguments, EventSink events) {
if (user == null) {
event.put(Constants.USER, null);
} else {
event.put(Constants.USER, PigeonParser.parseFirebaseUser(user).toList());
event.put(
Constants.USER, PigeonParser.manuallyToList(PigeonParser.parseFirebaseUser(user)));
}

events.success(event);
Expand Down
60 changes: 30 additions & 30 deletions ...uth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthPlugin.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@ public class FlutterFirebaseAuthPlugin
private void initInstance(BinaryMessenger messenger) {
registerPlugin(METHOD_CHANNEL_NAME, this);
channel = new MethodChannel(messenger, METHOD_CHANNEL_NAME);
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setup(messenger, this);
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setup(messenger, firebaseAuthUser);
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setup(messenger, firebaseMultiFactor);
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setup(messenger, firebaseMultiFactor);
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setup(messenger, firebaseTotpMultiFactor);
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setup(messenger, firebaseTotpSecret);
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setUp(messenger, this);
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setUp(messenger, firebaseAuthUser);
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setUp(messenger, firebaseMultiFactor);
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setUp(messenger, firebaseMultiFactor);
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setUp(messenger, firebaseTotpMultiFactor);
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setUp(messenger, firebaseTotpSecret);

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

assert messenger != null;
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setup(messenger, null);
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setup(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setup(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setup(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setup(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setup(messenger, null);
GeneratedAndroidFirebaseAuth.FirebaseAuthHostApi.setUp(messenger, null);
GeneratedAndroidFirebaseAuth.FirebaseAuthUserHostApi.setUp(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactorUserHostApi.setUp(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactoResolverHostApi.setUp(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactorTotpHostApi.setUp(messenger, null);
GeneratedAndroidFirebaseAuth.MultiFactorTotpSecretHostApi.setUp(messenger, null);

channel = null;
messenger = null;
Expand Down Expand Up @@ -189,11 +189,11 @@ public void useEmulator(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String host,
@NonNull Long port,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
try {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
firebaseAuth.useEmulator(host, port.intValue());
result.success(null);
result.success();
} catch (Exception e) {
result.error(e);
}
Expand All @@ -203,14 +203,14 @@ public void useEmulator(
public void applyActionCode(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String code,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
firebaseAuth
.applyActionCode(code)
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down Expand Up @@ -247,15 +247,15 @@ public void confirmPasswordReset(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String code,
@NonNull String newPassword,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);

firebaseAuth
.confirmPasswordReset(code, newPassword)
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down Expand Up @@ -445,7 +445,7 @@ public void signInWithProvider(
@Override
public void signOut(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
try {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);
if (firebaseAuth.getCurrentUser() != null) {
Expand All @@ -456,7 +456,7 @@ public void signOut(
}
}
firebaseAuth.signOut();
result.success(null);
result.success();
} catch (Exception e) {
result.error(e);
}
Expand Down Expand Up @@ -489,7 +489,7 @@ public void sendPasswordResetEmail(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String email,
@Nullable GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);

if (actionCodeSettings == null) {
Expand All @@ -498,7 +498,7 @@ public void sendPasswordResetEmail(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand All @@ -513,7 +513,7 @@ public void sendPasswordResetEmail(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand All @@ -527,15 +527,15 @@ public void sendSignInLinkToEmail(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String email,
@NonNull GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);

firebaseAuth
.sendSignInLinkToEmail(email, PigeonParser.getActionCodeSettings(actionCodeSettings))
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down Expand Up @@ -568,7 +568,7 @@ public void setLanguageCode(
public void setSettings(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull GeneratedAndroidFirebaseAuth.PigeonFirebaseAuthSettings settings,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
try {
FirebaseAuth firebaseAuth = getAuthFromPigeon(app);

Expand All @@ -589,7 +589,7 @@ public void setSettings(
settings.getPhoneNumber(), settings.getSmsCode());
}

result.success(null);
result.success();
} catch (Exception e) {
result.error(e);
}
Expand Down Expand Up @@ -672,8 +672,9 @@ public void verifyPhoneNumber(
public void revokeTokenWithAuthorizationCode(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String authorizationCode,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
// Should never get here as we throw Exception on Dart side.
result.success();
}

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

if (user != null) {
final Object parsedUser = user.toList();
constants.put("APP_CURRENT_USER", parsedUser);
constants.put("APP_CURRENT_USER", PigeonParser.manuallyToList(user));
}

taskCompletionSource.setResult(constants);
Expand Down
16 changes: 8 additions & 8 deletions ..._auth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseAuthUser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public static FirebaseUser getCurrentUserFromPigeon(
@Override
public void delete(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseUser firebaseUser = getCurrentUserFromPigeon(app);

if (firebaseUser == null) {
Expand All @@ -59,7 +59,7 @@ public void delete(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down Expand Up @@ -253,7 +253,7 @@ public void reload(
public void sendEmailVerification(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@Nullable GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseUser firebaseUser = getCurrentUserFromPigeon(app);

if (firebaseUser == null) {
Expand All @@ -267,7 +267,7 @@ public void sendEmailVerification(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand All @@ -282,7 +282,7 @@ public void sendEmailVerification(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down Expand Up @@ -508,7 +508,7 @@ public void verifyBeforeUpdateEmail(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String newEmail,
@Nullable GeneratedAndroidFirebaseAuth.PigeonActionCodeSettings actionCodeSettings,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
FirebaseUser firebaseUser = getCurrentUserFromPigeon(app);

if (firebaseUser == null) {
Expand All @@ -522,7 +522,7 @@ public void verifyBeforeUpdateEmail(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand All @@ -537,7 +537,7 @@ public void verifyBeforeUpdateEmail(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down
12 changes: 6 additions & 6 deletions ...th/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseMultiFactor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public void enrollPhone(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull GeneratedAndroidFirebaseAuth.PigeonPhoneMultiFactorAssertion assertion,
@Nullable String displayName,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
final MultiFactor multiFactor;
try {
multiFactor = getAppMultiFactor(app);
Expand All @@ -82,7 +82,7 @@ public void enrollPhone(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand All @@ -96,7 +96,7 @@ public void enrollTotp(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String assertionId,
@Nullable String displayName,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
final MultiFactor multiFactor;
try {
multiFactor = getAppMultiFactor(app);
Expand All @@ -113,7 +113,7 @@ public void enrollTotp(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down Expand Up @@ -160,7 +160,7 @@ public void getSession(
public void unenroll(
@NonNull GeneratedAndroidFirebaseAuth.AuthPigeonFirebaseApp app,
@NonNull String factorUid,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
final MultiFactor multiFactor;
try {
multiFactor = getAppMultiFactor(app);
Expand All @@ -174,7 +174,7 @@ public void unenroll(
.addOnCompleteListener(
task -> {
if (task.isSuccessful()) {
result.success(null);
result.success();
} else {
result.error(
FlutterFirebaseAuthPluginException.parserExceptionToFlutter(
Expand Down
4 changes: 2 additions & 2 deletions ...uth/android/src/main/java/io/flutter/plugins/firebase/auth/FlutterFirebaseTotpSecret.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ public void generateQrCodeUrl(
public void openInOtpApp(
@NonNull String secretKey,
@NonNull String qrCodeUrl,
@NonNull GeneratedAndroidFirebaseAuth.Result<Void> result) {
@NonNull GeneratedAndroidFirebaseAuth.VoidResult result) {
final TotpSecret secret = FlutterFirebaseTotpMultiFactor.multiFactorSecret.get(secretKey);
assert secret != null;
secret.openInOtpApp(qrCodeUrl);
result.success(null);
result.success();
}
}

0 comments on commit 5e76153

Please sign in to comment.