From cf3abb697d156af63bc65700c6c85cb36fd9b5d4 Mon Sep 17 00:00:00 2001 From: Austin Benoit Date: Wed, 23 Sep 2026 17:46:52 -0400 Subject: [PATCH 1/2] fix(auth)!: fix spelling in AuthError enum values and types.h comments --- auth/src/android/common_android.cc | 2 +- .../auth_providers/federated_auth_provider.cc | 2 +- auth/src/include/firebase/auth/types.h | 14 +++++++------- auth/tests/desktop/auth_desktop_test.cc | 2 +- auth/tests/desktop/user_desktop_test.cc | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/auth/src/android/common_android.cc b/auth/src/android/common_android.cc index a9472e1ec1..a500a928dd 100644 --- a/auth/src/android/common_android.cc +++ b/auth/src/android/common_android.cc @@ -91,7 +91,7 @@ static const ErrorCodeMapping kWebCodes[] = { kAuthErrorWebContextAlreadyPresented}, {"ERROR_WEB_CONTEXT_CANCELED", kAuthErrorWebContextCancelled}, {"ERROR_WEB_INTERNAL_ERROR", kAuthErrorWebInternalError}, - {"ERROR_WEB_STORAGE_UNSUPPORTED", kAuthErrorWebStorateUnsupported}, + {"ERROR_WEB_STORAGE_UNSUPPORTED", kAuthErrorWebStorageUnsupported}, {nullptr}, }; static const ErrorCodeMapping kFirebaseAuthCodes[] = { diff --git a/auth/src/desktop/auth_providers/federated_auth_provider.cc b/auth/src/desktop/auth_providers/federated_auth_provider.cc index 2ff8959222..9ad4f1b637 100644 --- a/auth/src/desktop/auth_providers/federated_auth_provider.cc +++ b/auth/src/desktop/auth_providers/federated_auth_provider.cc @@ -60,7 +60,7 @@ Future CreateAuthFuture(AuthData* auth_data, SafeFutureHandle handle = auth_data->future_impl.SafeAlloc(api_function); auth_data->future_impl.CompleteWithResult( - handle, kAuthErrorFederatedProviderAreadyInUse, + handle, kAuthErrorFederatedProviderAlreadyInUse, "Provider operation already in progress.", /*result=*/{}); return MakeFuture(&auth_data->future_impl, handle); diff --git a/auth/src/include/firebase/auth/types.h b/auth/src/include/firebase/auth/types.h index 3f141ad369..891de0e3df 100644 --- a/auth/src/include/firebase/auth/types.h +++ b/auth/src/include/firebase/auth/types.h @@ -76,7 +76,7 @@ enum AuthError { /// Caused by "Set account info" methods. kAuthErrorEmailAlreadyInUse, - /// Indicates the user has attemped to change email or password more than 5 + /// Indicates the user has attempted to change email or password more than 5 /// minutes after signing in, and will need to refresh the credentials. /// Caused by "Set account info" methods. kAuthErrorRequiresRecentLogin, @@ -319,7 +319,7 @@ enum AuthError { /// Indicates that 3rd party cookies or data are disabled, or that there was /// a problem with the browser. - kAuthErrorWebStorateUnsupported, + kAuthErrorWebStorageUnsupported, /// Indicates that the provided tenant ID does not match the Auth instance's /// tenant ID. @@ -400,7 +400,7 @@ enum AuthError { /// Indicates that the federated provider is busy with a previous /// authorization request. Try again when the previous authorization request /// completes. - kAuthErrorFederatedProviderAreadyInUse, + kAuthErrorFederatedProviderAlreadyInUse, /// Indicates that one or more fields of the provided AuthenticatedUserData /// are invalid. @@ -427,7 +427,7 @@ enum AuthError { /// nor a custom token provider is available. kAuthErrorTokenRefreshUnavailable, -#endif // INTERNAL_EXEPERIMENTAL +#endif // INTERNAL_EXPERIMENTAL }; /// @brief Contains information required to authenticate with a third party @@ -438,9 +438,9 @@ struct FederatedProviderData { std::string provider_id; }; -/// @brief Contains information to identify an OAuth povider. +/// @brief Contains information to identify an OAuth provider. struct FederatedOAuthProviderData : FederatedProviderData { - /// Initailizes an empty provider data structure. + /// Initializes an empty provider data structure. FederatedOAuthProviderData() {} /// Initializes the provider data structure with a provider id. @@ -460,7 +460,7 @@ struct FederatedOAuthProviderData : FederatedProviderData { } #endif - /// OAuth parmeters which specify which rights of access are being requested. + /// OAuth parameters which specify which rights of access are being requested. std::vector scopes; /// OAuth parameters which are provided to the federated provider service. diff --git a/auth/tests/desktop/auth_desktop_test.cc b/auth/tests/desktop/auth_desktop_test.cc index dc7dab7b31..7c6485ed12 100644 --- a/auth/tests/desktop/auth_desktop_test.cc +++ b/auth/tests/desktop/auth_desktop_test.cc @@ -318,7 +318,7 @@ TEST_F(AuthDesktopTest, Future future1 = firebase_auth_->SignInWithProvider(&provider1); EXPECT_EQ(future1.status(), kFutureStatusPending); Future future2 = firebase_auth_->SignInWithProvider(&provider2); - VerifyAuthResult(future2, kAuthErrorFederatedProviderAreadyInUse); + VerifyAuthResult(future2, kAuthErrorFederatedProviderAlreadyInUse); handler1.TriggerSignInComplete(); const AuthResult result = WaitForFuture(future1); } diff --git a/auth/tests/desktop/user_desktop_test.cc b/auth/tests/desktop/user_desktop_test.cc index 276bf3221c..631dcd2a42 100644 --- a/auth/tests/desktop/user_desktop_test.cc +++ b/auth/tests/desktop/user_desktop_test.cc @@ -891,7 +891,7 @@ TEST_F(UserDesktopTest, Future future1 = firebase_user_.LinkWithProvider(&provider1); EXPECT_EQ(future1.status(), kFutureStatusPending); Future future2 = firebase_user_.LinkWithProvider(&provider2); - VerifyAuthResult(future2, kAuthErrorFederatedProviderAreadyInUse); + VerifyAuthResult(future2, kAuthErrorFederatedProviderAlreadyInUse); handler1.TriggerLinkComplete(); const AuthResult result = WaitForFuture(future1); } @@ -1054,7 +1054,7 @@ TEST_F(UserDesktopTest, EXPECT_EQ(future1.status(), kFutureStatusPending); Future future2 = firebase_user_.ReauthenticateWithProvider(&provider2); - VerifyAuthResult(future2, kAuthErrorFederatedProviderAreadyInUse); + VerifyAuthResult(future2, kAuthErrorFederatedProviderAlreadyInUse); handler1.TriggerReauthenticateComplete(); const AuthResult result = WaitForFuture(future1); } From ca035738c930ebc978d058f283da1a299aea9001 Mon Sep 17 00:00:00 2001 From: Austin Benoit Date: Wed, 23 Sep 2026 17:55:40 -0400 Subject: [PATCH 2/2] docs(auth): add Upcoming release notes entry for breaking AuthError enum fixes --- release_build_files/readme.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/release_build_files/readme.md b/release_build_files/readme.md index 2f1ab1180f..9858c539ad 100644 --- a/release_build_files/readme.md +++ b/release_build_files/readme.md @@ -613,6 +613,10 @@ workflow use only during the development of your app, not for publicly shipping code. ## Release Notes +### Upcoming +- Changes + - Auth: **Breaking Change:** Fixed spelling in `AuthError` enum values (`kAuthErrorWebStorateUnsupported` -> `kAuthErrorWebStorageUnsupported` and `kAuthErrorFederatedProviderAreadyInUse` -> `kAuthErrorFederatedProviderAlreadyInUse`). + ### 13.13.0 - Changes - General (Android): Update to Firebase Android BoM version 34.19.0.