Activating the Generic IDP Federated Auth feature which was locked behind Internal_Experimental preprocessor definitions.

- Reordered User SWIG sections.  They were in two different locations (and SWIG has been known to ignore the second section) so now they're cohesive.

- Added kProviderId and ProviderId constants to the C++ and C# Auth providers, respectively.

- Reordered AuthProviders in credential.h so that they're alphabetical.

PiperOrigin-RevId: 286210488

Author: Googler

auth/src/common.cc

@@ -27,6 +27,17 @@ namespace {
 static const char kCredentialFutureIdentifier[17] = "Auth-Credentials";
 }
 
+const char* const EmailAuthProvider::kProviderId = "password";
+const char* const FacebookAuthProvider::kProviderId = "facebook.com";
+const char* const GameCenterAuthProvider::kProviderId = "gc.apple.com";
+const char* const GitHubAuthProvider::kProviderId = "github.com";
+const char* const GoogleAuthProvider::kProviderId = "google.com";
+const char* const MicrosoftAuthProvider::kProviderId = "microsoft.com";
+const char* const PhoneAuthProvider::kProviderId = "phone";
+const char* const PlayGamesAuthProvider::kProviderId = "playgames.google.com";
+const char* const TwitterAuthProvider::kProviderId = "twitter.com";
+const char* const YahooAuthProvider::kProviderId = "yahoo.com";
+
 ReferenceCountedFutureImpl* GetCredentialFutureImpl() {
   StaticFutureData* future_data = StaticFutureData::GetFutureDataForModule(
       &kCredentialFutureIdentifier, kNumCredentialFunctions);

auth/src/include/firebase/auth.h

@@ -43,12 +43,10 @@ struct AuthData;
 class AuthStateListener;
 class IdTokenListener;
 class PhoneAuthProvider;
-#ifdef INTERNAL_EXPERIMENTAL
 struct AuthCompletionHandle;
 class FederatedAuthProvider;
 class FederatedOAuthProvider;
 class SignInResult;
-#endif  // INTERNAL_EXPERIMENTAL
 
 /// @brief Firebase authentication object.
 ///
@@ -238,7 +236,6 @@ class Auth {
   /// Get results of the most recent call to @ref SignInWithCredential.
   Future<User*> SignInWithCredentialLastResult() const;
 
-#ifdef INTERNAL_EXPERIMENTAL
   /// Sign-in a user authenticated via a federated auth provider.
   ///
   /// @param[in] provider Contains information on the provider to authenticate
@@ -251,7 +248,6 @@ class Auth {
   /// code: kAuthErrorUnimplemented.
   Future<SignInResult> SignInWithProvider(
       FederatedAuthProvider* provider);
-#endif  // INTERNAL_EXPERIMENTAL
 
   /// Asynchronously logs into Firebase with the given credentials.
   ///
@@ -628,13 +624,13 @@ class IdTokenListener {
 
 #endif  // not SWIG
 
-#ifdef INTERNAL_EXPERIMENTAL
 /// @brief Used to authenticate with Federated Auth Providers.
 ///
 /// The federated auth provider implementation may facilitate multiple provider
 /// types in the future, with support for OAuth to start.
 class FederatedAuthProvider {
  public:
+#ifdef INTERNAL_EXPERIMENTAL
 #ifndef SWIG
   /// @brief Contains resulting information of a user authenticated by a
   /// Federated Auth Provider.  This information will be used by the internal
@@ -793,6 +789,7 @@ class FederatedAuthProvider {
                                 const char* error_message);
   };
 #endif  // not SWIG
+#endif  // INTERNAL_EXPERIMENTAL
 
   FederatedAuthProvider() { }
   virtual ~FederatedAuthProvider() {}
@@ -816,6 +813,7 @@ class FederatedAuthProvider {
 /// account linking and user reauthentication, respectively.
 class FederatedOAuthProvider : public FederatedAuthProvider {
  public:
+#ifdef INTERNAL_EXPERIMENTAL
 #ifndef SWIG
   /// @brief A FederatedAuthProvider typed specifically for OAuth Authentication
   /// handling.
@@ -825,6 +823,7 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
   typedef FederatedAuthProvider::Handler<FederatedOAuthProviderData>
       AuthHandler;
 #endif  // !SWIG
+#endif  // INTERNAL_EXPERIMENTAL
 
   /// Constructs an unconfigured provider.
   FederatedOAuthProvider();
@@ -864,6 +863,7 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
   /// user linking.
   void SetProviderData(const FederatedOAuthProviderData& provider_data);
 
+#ifdef INTERNAL_EXPERIMENTAL
 #ifndef SWIG
   /// @brief Configures the use of an AuthHandler for non-mobile systems.
   ///
@@ -876,6 +876,7 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
   /// of this FederatedOAuthProvider.
   void SetAuthHandler(AuthHandler* handler);
 #endif  // !SWIG
+#endif  // INTERNAL_EXPERIMENTAL
 
  private:
   friend class ::firebase::auth::Auth;
@@ -887,7 +888,6 @@ class FederatedOAuthProvider : public FederatedAuthProvider {
   FederatedOAuthProviderData provider_data_;
   AuthHandler* handler_;
 };
-#endif  // INTERNAL_EXPERIMENTAL
 
 
 }  // namespace auth

auth/src/include/firebase/auth/credential.h

@@ -54,14 +54,16 @@ class Credential {
   /// @cond FIREBASE_APP_INTERNAL
   friend class EmailAuthProvider;
   friend class FacebookAuthProvider;
+  friend class GameCenterAuthProvider;
   friend class GitHubAuthProvider;
   friend class GoogleAuthProvider;
   friend class JniAuthPhoneListener;
+  friend class MicrosoftAuthProvider;
   friend class OAuthProvider;
   friend class PhoneAuthProvider;
   friend class PlayGamesAuthProvider;
   friend class TwitterAuthProvider;
-  friend class GameCenterAuthProvider;
+  friend class YahooAuthProvider;
   /// @endcond
 #endif  // !SWIG
 
@@ -131,6 +133,9 @@ class EmailAuthProvider {
   ///
   /// @returns New Credential.
   static Credential GetCredential(const char* email, const char* password);
+
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
 };
 
 /// @brief Use an access token provided by Facebook to authenticate.
@@ -143,10 +148,30 @@ class FacebookAuthProvider {
   /// @returns New Credential.
   static Credential GetCredential(const char* access_token);
 
-#ifdef INTERNAL_EXPERIMENTAL
-  /// The provider id string used for FederatedAuth.
-  static constexpr const char* const kProviderId = "facebook.com";
-#endif  // INTERNAL_EXPERIMENTAL
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
+};
+
+/// @brief GameCenter (iOS) auth provider
+class GameCenterAuthProvider {
+ public:
+  /// Generate a credential from GameCenter for the current user.
+  ///
+  /// @return a Future that will be fulfilled with the resulting credential.
+  static Future<Credential> GetCredential();
+
+  /// Get the result of the most recent GetCredential() call.
+  ///
+  /// @return an object which can be used to retrieve the Credential.
+  static Future<Credential> GetCredentialLastResult();
+
+  /// Tests to see if the current user is signed in to GameCenter.
+  ///
+  /// @return true if the user is signed in, false otherwise.
+  static bool IsPlayerAuthenticated();
+
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
 };
 
 /// @brief Use an access token provided by GitHub to authenticate.
@@ -159,10 +184,8 @@ class GitHubAuthProvider {
   /// @returns New Credential.
   static Credential GetCredential(const char* token);
 
-#ifdef INTERNAL_EXPERIMENTAL
-  /// The provider id string used for FederatedAuth.
-  constexpr static const char* const kProviderId = "github.com";
-#endif  // INTERNAL_EXPERIMENTAL
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
 };
 
 /// @brief Use an ID token and access token provided by Google to authenticate.
@@ -177,62 +200,17 @@ class GoogleAuthProvider {
   static Credential GetCredential(const char* id_token,
                                   const char* access_token);
 
-#ifdef INTERNAL_EXPERIMENTAL
-  /// The provider id string used for FederatedAuth.
-  constexpr static const char* const kProviderId = "google.com";
-#endif  // INTERNAL_EXPERIMENTAL
-};
-
-/// @brief Use a server auth code provided by Google Play Games to authenticate.
-class PlayGamesAuthProvider {
- public:
-  /// Generate a credential from the given Server Auth Code.
-  ///
-  /// @param server_auth_code Play Games Sign in Server Auth Code.
-  ///
-  /// @returns New Credential.
-  static Credential GetCredential(const char* server_auth_code);
-
-#ifdef INTERNAL_EXPERIMENTAL
-  /// The provider id string used for FederatedAuth.
-  constexpr static const char* const kProviderId = "playgames.google.com";
-#endif  // INTERNAL_EXPERIMENTAL
-};
-
-/// @brief Use a token and secret provided by Twitter to authenticate.
-class TwitterAuthProvider {
- public:
-  /// Generate a credential from the given Twitter token and password.
-  ///
-  /// @param token The Twitter OAuth token.
-  /// @param secret The Twitter OAuth secret.
-  ///
-  /// @returns New Credential.
-  static Credential GetCredential(const char* token, const char* secret);
-
-#ifdef INTERNAL_EXPERIMENTAL
-  /// The provider id string used for FederatedAuth.
-  constexpr static const char* const kProviderId = "twitter.com";
-#endif  // INTERNAL_EXPERIMENTAL
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
 };
 
 
-#ifdef INTERNAL_EXPERIMENTAL
-/// @brief Use an access token provided by Yahoo to authenticate.
-class YahooAuthProvider {
- public:
-  /// The provider id string used for FederatedAuth.
-  constexpr static const char* const kProviderId = "yahoo.com";
-};
-
 /// @brief Use an access token provided by Microsoft to authenticate.
 class MicrosoftAuthProvider {
  public:
-  /// The provider id string used for FederatedAuth.
-  constexpr static const char* const kProviderId = "microsoft.com";
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
 };
-#endif  // INTERNAL_EXPERIMENTAL
-
 
 /// @brief OAuth2.0+UserInfo auth provider (OIDC compliant and non-compliant).
 class OAuthProvider {
@@ -248,25 +226,6 @@ class OAuthProvider {
                                   const char* access_token);
 };
 
-/// @brief GameCenter (iOS) auth provider
-class GameCenterAuthProvider {
- public:
-  /// Generate a credential from GameCenter for the current user.
-  ///
-  /// @return a Future that will be fulfilled with the resulting credential.
-  static Future<Credential> GetCredential();
-
-  /// Get the result of the most recent GetCredential() call.
-  ///
-  /// @return an object which can be used to retrieve the Credential.
-  static Future<Credential> GetCredentialLastResult();
-
-  /// Tests to see if the current user is signed in to GameCenter.
-  ///
-  /// @return true if the user is signed in, false otherwise.
-  static bool IsPlayerAuthenticated();
-};
-
 /// @brief Use phone number text messages to authenticate.
 ///
 /// Allows developers to use the phone number and SMS verification codes
@@ -595,6 +554,9 @@ class PhoneAuthProvider {
   ///    PhoneAuthProvider.
   static PhoneAuthProvider& GetInstance(Auth* auth);
 
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
+
  private:
   friend struct AuthData;
   friend class JniAuthPhoneListener;
@@ -608,6 +570,44 @@ class PhoneAuthProvider {
   PhoneAuthProviderData* data_;
 };
 
+/// @brief Use a server auth code provided by Google Play Games to authenticate.
+class PlayGamesAuthProvider {
+ public:
+  /// Generate a credential from the given Server Auth Code.
+  ///
+  /// @param server_auth_code Play Games Sign in Server Auth Code.
+  ///
+  /// @return New Credential.
+  static Credential GetCredential(const char* server_auth_code);
+
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
+};
+
+/// @brief Use a token and secret provided by Twitter to authenticate.
+class TwitterAuthProvider {
+ public:
+  /// Generate a credential from the given Twitter token and password.
+  ///
+  /// @param token The Twitter OAuth token.
+  /// @param secret The Twitter OAuth secret.
+  ///
+  /// @return New Credential.
+  static Credential GetCredential(const char* token, const char* secret);
+
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
+};
+
+
+/// @brief Use an access token provided by Yahoo to authenticate.
+class YahooAuthProvider {
+ public:
+  /// The string used to identify this provider.
+  static const char* const kProviderId;
+};
+
+
 }  // namespace auth
 }  // namespace firebase
 

auth/src/include/firebase/auth/types.h

@@ -17,11 +17,9 @@
 #ifndef FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
 #define FIREBASE_AUTH_CLIENT_CPP_SRC_INCLUDE_FIREBASE_AUTH_TYPES_H_
 
-#ifdef INTERNAL_EXPERIMENTAL
 #include <map>
 #include <string>
 #include <vector>
-#endif  // INTERNAL_EXPERIMENTAL
 
 namespace firebase {
 namespace auth {
@@ -424,7 +422,6 @@ enum AuthError {
 #endif  // INTERNAL_EXEPERIMENTAL
 };
 
-#ifdef INTERNAL_EXPERIMENTAL
 /// @brief Contains information required to authenticate with a third party
 /// provider.
 struct FederatedProviderData {
@@ -443,6 +440,7 @@ struct FederatedOAuthProviderData : FederatedProviderData {
     this->provider_id = provider;
   }
 
+  #ifndef SWIG
   /// @brief Initializes the provider data structure with the specified provider
   /// id, scopes and custom parameters.
   FederatedOAuthProviderData(
@@ -452,14 +450,14 @@ struct FederatedOAuthProviderData : FederatedProviderData {
     this->scopes = scopes;
     this->custom_parameters = custom_parameters;
   }
+  #endif
 
   /// OAuth parmeters which specify which rights of access are being requested.
   std::vector<std::string> scopes;
 
   /// OAuth parameters which are provided to the federated provider service.
   std::map<std::string, std::string> custom_parameters;
 };
-#endif  // INTERNAL_EXPERIMENTAL
 
 }  // namespace auth
 }  // namespace firebase