Merge public 5 25 (#79)

* Initial commit

* Initial

* Add three files in repo despite .gitignore

* Update README with context, contributing, and license sections (#3)

* Updating READMEs (#5)

* Add comments to each FIRLoggerLevel value. (#6)

Docs aren't being generated properly for FIRLoggerLevel because
it's missing the proper documentation.

* Update travis for renamed AllUnitTests scheme (#8)

* Remove double commented lines. (#11)

* Update scheme setting in test.sh (#12)

* Update travis xcode version to 8.3 (#13)

* Add CI badge to README (#14)

* Fix typos (#15)

* Adding cache to Travis builds (#17)

* Enable direct channel in the sample app (#7)

This shows the simple property, shouldEstablishDirectChannel, to open a new channel, and how to show incoming messages with the iOS 10 delegate handler

* Auth jazzy fixes and Swift sample updates (#19)

* Removes the '@c' that would cause Jazzy issue down the road.

* Update travis test to retry if error is 65 (#20)

* Fixes ApiTests and separates its credentials from Sample (#25)

* Log an error if for some reason we can't add a method to a class (#24)

Maybe it was already swizzled, or some other issue. Either way, it would be good to log this error, as it might help us / developers diagnose an issue.

* Update FIRPhoneAuthProvider reference docs (#27)

Adds reference docs error documentation to FIRPhoneAuthProvider.
Also fixes small typo in FIRAuthErrorUtils.

* Clean up logging and configuration in Messaging (#28)

* Remove mostly unused code from FIRMessagingLogger

This cleans up some left-over old logging logic from before we moved to FIRLogger in Firebase Core. We no longer need this logging functionality.

* Delete FIRMessagingConfig.{h,m}

We no longer need a config class to store an unused log level filter (that filter is no longer needed).

Author: paulb777

.travis.yml

@@ -1,9 +1,11 @@
-osx_image: xcode8.1
+osx_image: xcode8.3
 language: objective-c
-# cache: cocoapods
+cache:
+  - bundler
+  - cocoapods
 podfile: Example/Podfile
 xcode_workspace: Example/Firebase.xcworkspace
-xcode_scheme: AllTests
+xcode_scheme: AllUnitTests
 
 rvm: 2.3.1
 before_install:

BuildFrameworks/README.md

@@ -4,8 +4,8 @@
 one or more of FirebaseAuth, FirebaseCore, FirebaseDatabase, FirebaseMessaging,
 and FirebaseStorage.
 
-Frameworks built with this script can be used alongside the official Firebase
-CocoaPods and
+Frameworks built with this script can be used alongside the official [Firebase
+CocoaPods](https://cocoapods.org/pods/Firebase) and
 [zip](https://firebase.google.com/docs/ios/setup#frameworks) distributions.
 
 

Example/Messaging/App/AppDelegate.swift

@@ -50,6 +50,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     FirebaseApp.configure()
     Messaging.messaging().delegate = self
+    Messaging.messaging().shouldEstablishDirectChannel = true
 
     NotificationsController.configure()
 
@@ -110,5 +111,18 @@ extension AppDelegate: MessagingDelegate {
   func messaging(_ messaging: Messaging, didRefreshRegistrationToken fcmToken: String) {
     printFCMToken()
   }
+
+  // Direct channel data messages are delivered here, on iOS 10.0+.
+  // The `shouldEstablishDirectChannel` property should be be set to |true| before data messages can
+  // arrive.
+  func messaging(_ messaging: Messaging, didReceive remoteMessage: MessagingRemoteMessage) {
+    // Convert to pretty-print JSON
+    guard let data =
+        try? JSONSerialization.data(withJSONObject: remoteMessage.appData, options: .prettyPrinted),
+        let prettyPrinted = String(data: data, encoding: .utf8) else {
+      return
+    }
+    print("Received direct channel message:\n\(prettyPrinted)")
+  }
 }
 

Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m

@@ -22,7 +22,6 @@
 
 #import "FIRMessaging.h"
 #import "FIRMessagingClient.h"
-#import "FIRMessagingConfig.h"
 #import "FIRMessagingConnection.h"
 #import "FIRMessagingDataMessageManager.h"
 #import "FIRMessagingReceiver.h"

Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m

@@ -19,13 +19,12 @@
 #import <OCMock/OCMock.h>
 
 #import "FIRMessaging.h"
-#import "FIRMessagingConfig.h"
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingTestNotificationUtilities.h"
 
 @interface FIRMessaging ()
 
-- (instancetype)initWithConfig:(FIRMessagingConfig *)config;
+- (instancetype)initPrivately;
 - (NSURL *)linkURLFromMessage:(NSDictionary *)message;
 
 @end
@@ -41,8 +40,7 @@ @implementation FIRMessagingLinkHandlingTest
 - (void)setUp {
   [super setUp];
 
-  FIRMessagingConfig *config = [FIRMessagingConfig defaultConfig];
-  _messaging = [[FIRMessaging alloc] initWithConfig:config];
+  _messaging = [[FIRMessaging alloc] initPrivately];
 }
 
 - (void)tearDown {

Example/Messaging/Tests/FIRMessagingServiceTest.m

@@ -21,7 +21,6 @@
 
 #import "FIRMessaging.h"
 #import "FIRMessagingClient.h"
-#import "FIRMessagingConfig.h"
 #import "FIRMessagingPubSub.h"
 #import "FIRMessagingTopicsCommon.h"
 #import "InternalHeaders/FIRMessagingInternalUtilities.h"

Example/Messaging/Tests/FIRMessagingTest.m

@@ -19,7 +19,6 @@
 #import <OCMock/OCMock.h>
 
 #import "FIRMessaging.h"
-#import "FIRMessagingConfig.h"
 #import "FIRMessagingInstanceIDProxy.h"
 
 extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
@@ -30,7 +29,7 @@ @interface FIRMessaging ()
 @property(nonatomic, readwrite, strong) NSData *apnsTokenData;
 @property(nonatomic, readwrite, strong) FIRMessagingInstanceIDProxy *instanceIDProxy;
 
-- (instancetype)initWithConfig:(FIRMessagingConfig *)config;
+- (instancetype)initPrivately;
 // Direct Channel Methods
 - (void)updateAutomaticClientConnection;
 - (BOOL)shouldBeConnectedAutomatically;
@@ -49,8 +48,7 @@ @implementation FIRMessagingTest
 
 - (void)setUp {
   [super setUp];
-  FIRMessagingConfig *config = [FIRMessagingConfig defaultConfig];
-  _messaging = [[FIRMessaging alloc] initWithConfig:config];
+  _messaging = [[FIRMessaging alloc] initPrivately];
   _mockMessaging = OCMPartialMock(self.messaging);
   _mockInstanceIDProxy = OCMPartialMock(self.messaging.instanceIDProxy);
   self.messaging.instanceIDProxy = _mockInstanceIDProxy;

Firebase/Auth/Docs/threading.md

@@ -2,7 +2,7 @@
 
 This document describes how Firebase Auth maintains thread-safety. The Firebase
 Auth library (not including Firebase Auth UI and Auth Provider UIs for now)
-must be thread-safe, meaning deveopers are free to call any method in any
+must be thread-safe, meaning developers are free to call any method in any
 thread at any time. Thus, all code that may take part in race conditions must
 be protected in some way.
 
@@ -111,7 +111,7 @@ methods:
 *   The calling code should already be in the auth global work queue.
 *   The callback, if any, is provided by our own code, so it expects to called
     in the auth global work queue as well. This is usually already the case,
-    unless the method pass the callback to some other asychronous methods
+    unless the method pass the callback to some other asynchronous methods
     outside our library, in which case we need to manually make the callback
     called in the auth global work queue.
 

Firebase/Auth/README.md

@@ -3,6 +3,6 @@
 Firebase Auth enables apps to easily support multiple authentication options
 for their end users.
 
-Please visit [our developer site](https://developers.google.com/) for
+Please visit [our developer site](https://firebase.google.com/docs/auth/) for
 integration instructions, documentation, support information, and terms of
 service.

Firebase/Auth/Source/FIRAuthSwiftNameSupport.h

@@ -19,7 +19,7 @@
 #import <Foundation/Foundation.h>
 
 // NS_SWIFT_NAME can only translate factory methods before the iOS 9.3 SDK.
-// // Wrap it in our own macro if it's a non-compatible SDK.
+// Wrap it in our own macro if it's a non-compatible SDK.
 #ifdef __IPHONE_9_3
 #define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X)
 #else

Firebase/Core/FIRCoreSwiftNameSupport.h

@@ -19,7 +19,7 @@
 #import <Foundation/Foundation.h>
 
 // NS_SWIFT_NAME can only translate factory methods before the iOS 9.3 SDK.
-// // Wrap it in our own macro if it's a non-compatible SDK.
+// Wrap it in our own macro if it's a non-compatible SDK.
 #ifdef __IPHONE_9_3
 #define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X)
 #else

Firebase/Core/FIRLoggerLevel.h

@@ -20,11 +20,18 @@
  * The log levels used by internal logging.
  */
 typedef NS_ENUM(NSInteger, FIRLoggerLevel) {
-  FIRLoggerLevelError = 3 /*ASL_LEVEL_ERR*/,
-  FIRLoggerLevelWarning = 4 /*ASL_LEVEL_WARNING*/,
-  FIRLoggerLevelNotice = 5 /*ASL_LEVEL_NOTICE*/,
-  FIRLoggerLevelInfo = 6 /*ASL_LEVEL_INFO*/,
-  FIRLoggerLevelDebug = 7 /*ASL_LEVEL_DEBUG*/,
+  /** Error level, matches ASL_LEVEL_ERR. */
+  FIRLoggerLevelError = 3,
+  /** Warning level, matches ASL_LEVEL_WARNING. */
+  FIRLoggerLevelWarning = 4,
+  /** Notice level, matches ASL_LEVEL_NOTICE. */
+  FIRLoggerLevelNotice = 5,
+  /** Info level, matches ASL_LEVEL_NOTICE. */
+  FIRLoggerLevelInfo = 6,
+  /** Debug level, matches ASL_LEVEL_DEBUG. */
+  FIRLoggerLevelDebug = 7,
+  /** Minimum log level. */
   FIRLoggerLevelMin = FIRLoggerLevelError,
+  /** Maximum log level. */
   FIRLoggerLevelMax = FIRLoggerLevelDebug
 } FIR_SWIFT_NAME(FirebaseLoggerLevel);

Firebase/Database/Api/FIRDatabaseSwiftNameSupport.h

@@ -19,7 +19,7 @@
 #import <Foundation/Foundation.h>
 
 // NS_SWIFT_NAME can only translate factory methods before the iOS 9.3 SDK.
-// // Wrap it in our own macro if it's a non-compatible SDK.
+// Wrap it in our own macro if it's a non-compatible SDK.
 #ifdef __IPHONE_9_3
 #define FIR_SWIFT_NAME(X) NS_SWIFT_NAME(X)
 #else

Firebase/Messaging/FIRMMessageCode.h

@@ -120,6 +120,7 @@ typedef NS_ENUM(NSInteger, FIRMessagingMessageCode) {
   kFIRMessagingMessageCodeRemoteNotificationsProxy000 = 12000,  // I-FCM012000
   kFIRMessagingMessageCodeRemoteNotificationsProxy001 = 12001,  // I-FCM012001
   kFIRMessagingMessageCodeRemoteNotificationsProxyAPNSFailed = 12002,  // I-FCM012002
+  kFIRMessagingMessageCodeRemoteNotificationsProxyMethodNotAdded = 12003,  // I-FCM012003
   // FIRMessagingRmq2PersistentStore.m
   kFIRMessagingMessageCodeRmq2PersistentStore000 = 13000,  // I-FCM013000
   kFIRMessagingMessageCodeRmq2PersistentStore001 = 13001,  // I-FCM013001

Firebase/Messaging/FIRMessaging+FIRApp.m

@@ -19,7 +19,6 @@
 #import "FIRAppInternal.h"
 #import "FIROptionsInternal.h"
 
-#import "FIRMessagingConfig.h"
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingLogger.h"
 #import "FIRMessagingPubSub.h"

Firebase/Messaging/FIRMessaging.m

@@ -24,7 +24,6 @@
 #import <UIKit/UIKit.h>
 
 #import "FIRMessagingClient.h"
-#import "FIRMessagingConfig.h"
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingContextManagerService.h"
 #import "FIRMessagingDataMessageManager.h"
@@ -133,7 +132,6 @@ @interface FIRMessaging ()
 // Due to our packaging requirements, we can't directly depend on FIRInstanceID currently.
 @property(nonatomic, readwrite, strong) FIRMessagingInstanceIDProxy *instanceIDProxy;
 
-@property(nonatomic, readwrite, strong) FIRMessagingConfig *config;
 @property(nonatomic, readwrite, assign) BOOL isClientSetup;
 
 @property(nonatomic, readwrite, strong) FIRMessagingClient *client;
@@ -157,18 +155,15 @@ + (FIRMessaging *)messaging {
   static FIRMessaging *messaging;
   static dispatch_once_t onceToken;
   dispatch_once(&onceToken, ^{
-    // Start Messaging (Fully initialize in one place).
-    FIRMessagingConfig *config = [FIRMessagingConfig defaultConfig];
-    messaging = [[FIRMessaging alloc] initWithConfig:config];
+    messaging = [[FIRMessaging alloc] initPrivately];
     [messaging start];
   });
   return messaging;
 }
 
-- (instancetype)initWithConfig:(FIRMessagingConfig *)config {
+- (instancetype)initPrivately {
   self = [super init];
   if (self) {
-    _config = config;
     _loggedMessageIDs = [NSMutableSet set];
     _instanceIDProxy = [[FIRMessagingInstanceIDProxy alloc] init];
   }
@@ -192,11 +187,9 @@ - (void)setRemoteMessageDelegate:(id<FIRMessagingDelegate>)delegate {
 #pragma mark - Config
 
 - (void)start {
-  _FIRMessagingDevAssert(self.config, @"Invalid nil config in FIRMessagingService");
 
   [self saveLibraryVersion];
-  [self setupLogger:self.config.logLevel];
-  [self setupReceiverWithConfig:self.config];
+  [self setupReceiver];
 
   NSString *hostname = kFIRMessagingReachabilityHostname;
   self.reachability = [[FIRReachabilityChecker alloc] initWithReachabilityDelegate:self
@@ -259,18 +252,7 @@ - (void)saveLibraryVersion {
                          currentLibraryVersion);
 }
 
-- (void)setupLogger:(FIRMessagingLogLevel)loggerLevel {
-#if FIRMessaging_PROBER
-  // do nothing
-#else
-  FIRMessagingLogger *logger = FIRMessagingSharedLogger();
-  FIRMessagingLogLevelFilter *filter =
-      [[FIRMessagingLogLevelFilter alloc] initWithLevel:loggerLevel];
-  [logger setFilter:filter];
-#endif
-}
-
-- (void)setupReceiverWithConfig:(FIRMessagingConfig *)config {
+- (void)setupReceiver {
   self.receiver = [[FIRMessagingReceiver alloc] init];
   self.receiver.delegate = self;
 }

Firebase/Messaging/FIRMessagingLogger.h

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingConfig.h"
 #import "FIRMMessageCode.h"
 
 // The convenience macros are only defined if they haven't already been defined.
@@ -35,37 +34,8 @@
 
 #endif  // !defined(FIRMessagingLoggerInfo)
 
-/// Protocols
-@protocol FIRMessagingLogFormatter <NSObject>
-- (NSString *)stringForFunc:(NSString *)func
-                 withFormat:(NSString *)fmt
-                     valist:(va_list)args
-                      level:(FIRMessagingLogLevel)level NS_FORMAT_FUNCTION(2, 0);
-@end
-
-/// FIRMessagingLogWriter
-@protocol FIRMessagingLogWriter <NSObject>
-// Writes the given log message to where the log writer is configured to write.
-- (void)logMessage:(NSString *)msg level:(FIRMessagingLogLevel)level;
-@end
-
-/// FIRMessagingLogFilter
-@protocol FIRMessagingLogFilter <NSObject>
-// Returns YES if |msg| at |level| should be logged; NO otherwise.
-- (BOOL)filterAllowsMessage:(NSString *)msg level:(FIRMessagingLogLevel)level;
-@end
-
-@interface FIRMessagingLogLevelFilter : NSObject <FIRMessagingLogFilter>
-- (instancetype)initWithLevel:(FIRMessagingLogLevel)level;
-@end
-
-
 @interface FIRMessagingLogger : NSObject
 
-@property(nonatomic, readwrite, strong) id<FIRMessagingLogFilter> filter;
-@property(nonatomic, readwrite, strong) id<FIRMessagingLogWriter> writer;
-@property(nonatomic, readwrite, strong) id<FIRMessagingLogFormatter> formatter;
-
 - (void)logFuncDebug:(const char *)func
          messageCode:(FIRMessagingMessageCode)messageCode
                  msg:(NSString *)fmt, ... NS_FORMAT_FUNCTION(3, 4);