Merge branch 'master' into mikelehen/merge-master-to-firestore-api-changes

Author: Michael Lehenbauer

.gitignore

@@ -33,6 +33,9 @@ DerivedData
 *.hmap
 *.ipa
 
+# IntelliJ
+.idea
+
 # Vim
 *.swo
 *.swp
@@ -57,4 +60,5 @@ Podfile.lock
 
 # CMake
 .downloads
-.idea/
+Debug
+Release

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode9.1
+osx_image: xcode9.2
 language: objective-c
 cache:
   - bundler
@@ -16,7 +16,9 @@ before_install:
 script:
   - "! git grep -I ' $'" # Fail on trailing whitespace in non-binary files
   - ./test.sh
-  - bundle exec pod lib lint FirebaseCore.podspec
+
+# TODO fix os_log deprecation warning in FIRLogger to remove --allow-warnings
+  - bundle exec pod lib lint FirebaseCore.podspec --allow-warnings
 
 # TODO - Uncomment subsequent lines once FirebaseCore source repo is in public Specs repo
 #  - bundle exec pod lib lint FirebaseAuth.podspec

CMakeLists.txt

@@ -17,15 +17,27 @@
 cmake_minimum_required(VERSION 2.8.11)
 project(firebase C CXX)
 
+# If no build type is specified, make it a debug build
+if(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Debug)
+endif()
+
+if(APPLE)
+  # When building on the apple platform certain Objective-C++ classes bridge
+  # back into other Firebase Cocoapods. This requires shelling out to xcodebuild
+  # to verify the built frameworks are up-to-date. You can disable this to speed
+  # up the build.
+  option(BUILD_PODS, "Always build dependent cocoapods." ON)
+endif(APPLE)
+
 list(INSERT CMAKE_MODULE_PATH 0 ${PROJECT_SOURCE_DIR}/cmake)
 
-# External Projects install into this prefix and download into the source tree
-# to avoid re-downloading repeatedly during development.
-set(FIREBASE_INSTALL_DIR "${PROJECT_BINARY_DIR}/usr")
-set(FIREBASE_DOWNLOAD_DIR "${PROJECT_SOURCE_DIR}/.downloads")
+set(FIREBASE_INSTALL_DIR ${PROJECT_BINARY_DIR})
 
 enable_testing()
 
+include(external/FirebaseCore)
+
 include(external/googletest)
-include(external/abseil-cpp)
+include(external/leveldb)
 include(external/firestore)

Example/Auth/ApiTests/AuthCredentialsTemplate.h

@@ -50,6 +50,9 @@ The name of the test user for Facebook Login.
 $KCUSTOM_AUTH_TOKEN_URL
 A URL to return a Custom Auth token.
 
+$KCUSTOM_AUTH_TOKEN_EXPIRED_URL
+A URL to return an expired Custom Auth token.
+
 $KCUSTOM_AUTH_USER_ID
 The ID of the test user in the Custom Auth token.
 */
@@ -61,4 +64,5 @@ The ID of the test user in the Custom Auth token.
 #define KFACEBOOK_APP_ACCESS_TOKEN $KFACEBOOK_APP_ACCESS_TOKEN
 #define KFACEBOOK_USER_NAME $KFACEBOOK_USER_NAME
 #define KCUSTOM_AUTH_TOKEN_URL $KCUSTOM_AUTH_TOKEN_URL
+#define KCUSTOM_AUTH_TOKEN_EXPIRED_URL $KCUSTOM_AUTH_TOKEN_EXPIRED_URL
 #define KCUSTOM_AUTH_USER_ID $KCUSTOM_AUTH_USER_ID

Example/Auth/ApiTests/FirebaseAuthApiTests.m

@@ -36,6 +36,10 @@
 /** The url for obtaining a valid custom token string used to test Custom Auth. */
 static NSString *const kCustomTokenUrl = KCUSTOM_AUTH_TOKEN_URL;
 
+/** The url for obtaining an expired but valid custom token string used to test Custom Auth failure.
+ */
+static NSString *const kExpiredCustomTokenUrl = KCUSTOM_AUTH_TOKEN_EXPIRED_URL;
+
 /** Facebook app access token that will be used for Facebook Graph API, which is different from
  * account access token.
  */
@@ -59,6 +63,12 @@
 /** The testing email address for testSignInExistingUserWithEmailAndPassword. */
 static NSString *const kExistingTestingEmailToSignIn = @"[email protected]";
 
+/** The testing email address for testUpdatingUsersEmail. */
+static NSString *const kNewTestingEmail = @"[email protected]";
+
+/** The testing password for testSignInExistingUserWithModifiedEmailAndPassword. */
+static NSString *const kNewTestingPasswordToSignIn = @"password_new";
+
 /** Error message for invalid custom token sign in. */
 NSString *kInvalidTokenErrorMessage =
     @"The custom token format is incorrect. Please check the documentation.";
