Merge pull request #950 from firebase/release-4.11.0

Release 4.11.0

Author: paulb777

Example/Auth/Sample/MainViewController.m

@@ -96,6 +96,11 @@
  */
 static NSString *const kSignInWithEmailLink = @"Sign in with Email Link";
 
+/** @var kVerifyEmailLinkAccount
+    @brief The text of the "Verify Email-link Account" button.
+ */
+static NSString *const kVerifyEmailLinkAccount = @"Verify Email-link Account";
+
 /** @var kSendEmailSignInLink
     @brief The text of the "Send Email SignIn link" button
 */
@@ -739,6 +744,8 @@ - (void)updateTable {
                                            action:^{ [weakSelf signInGoogle]; }],
         [StaticContentTableViewCell cellWithTitle:kSignInWithEmailLink
                                            action:^{ [weakSelf signInWithEmailLink]; }],
+        [StaticContentTableViewCell cellWithTitle:kVerifyEmailLinkAccount
+                                           action:^{ [weakSelf verifyEmailLinkAccount]; }],
         [StaticContentTableViewCell cellWithTitle:kSendEmailSignInLink
                                            action:^{ [weakSelf sendEmailSignInLink]; }],
         [StaticContentTableViewCell cellWithTitle:kSignInGoogleAndRetrieveDataButtonText
@@ -1784,6 +1791,29 @@ - (void)signInWithEmailLink {
   }];
 }
 
+/** @fn verifyEmailLinkAccount
+    @brief Invoked to verify that the current user is an email-link user.
+ */
+- (void)verifyEmailLinkAccount {
+  if (![FIRAuth auth].currentUser.email) {
+    [self showMessagePrompt:@"There is no signed-in user available."];
+    return;
+  }
+  [[FIRAuth auth] fetchSignInMethodsForEmail:[FIRAuth auth].currentUser.email
+                                  completion:^(NSArray<NSString *> *_Nullable signInMethods,
+                                               NSError *_Nullable error) {
+    if (error) {
+      [self showMessagePrompt:@"There was an error fetching sign-in methods."];
+      return;
+    }
+    if (![signInMethods containsObject:FIREmailLinkAuthSignInMethod]) {
+      [self showMessagePrompt:@"Error: The current user is NOT an email-link user."];
+      return;
+    }
+    [self showMessagePrompt:@"The current user is an email-link user."];
+  }];
+}
+
 /** @fn sendEmailSignInLink
     @brief Invoked when "Send email sign-in link" row is pressed.
  */

Example/Podfile

@@ -8,7 +8,7 @@ target 'Core_Example_iOS' do
   # The next line is the forcing function for the Firebase pod. The Firebase
   # version's subspecs should depend on the component versions in their
   # corresponding podspec's.
-  pod 'Firebase/Core', '4.10.1'
+  pod 'Firebase/Core', '4.11.0'
 
   target 'Core_Tests_iOS' do
     inherit! :search_paths

Firebase/Auth/Source/FIRAuth.m

