Integrate Latest @ 238722718

Changes to all ...
- Update Firebase iOS and Android dependency versions.
- Fix links in documentation.
Changes to auth/testapp ...
- Add GameCenter support to testapp.
- Modify check for invalid provider data.
Changes to database/testapp ...
- Made the timestamp check more strict. It now checks within 15 minutes instead of 24 hours.

CL: 238722718

Author: jonsimantov

admob/testapp/Podfile

@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # AdMob test application.
 target 'testapp' do
-  pod 'Firebase/Core', '5.15.0'
-  pod 'Firebase/AdMob', '5.15.0'
+  pod 'Firebase/Core', '5.18.0'
+  pod 'Firebase/AdMob', '5.18.0'
 end

admob/testapp/readme.md

@@ -37,8 +37,8 @@ Getting Started
       - You can use "com.google.ios.admob.testapp" as the iOS Bundle ID
         while you're testing. You can omit App Store ID while testing.
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Add the following frameworks from the Firebase C++ SDK to the project:
     - frameworks/ios/universal/firebase.framework
     - frameworks/ios/universal/firebase_admob.framework
@@ -88,8 +88,8 @@ Getting Started
     - For further details please refer to the
       [general instructions for setting up an Android app with Firebase](https://firebase.google.com/docs/android/setup).
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Configure the location of the Firebase C++ SDK by setting the
     firebase\_cpp\_sdk.dir Gradle property to the SDK install directory.
     For example, in the project directory:
@@ -128,8 +128,8 @@ Getting Started
       file into a `google-services-desktop.json` file, which can then be
       placed in the root directory of the testapp.
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Configure the testapp with the location of the Firebase C++ SDK.
     This can be done a couple different ways:
     - When invoking cmake, pass in the location with
@@ -162,7 +162,7 @@ Getting Started
 Support
 -------
 
-[https://firebase.google.com/support/]()
+[https://firebase.google.com/support/](https://firebase.google.com/support/)
 
 License
 -------

analytics/testapp/Podfile

@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Analytics test application.
 target 'testapp' do
-  pod 'Firebase/Core', '5.15.0'
-  pod 'Firebase/Analytics', '5.15.0'
+  pod 'Firebase/Core', '5.18.0'
+  pod 'Firebase/Analytics', '5.18.0'
 end

analytics/testapp/readme.md

@@ -39,8 +39,8 @@ Building and Running the testapp
       console to the testapp root directory. This file identifies your iOS app
       to the Firebase backend.
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Add the following frameworks from the Firebase C++ SDK to the project:
     - frameworks/ios/universal/firebase.framework
     - frameworks/ios/universal/firebase\_analytics.framework
@@ -62,7 +62,7 @@ Building and Running the testapp
     "View --> Debug Area --> Activate Console" from the menu.
   - After 5 hours, data should be visible in the Firebase Console under the
     "Analytics" tab accessible from
-    [https://firebase.google.com/console/]().
+    [https://firebase.google.com/console/](https://firebase.google.com/console/).
 
 ### Android
   - Register your Android app with Firebase.
@@ -90,8 +90,8 @@ Building and Running the testapp
     - For further details please refer to the
       [general instructions for setting up an Android app with Firebase](https://firebase.google.com/docs/android/setup).
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Configure the location of the Firebase C++ SDK by setting the
     firebase\_cpp\_sdk.dir Gradle property to the SDK install directory.
     For example, in the project directory:
@@ -113,7 +113,7 @@ Building and Running the testapp
     the command line.
   - After 5 hours, data should be visible in the Firebase Console under the
     "Analytics" tab accessible from
-    [https://firebase.google.com/console/]().
+    [https://firebase.google.com/console/](https://firebase.google.com/console/).
 
 ### Desktop
   - Register your app with Firebase.
@@ -128,8 +128,8 @@ Building and Running the testapp
       file into a `google-services-desktop.json` file, which can then be
       placed in the root directory of the testapp.
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Configure the testapp with the location of the Firebase C++ SDK.
     This can be done a couple different ways (in highest to lowest priority):
     - When invoking cmake, pass in the location with
@@ -162,7 +162,7 @@ Building and Running the testapp
 Support
 -------
 
-[https://firebase.google.com/support/]()
+[https://firebase.google.com/support/](https://firebase.google.com/support/)
 
 License
 -------

auth/testapp/Podfile

@@ -2,6 +2,6 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Auth test application.
 target 'testapp' do
-  pod 'Firebase/Core', '5.15.0'
-  pod 'Firebase/Auth', '5.15.0'
+  pod 'Firebase/Core', '5.18.0'
+  pod 'Firebase/Auth', '5.18.0'
 end

auth/testapp/readme.md

@@ -58,8 +58,8 @@ Building and Running the testapp
       enable "Anonymous". This will allow the testapp to use email accounts and
       anonymous sign-in.
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Add the following frameworks from the Firebase C++ SDK to the project:
     - frameworks/ios/universal/firebase.framework
     - frameworks/ios/universal/firebase_auth.framework
@@ -119,8 +119,8 @@ Building and Running the testapp
     - For further details please refer to the
       [general instructions for setting up an Android app with Firebase](https://firebase.google.com/docs/android/setup).
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Configure the location of the Firebase C++ SDK by setting the
     firebase\_cpp\_sdk.dir Gradle property to the SDK install directory.
     For example, in the project directory:
@@ -154,8 +154,8 @@ Building and Running the testapp
       file into a `google-services-desktop.json` file, which can then be
       placed in the root directory of the testapp.
   - Download the Firebase C++ SDK linked from
-    [https://firebase.google.com/docs/cpp/setup]() and unzip it to a
-    directory of your choice.
+    [https://firebase.google.com/docs/cpp/setup](https://firebase.google.com/docs/cpp/setup)
+    and unzip it to a directory of your choice.
   - Configure the testapp with the location of the Firebase C++ SDK.
     This can be done a couple different ways (in highest to lowest priority):
     - When invoking cmake, pass in the location with
@@ -185,7 +185,7 @@ Building and Running the testapp
 Support
 -------
 
-[https://firebase.google.com/support/]()
+[https://firebase.google.com/support/](https://firebase.google.com/support/)
 
 License
 -------

auth/testapp/src/common_main.cc

@@ -37,6 +37,8 @@ using ::firebase::auth::FacebookAuthProvider;
 using ::firebase::auth::GitHubAuthProvider;
 using ::firebase::auth::GoogleAuthProvider;
 using ::firebase::auth::kAuthErrorFailure;
+using ::firebase::auth::kAuthErrorInvalidCredential;
+using ::firebase::auth::kAuthErrorInvalidProviderId;
 using ::firebase::auth::kAuthErrorNone;
 using ::firebase::auth::OAuthProvider;
 using ::firebase::auth::PhoneAuthProvider;
@@ -47,6 +49,10 @@ using ::firebase::auth::User;
 using ::firebase::auth::UserInfoInterface;
 using ::firebase::auth::UserMetadata;
 
+#if TARGET_OS_IPHONE
+  using ::firebase::auth::GameCenterAuthProvider;
+#endif
+
 // Set this to true, and set the email/password, to test a custom email address.
 static const bool kTestCustomEmail = false;
 static const char kCustomEmail[] = "custom.email@example.com";
@@ -874,7 +880,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
         WaitForSignInFuture(
             facebook_bad,
             "Auth::SignInWithCredential() bad Facebook credentials",
-            ::firebase::auth::kAuthErrorOperationNotAllowed, auth);
+            kAuthErrorInvalidProviderId, auth);
       }
 
       // Use bad GitHub credentials. Should fail.
@@ -885,7 +891,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
             auth->SignInWithCredential(git_hub_cred_bad);
         WaitForSignInFuture(
             git_hub_bad, "Auth::SignInWithCredential() bad GitHub credentials",
-            ::firebase::auth::kAuthErrorOperationNotAllowed, auth);
+            kAuthErrorInvalidProviderId, auth);
       }
 
       // Use bad Google credentials. Should fail.
@@ -895,7 +901,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
         Future<User*> google_bad = auth->SignInWithCredential(google_cred_bad);
         WaitForSignInFuture(
             google_bad, "Auth::SignInWithCredential() bad Google credentials",
-            kAuthErrorFailure, auth);
+            kAuthErrorInvalidCredential, auth);
       }
 
       // Use bad Google credentials, missing an optional parameter. Should fail.
@@ -905,7 +911,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
         Future<User*> google_bad = auth->SignInWithCredential(google_cred_bad);
         WaitForSignInFuture(
             google_bad, "Auth::SignInWithCredential() bad Google credentials",
-            kAuthErrorFailure, auth);
+            kAuthErrorInvalidCredential, auth);
       }
 
 #if defined(__ANDROID__)
@@ -918,10 +924,51 @@ extern "C" int common_main(int argc, const char* argv[]) {
         WaitForSignInFuture(
             play_games_bad,
             "Auth:SignInWithCredential() bad Play Games credentials",
-            kAuthErrorFailure, auth);
+            kAuthErrorInvalidCredential, auth);
       }
 #endif  // defined(__ANDROID__)
 
+#if TARGET_OS_IPHONE
+      // Test Game Center status/login
+      {
+        // Check if the current user is authenticated to GameCenter
+        bool is_authenticated = GameCenterAuthProvider::IsPlayerAuthenticated();
+        if (!is_authenticated) {
+          LogMessage("Not signed into Game Center, skipping test.");
+        } else {
+          LogMessage("Signed in, testing Game Center authentication.");
+
+          // Get the Game Center credential from the device
+          Future<Credential> game_center_credential_future =
+              GameCenterAuthProvider::GetCredential();
+          WaitForFuture(
+              game_center_credential_future,
+              "GameCenterAuthProvider::GetCredential()",
+              kAuthErrorNone);
+
+          const AuthError credential_error =
+              static_cast<AuthError>(game_center_credential_future.error());
+
+          // Only attempt to sign in if we were able to get a credential.
+          if (credential_error == kAuthErrorNone) {
+            const Credential* gc_credential_ptr =
+                game_center_credential_future.result();
+
+            if (gc_credential_ptr == nullptr) {
+              LogMessage("Failed to retrieve Game Center credential.");
+            } else {
+              Future<User*> game_center_user =
+                  auth->SignInWithCredential(*gc_credential_ptr);
+              WaitForFuture(game_center_user,
+                            "Auth::SignInWithCredential() test Game Center "
+                            "credential signin",
+                            kAuthErrorNone);
+            }
+          }
+        }
+      }
+#endif  // TARGET_OS_IPHONE
+
       // Use bad Twitter credentials. Should fail.
       {
         Credential twitter_cred_bad = TwitterAuthProvider::GetCredential(
@@ -930,7 +977,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
             auth->SignInWithCredential(twitter_cred_bad);
         WaitForSignInFuture(
             twitter_bad, "Auth::SignInWithCredential() bad Twitter credentials",
-            ::firebase::auth::kAuthErrorOperationNotAllowed, auth);
+            kAuthErrorInvalidProviderId, auth);
       }
 
       // Use bad OAuth credentials. Should fail.
@@ -940,7 +987,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
         Future<User*> oauth_bad = auth->SignInWithCredential(oauth_cred_bad);
         WaitForSignInFuture(
             oauth_bad, "Auth::SignInWithCredential() bad OAuth credentials",
-            ::firebase::auth::kAuthErrorFailure, auth);
+            kAuthErrorInvalidProviderId, auth);
       }
 
       // Test Auth::SendPasswordResetEmail().
@@ -1029,7 +1076,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
               anonymous_user->LinkWithCredential(twitter_cred_bad);
           WaitForFuture(link_bad_future,
                         "User::LinkWithCredential() with bad credential",
-                        ::firebase::auth::kAuthErrorOperationNotAllowed);
+                        kAuthErrorInvalidProviderId);
           ExpectTrue("Linking maintains user",
                      auth->current_user() == pre_link_user);
         }
@@ -1046,7 +1093,7 @@ extern "C" int common_main(int argc, const char* argv[]) {
               auth->SignInWithCredential(twitter_cred_bad);
           WaitForFuture(signin_bad_future,
                         "Auth::SignInWithCredential() with bad credential",
-                        ::firebase::auth::kAuthErrorOperationNotAllowed, auth);
+                        kAuthErrorInvalidProviderId, auth);
           ExpectTrue("Failed sign in maintains user",
                      auth->current_user() == pre_signin_user);
         }

auth/testapp/src/ios/ios_main.mm

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#import <GameKit/GameKit.h>
 #import <UIKit/UIKit.h>
 
 #include <stdarg.h>
@@ -40,6 +41,29 @@ @interface FTAViewController : UIViewController
 static UIView *g_parent_view;
 static FTAViewController *g_view_controller;
 
+void initGameCenter(UIViewController* view_controller) {
+  if (![GKLocalPlayer class])
+    return;
+
+  __weak GKLocalPlayer *localPlayer = [GKLocalPlayer localPlayer];
+  localPlayer.authenticateHandler = ^(UIViewController *gcAuthViewController, NSError *error) {
+    if (gcAuthViewController != nil) {
+      // Pause any activities that require user interaction, then present the
+      // gcAuthViewController to the player.
+      [view_controller presentViewController:gcAuthViewController animated:YES completion:nil];
+    } else if (localPlayer.isAuthenticated) {
+      // Player is already logged into Game Center
+    } else {
+      if (error) {
+        LogMessage("Unable to initialize GameCenter: %s", error.localizedDescription);
+        return;
+      } else {
+        LogMessage("Unable to initialize GameCenter: Unknown Error");
+      }
+    }
+  };
+}
+
 @implementation FTAViewController
 
 - (void)viewDidLoad {
@@ -48,6 +72,7 @@ - (void)viewDidLoad {
   dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
     const char *argv[] = {FIREBASE_TESTAPP_NAME};
     [g_shutdown_signal lock];
+    initGameCenter(self);
     g_exit_status = common_main(1, argv);
     [g_shutdown_complete signal];
   });

database/testapp/Podfile

@@ -2,7 +2,7 @@ source 'https://github.com/CocoaPods/Specs.git'
 platform :ios, '8.0'
 # Firebase Realtime Database test application.
 target 'testapp' do
-  pod 'Firebase/Core', '5.15.0'
-  pod 'Firebase/Database', '5.15.0'
-  pod 'Firebase/Auth', '5.15.0'
+  pod 'Firebase/Core', '5.18.0'
+  pod 'Firebase/Database', '5.18.0'
+  pod 'Firebase/Auth', '5.18.0'
 end