@@ -71,7 +81,7 @@
  */
 NSString *kGoogleTestAccountRefreshToken = KGOOGLE_TEST_ACCOUNT_REFRESH_TOKEN;
 
-static NSTimeInterval const kExpectationsTimeout = 30;
+static NSTimeInterval const kExpectationsTimeout = 10;
 
 #ifdef NO_NETWORK
 #define SKIP_IF_ON_MOBILE_HARNESS                                                                  \
@@ -141,6 +151,38 @@ - (void)testCreateAccountWithEmailAndPassword {
   [self deleteCurrentFirebaseUser];
 }
 
+- (void)testUpdatingUsersEmail {
+  SKIP_IF_ON_MOBILE_HARNESS
+  FIRAuth *auth = [FIRAuth auth];
+  if (!auth) {
+    XCTFail(@"Could not obtain auth object.");
+  }
+
+  __block NSError *apiError;
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"Created account with email and password."];
+  [auth createUserWithEmail:kTestingEmailToCreateUser
+                   password:@"password"
+                 completion:^(FIRUser *user, NSError *error) {
+                   apiError = error;
+                   [expectation fulfill];
+                 }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout handler:nil];
+  expectation = [self expectationWithDescription:@"Created account with email and password."];
+  XCTAssertEqualObjects(auth.currentUser.email, kTestingEmailToCreateUser);
+  XCTAssertNil(apiError);
+  [auth.currentUser updateEmail:kNewTestingEmail
+                     completion:^(NSError *_Nullable error) {
+    apiError = error;
+    [expectation fulfill];
+  }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout handler:nil];
+  XCTAssertNil(apiError);
+  XCTAssertEqualObjects(auth.currentUser.email, kNewTestingEmail);
+  // Clean up the created Firebase user for future runs.
+  [self deleteCurrentFirebaseUser];
+}
+
 - (void)testLinkAnonymousAccountToFacebookAccount {
   FIRAuth *auth = [FIRAuth auth];
   if (!auth) {
@@ -253,6 +295,92 @@ - (void)testSignInWithValidCustomAuthToken {
   XCTAssertEqualObjects(auth.currentUser.uid, kCustomAuthTestingAccountUserID);
 }
 
+- (void)testSignInWithValidCustomAuthExpiredToken {
+  FIRAuth *auth = [FIRAuth auth];
+  if (!auth) {
+    XCTFail(@"Could not obtain auth object.");
+  }
+
+  NSError *error;
+  NSString *customToken =
+    [NSString stringWithContentsOfURL:[NSURL URLWithString:kExpiredCustomTokenUrl]
+                             encoding:NSUTF8StringEncoding
+                                error:&error];
+  if (!customToken) {
+    XCTFail(@"There was an error retrieving the custom token: %@", error);
+  }
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"CustomAuthToken sign-in finished."];
+
+  __block NSError *apiError;
+  [auth signInWithCustomToken:customToken
+                   completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+                     if (error) {
+                       apiError = error;
+                     }
+                     [expectation fulfill];
+                   }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout
+                               handler:^(NSError *error) {
+                                 if (error != nil) {
+                                   XCTFail(@"Failed to wait for expectations "
+                                           @"in CustomAuthToken sign in. Error: %@",
+                                           error.localizedDescription);
+                                 }
+                               }];
+
+  XCTAssertNil(auth.currentUser);
+  XCTAssertEqual(apiError.code, FIRAuthErrorCodeInvalidCustomToken);
+}
+
+- (void)testInMemoryUserAfterSignOut {
+  FIRAuth *auth = [FIRAuth auth];
+  if (!auth) {
+    XCTFail(@"Could not obtain auth object.");
+  }
+  NSError *error;
+  NSString *customToken = [NSString stringWithContentsOfURL:[NSURL URLWithString:kCustomTokenUrl]
+                                                   encoding:NSUTF8StringEncoding
+                                                      error:&error];
+  if (!customToken) {
+    XCTFail(@"There was an error retrieving the custom token: %@", error);
+  }
+  XCTestExpectation *expectation =
+      [self expectationWithDescription:@"CustomAuthToken sign-in finished."];
+  __block NSError *rpcError;
+  [auth signInWithCustomToken:customToken
+                   completion:^(FIRUser *_Nullable user, NSError *_Nullable error) {
+                     if (error) {
+                       rpcError = error;
+                     }
+                     [expectation fulfill];
+  }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout
+                               handler:^(NSError *error) {
+                                 if (error != nil) {
+                                   XCTFail(@"Failed to wait for expectations "
+                                           @"in CustomAuthToken sign in. Error: %@",
+                                           error.localizedDescription);
+                                 }
+  }];
+  XCTAssertEqualObjects(auth.currentUser.uid, kCustomAuthTestingAccountUserID);
+  XCTAssertNil(rpcError);
+  FIRUser *inMemoryUser = auth.currentUser;
+  XCTestExpectation *expectation1 = [self expectationWithDescription:@"Profile data change."];
+  [auth signOut:NULL];
+  rpcError = nil;
+  NSString *newEmailAddress = [self fakeRandomEmail];
+  XCTAssertNotEqualObjects(newEmailAddress, inMemoryUser.email);
+  [inMemoryUser updateEmail:newEmailAddress completion:^(NSError *_Nullable error) {
+    rpcError = error;
+    [expectation1 fulfill];
+  }];
+  [self waitForExpectationsWithTimeout:kExpectationsTimeout handler:nil];
+  XCTAssertEqualObjects(inMemoryUser.email, newEmailAddress);
+  XCTAssertNil(rpcError);
+  XCTAssertNil(auth.currentUser);
+}
+
 - (void)testSignInWithInvalidCustomAuthToken {
   FIRAuth *auth = [FIRAuth auth];
   if (!auth) {
@@ -354,6 +482,17 @@ - (void)testSignInWithGoogle {
 
 #pragma mark - Helpers
 
+/** Generate fake random email address */
+- (NSString *)fakeRandomEmail {
+  NSMutableString *fakeEmail = [[NSMutableString alloc] init];
+  for (int i=0; i<10; i++) {
+    [fakeEmail appendString:
+        [NSString stringWithFormat:@"%c", 'a' + arc4random_uniform('z' - 'a' + 1)]];
+  }
+  [fakeEmail appendString:@"@gmail.com"];
+  return fakeEmail;
+}
+
 /** Sign out current account. */
 - (void)signOut {
   NSError *signOutError;

Example/Auth/App/GoogleService-Info.plist

@@ -10,8 +10,6 @@
 	<string>correct_client_id</string>
 	<key>REVERSED_CLIENT_ID</key>
 	<string>correct_reversed_client_id</string>
-	<key>ANDROID_CLIENT_ID</key>
-	<string>correct_android_client_id</string>
 	<key>GOOGLE_APP_ID</key>
 	<string>1:123:ios:123abc</string>
 	<key>GCM_SENDER_ID</key>

Example/Auth/App/tvOS/AppDelegate.h

@@ -0,0 +1,21 @@
+// Copyright 2017 Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#import <UIKit/UIKit.h>
+
+@interface AppDelegate : UIResponder <UIApplicationDelegate>
+
+@property(strong, nonatomic) UIWindow *window;
+
+@end

Example/Auth/App/tvOS/AppDelegate.m

@@ -0,0 +1,63 @@
+// Copyright 2017 Google
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+@import FirebaseCore;
+@import FirebaseAuth;
+
+#import "AppDelegate.h"
+
+@interface AppDelegate ()
+
+@end
+
+@implementation AppDelegate
+
+- (BOOL)application:(UIApplication *)application
+    didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
+  // Override point for customization after application launch.
+  [FIRApp configure];
+  return YES;
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+  // Sent when the application is about to move from active to inactive state. This can occur for
+  // certain types of temporary interruptions (such as an incoming phone call or SMS message) or
+  // when the user quits the application and it begins the transition to the background state. Use
+  // this method to pause ongoing tasks, disable timers, and throttle down OpenGL ES frame rates.
+  // Games should use this method to pause the game.
+}
+
+- (void)applicationDidEnterBackground:(UIApplication *)application {
+  // Use this method to release shared resources, save user data, invalidate timers, and store
+  // enough application state information to restore your application to its current state in case
+  // it is terminated later. If your application supports background execution, this method is
+  // called instead of applicationWillTerminate: when the user quits.
+}
+
+- (void)applicationWillEnterForeground:(UIApplication *)application {
+  // Called as part of the transition from the background to the active state; here you can undo
+  // many of the changes made on entering the background.
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+  // Restart any tasks that were paused (or not yet started) while the application was inactive. If
+  // the application was previously in the background, optionally refresh the user interface.
+}
+
+- (void)applicationWillTerminate:(UIApplication *)application {
+  // Called when the application is about to terminate. Save data if appropriate. See also
+  // applicationDidEnterBackground:.
+}
+
+@end

Example/Auth/App/tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Content.imageset/Contents.json

@@ -0,0 +1,11 @@
+{
+  "images" : [
+    {
+      "idiom" : "tv"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Example/Auth/App/tvOS/Assets.xcassets/App Icon & Top Shelf Image.brandassets/App Icon - App Store.imagestack/Back.imagestacklayer/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}