@@ -533,7 +533,7 @@ - (void)fetchSignInMethodsForEmail:(nonnull NSString *)email
     FIRCreateAuthURIRequest *request =
         [[FIRCreateAuthURIRequest alloc] initWithIdentifier:email
                                                 continueURI:@"http://www.google.com/"
-                                       requestConfiguration:_requestConfiguration];
+                                       requestConfiguration:self->_requestConfiguration];
     [FIRAuthBackend createAuthURI:request callback:^(FIRCreateAuthURIResponse *_Nullable response,
                                                      NSError *_Nullable error) {
       if (completion) {
@@ -1124,7 +1124,7 @@ - (void)sendSignInLinkToEmail:(nonnull NSString *)email
     FIRGetOOBConfirmationCodeRequest *request =
         [FIRGetOOBConfirmationCodeRequest signInWithEmailLinkRequest:email
                                                   actionCodeSettings:actionCodeSettings
-                                                requestConfiguration:_requestConfiguration];
+                                                requestConfiguration:self->_requestConfiguration];
     [FIRAuthBackend getOOBConfirmationCode:request
                                   callback:^(FIRGetOOBConfirmationCodeResponse *_Nullable response,
                                              NSError *_Nullable error) {

Firebase/Auth/Source/FIRAuthProvider.m

@@ -16,6 +16,8 @@
 
 #import <Foundation/Foundation.h>
 
+#pragma mark - Provider ID constants
+
 // Declared 'extern' in FIRGoogleAuthProvider.h
 NSString *const FIRGoogleAuthProviderID = @"google.com";
 
@@ -36,3 +38,26 @@
 
 // Declared 'extern' in FIRPhoneAuthProvider.h
 NSString *const FIRPhoneAuthProviderID = @"phone";
+
+#pragma mark - sign-in methods constants
+
+// Declared 'extern' in FIRGoogleAuthProvider.h
+NSString *const FIRGoogleAuthSignInMethod = @"google.com";
+
+// Declared 'extern' in FIREmailAuthProvider.h
+NSString *const FIREmailPasswordAuthSignInMethod = @"password";
+
+// Declared 'extern' in FIREmailAuthProvider.h
+NSString *const FIREmailLinkAuthSignInMethod = @"emailLink";
+
+// Declared 'extern' in FIRTwitterAuthProvider.h
+NSString *const FIRTwitterAuthSignInMethod = @"twitter.com";
+
+// Declared 'extern' in FIRFacebookAuthProvider.h
+NSString *const FIRFacebookAuthSignInMethod = @"facebook.com";
+
+// Declared 'extern' in FIRGitHubAuthProvider.h
+NSString *const FIRGitHubAuthSignInMethod = @"github.com";
+
+// Declared 'extern' in FIRPhoneAuthProvider.h
+NSString *const FIRPhoneAuthSignInMethod = @"phone";

Firebase/Auth/Source/Public/FIREmailAuthProvider.h

@@ -25,6 +25,17 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString *const FIREmailAuthProviderID NS_SWIFT_NAME(EmailAuthProviderID);
 
+/**
+    @brief A string constant identifying the email-link sign-in method.
+ */
+extern NSString *const FIREmailLinkAuthSignInMethod NS_SWIFT_NAME(EmailLinkAuthSignInMethod);
+
+/**
+    @brief A string constant identifying the email & password sign-in method.
+ */
+extern NSString *const FIREmailPasswordAuthSignInMethod
+    NS_SWIFT_NAME(EmailPasswordAuthSignInMethod);
+
 /**
     @brief Please use `FIREmailAuthProviderID` for Objective-C or `EmailAuthProviderID` for Swift instead.
  */

Firebase/Auth/Source/Public/FIRFacebookAuthProvider.h

@@ -25,6 +25,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString *const FIRFacebookAuthProviderID NS_SWIFT_NAME(FacebookAuthProviderID);
 
+/**
+    @brief A string constant identifying the Facebook sign-in method.
+ */
+extern NSString *const _Nonnull FIRFacebookAuthSignInMethod NS_SWIFT_NAME(FacebookAuthSignInMethod);
+
 /** @class FIRFacebookAuthProvider
     @brief Utility class for constructing Facebook credentials.
  */

Firebase/Auth/Source/Public/FIRGitHubAuthProvider.h

@@ -25,6 +25,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString *const FIRGitHubAuthProviderID NS_SWIFT_NAME(GitHubAuthProviderID);
 
+/**
+    @brief A string constant identifying the GitHub sign-in method.
+ */
+extern NSString *const _Nonnull FIRGitHubAuthSignInMethod NS_SWIFT_NAME(GitHubAuthSignInMethod);
+
+
 /** @class FIRGitHubAuthProvider
     @brief Utility class for constructing GitHub credentials.
  */

Firebase/Auth/Source/Public/FIRGoogleAuthProvider.h

@@ -25,6 +25,11 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString *const FIRGoogleAuthProviderID NS_SWIFT_NAME(GoogleAuthProviderID);
 
+/**
+    @brief A string constant identifying the Google sign-in method.
+ */
+extern NSString *const _Nonnull FIRGoogleAuthSignInMethod NS_SWIFT_NAME(GoogleAuthSignInMethod);
+
 /** @class FIRGoogleAuthProvider
     @brief Utility class for constructing Google Sign In credentials.
  */

Firebase/Auth/Source/Public/FIRPhoneAuthProvider.h

@@ -27,6 +27,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString *const FIRPhoneAuthProviderID NS_SWIFT_NAME(PhoneAuthProviderID);
 
+/** @var FIRPhoneAuthProviderID
+    @brief A string constant identifying the phone sign-in method.
+ */
+extern NSString *const _Nonnull FIRPhoneAuthSignInMethod NS_SWIFT_NAME(PhoneAuthSignInMethod);
+
+
 /** @typedef FIRVerificationResultCallback
     @brief The type of block invoked when a request to send a verification code has finished.
 

Firebase/Auth/Source/Public/FIRTwitterAuthProvider.h

@@ -25,6 +25,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 extern NSString *const FIRTwitterAuthProviderID NS_SWIFT_NAME(TwitterAuthProviderID);
 
+/**
+    @brief A string constant identifying the Twitter sign-in method.
+ */
+extern NSString *const _Nonnull FIRTwitterAuthSignInMethod NS_SWIFT_NAME(TwitterAuthSignInMethod);
+
+
 /** @class FIRTwitterAuthProvider
     @brief Utility class for constructing Twitter credentials.
  */

Firebase/Core/FIROptions.m

@@ -43,7 +43,7 @@
 NSString *const kFIRLibraryVersionID =
     @"4"     // Major version (one or more digits)
     @"00"    // Minor version (exactly 2 digits)
-    @"17"    // Build number (exactly 2 digits)
+    @"18"    // Build number (exactly 2 digits)
     @"000";  // Fixed "000"
 // Plist file name.
 NSString *const kServiceInfoFileName = @"GoogleService-Info";

FirebaseAuth.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseAuth'
-  s.version          = '4.4.4'
+  s.version          = '4.5.0'
   s.summary          = 'The official iOS client for Firebase Authentication'
 
   s.description      = <<-DESC

FirebaseCore.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'FirebaseCore'
-  s.version          = '4.0.17'
+  s.version          = '4.0.18'
   s.summary          = 'Firebase Core for iOS'
 
   s.description      = <<-DESC

FirebaseFirestore.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FirebaseFirestore'
-  s.version          = '0.10.3'
+  s.version          = '0.10.4'
   s.summary          = 'Google Cloud Firestore for iOS'
 
   s.description      = <<-DESC

FirebaseFunctions.podspec

@@ -0,0 +1,33 @@
+#
+# Be sure to run `pod lib lint FirebaseFunctions.podspec' to ensure this is a
+# valid spec before submitting.
+#
+# Any lines starting with a # are optional, but their use is encouraged
+# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
+#
+
+Pod::Spec.new do |s|
+  s.name             = 'FirebaseFunctions'
+  s.version          = '1.0.0'
+  s.summary          = 'Cloud Functions for Firebase iOS SDK.'
+
+  s.description      = <<-DESC
+iOS SDK for Cloud Functions for Firebase.
+                       DESC
+
+  s.homepage         = 'https://developers.google.com/'
+  s.authors          = 'Google, Inc.'
+  s.source           = { :git => 'https://github.com/TBD/FirebaseFunctions.git', :tag => s.version.to_s }
+
+  s.ios.deployment_target = '8.0'
+
+  s.cocoapods_version = '>= 1.4.0'
+  s.static_framework = true
+  s.prefix_header_file = false
+
+  s.source_files = 'Functions/FirebaseFunctions/**/*'
+  s.public_header_files = 'Functions/FirebaseFunctions/Public/*.h'
+
+  s.dependency 'FirebaseCore', '~> 4.0'
+  s.dependency 'GTMSessionFetcher/Core', '~> 1.1'
+end

Firestore/Example/Podfile

@@ -1,7 +1,7 @@
 # The next line is the forcing function for the Firebase pod. The Firebase
 # version's subspecs should depend on the component versions in their
 # corresponding podspec's.
-pod 'Firebase/Core', '4.10.1'
+pod 'Firebase/Core', '4.11.0'
 
 use_frameworks!
 platform :ios, '8.0'

Firestore/Source/Util/FSTDispatchQueue.mm

@@ -230,8 +230,11 @@ - (FSTDelayedCallback *)dispatchAfterDelay:(NSTimeInterval)delay
                                      block:(void (^)(void))block {
   // While not necessarily harmful, we currently don't expect to have multiple callbacks with the
   // same timerID in the queue, so defensively reject them.
-  FSTAssert(![self containsDelayedCallbackWithTimerID:timerID],
-            @"Attempted to schedule multiple callbacks with id %ld", (unsigned long)timerID);
+  // TODO(b/74749605): If a user change happens while offline we can end up with multiple backoff
+  // callbacks in the dispatch queue. This is non-harmful so I'm just disabling the assert until we
+  // get that cleaned up.
+  // FSTAssert(![self containsDelayedCallbackWithTimerID:timerID],
+  //           @"Attempted to schedule multiple callbacks with id %ld", (unsigned long)timerID);
   FSTDelayedCallback *delayedCallback = [FSTDelayedCallback createAndScheduleWithQueue:self
                                                                                timerID:timerID
                                                                                  delay:delay

Functions/.clang-format

@@ -0,0 +1,7 @@
+BasedOnStyle: Google
+ColumnLimit: 100
+BinPackParameters: false
+AllowAllParametersOfDeclarationOnNextLine: true
+ObjCSpaceBeforeProtocolList: false
+SpacesInContainerLiterals: true
+PointerAlignment: Right

Functions/Backend/index.js

@@ -0,0 +1,95 @@
+const assert = require('assert');
+const functions = require('firebase-functions');
+
+exports.dataTest = functions.https.onRequest((request, response) => {
+  assert.deepEqual(request.body, {
+    data: {
+      bool: true,
+      int: 2,
+      long: {
+        value: '3',
+        '@type': 'type.googleapis.com/google.protobuf.Int64Value',
+      },
+      string: 'four',
+      array: [5, 6],
+      'null': null,
+    }
+  });
+  response.send({
+    data: {
+      message: 'stub response',
+      code: 42,
+      long: {
+        value: '420',
+        '@type': 'type.googleapis.com/google.protobuf.Int64Value',
+      },
+    }
+  });
+});
+
+exports.scalarTest = functions.https.onRequest((request, response) => {
+  assert.deepEqual(request.body, { data: 17 });
+  response.send({ data: 76 });
+});
+
+exports.tokenTest = functions.https.onRequest((request, response) => {
+  assert.equal('Bearer token', request.get('Authorization'));
+  assert.deepEqual(request.body, { data: {} });
+  response.send({ data: {} });
+});
+
+exports.instanceIdTest = functions.https.onRequest((request, response) => {
+  assert.equal(request.get('Firebase-Instance-ID-Token'), 'iid');
+  assert.deepEqual(request.body, { data: {} });
+  response.send({ data: {} });
+});
+
+exports.nullTest = functions.https.onRequest((request, response) => {
+  assert.deepEqual(request.body, { data: null });
+  response.send({ data: null });
+});
+
+exports.missingResultTest = functions.https.onRequest((request, response) => {
+  assert.deepEqual(request.body, { data: null });
+  response.send({});
+});
+
+exports.unhandledErrorTest = functions.https.onRequest((request, response) => {
+  // Fail in a way that the client shouldn't see.
+  throw 'nope';
+});
+
+exports.unknownErrorTest = functions.https.onRequest((request, response) => {
+  // Send an http error with a body with an explicit code.
+  response.status(400).send({
+    error: {
+      status: 'THIS_IS_NOT_VALID',
+      message: 'this should be ignored',
+    },
+  });
+});
+
+exports.explicitErrorTest = functions.https.onRequest((request, response) => {
+  // Send an http error with a body with an explicit code.
+  // Note that eventually the SDK will have a helper to automatically return
+  // the appropriate http status code for an error.
+  response.status(400).send({
+    error: {
+      status: 'OUT_OF_RANGE',
+      message: 'explicit nope',
+      details: {
+        start: 10,
+        end: 20,
+        long: {
+          value: '30',
+          '@type': 'type.googleapis.com/google.protobuf.Int64Value',
+        },
+      },
+    },
+  });
+});
+
+exports.httpErrorTest = functions.https.onRequest((request, response) => {
+  // Send an http error with no body.
+  response.status(400).send();
+});