Merge pull request #156 from firebase/v0.5.6

Merge v0.5.6 into master

Author: morganchen12

FirebaseAuthUI/FIRAuthUIUtils.m

@@ -22,13 +22,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-        [mainBundlePath stringByAppendingPathComponent:@"FirebaseAuthUIBundle.bundle"];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }

FirebaseAuthUITests/FIRAuthUITest.m

@@ -33,6 +33,8 @@ @implementation FUILoginProvider
 - (NSString *)providerID  { return @"provider id"; }
 - (NSString *)shortName   { return @"login provider"; }
 - (NSString *)signInLabel { return @"sign in label"; }
+- (NSString *)accessToken { return @"accessToken"; }
+- (NSString *)idToken     { return @"idToken"; }
 
 - (UIImage *)icon {
   return [[UIImage alloc] init];

FirebaseAuthUITests/GoogleService-Info.plist

@@ -33,7 +33,7 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true/>
 	<key>GOOGLE_APP_ID</key>
-	<string>google-app-id</string>
+	<string>0:000000000000:ios:0000000000000000</string>
 	<key>DATABASE_URL</key>
 	<string>database-url</string>
 </dict>

FirebaseFacebookAuthUI/FIRFacebookAuthUI.h

@@ -23,35 +23,23 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FIRFacebookAuthUI : NSObject <FIRAuthProviderUI>
 
-/** @property appId
-    @brief The Facebook App ID.
- */
-@property(nonatomic, readonly, copy) NSString *appID;
-
 /** @property scopes
     @brief The scopes to use with Facebook Login.
     @remarks Defaults to using "email" scopes.
  */
 @property(nonatomic, readonly, copy) NSArray<NSString *> *scopes;
 
 /** @fn init
-    @brief Please use initWithAppId:
- */
-- (instancetype)init NS_UNAVAILABLE;
-
-/** @fn initWithAppID:
     @brief Conevenience initializer. Uses a default permission of `@[ "email" ]`.
-    @param appID The Facebook App ID.
  */
-- (instancetype)initWithAppID:(NSString *)appID;
+- (instancetype)init;
 
-/** @fn initWithAppID:permissions:
+/** @fn initWithPermissions:
     @brief Designated initializer.
-    @param appID The Facebook App ID.
     @param permissions The permissions of the app. This array must be an array of specific string values
       as defined in https://developers.facebook.com/docs/facebook-login/permissions/
  */
-- (instancetype)initWithAppID:(NSString *)appID permissions:(NSArray *)permissions NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithPermissions:(NSArray *)permissions NS_DESIGNATED_INITIALIZER;
 
 @end
 

FirebaseFacebookAuthUI/FIRFacebookAuthUI.m

@@ -22,11 +22,6 @@
 #import <FBSDKLoginKit/FBSDKLoginKit.h>
 #import <FirebaseAuthUI/FIRAuthUIErrorUtils.h>
 
-/** @var kBundleFileName
-    @brief The name of the bundle containing Facebook auth provider assets/resources.
- */
-static NSString *const kBundleFileName = @"FirebaseFacebookAuthUIBundle.bundle";
-
 /** @var kTableName
     @brief The name of the strings table to search for localized strings.
 */
@@ -37,6 +32,16 @@
  */
 static NSString *const kSignInWithFacebook = @"SignInWithFacebook";
 
+/** @var kFacebookAppId
+ @brief The string key used to read Facebook App Id from Info.plist.
+ */
+static NSString *const kFacebookAppId = @"FacebookAppID";
+
+/** @var kFacebookDisplayName
+ @brief The string key used to read Facebook App Name from Info.plist.
+ */
+static NSString *const kFacebookDisplayName = @"FacebookDisplayName";
+
 @implementation FIRFacebookAuthUI {
   /** @var _loginManager
       @brief The Facebook login manager.
@@ -49,24 +54,17 @@ @implementation FIRFacebookAuthUI {
   FIRAuthProviderSignInCompletionBlock _pendingSignInCallback;
 }
 
-- (instancetype)init {
-  @throw [NSException exceptionWithName:@"Attempt to call unavailable initializer."
-                                 reason:@"Please call the designated initializer."
-                               userInfo:nil];
-}
-
-- (instancetype)initWithAppID:(NSString *)appID permissions:(NSArray *)permissions {
+- (instancetype)initWithPermissions:(NSArray *)permissions {
   self = [super init];
   if (self != nil) {
     _scopes = permissions;
-    [FBSDKSettings setAppID:appID];
-    _loginManager = [[FBSDKLoginManager alloc] init];
+    [self configureProvider];
   }
   return self;
 }
 
-- (instancetype)initWithAppID:(NSString *)appID {
-  return [self initWithAppID:appID permissions:@[ @"email" ]];
+- (instancetype)init {
+  return [self initWithPermissions:@[ @"email" ]];
 }
 
 /** @fn frameworkBundle
@@ -77,13 +75,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-        [mainBundlePath stringByAppendingPathComponent:kBundleFileName];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }
@@ -214,4 +206,22 @@ - (void)callbackWithCredential:(nullable FIRAuthCredential *)credential
   }
 }
 
+/** @fn callbackWithCredential:error:
+ @brief Validates that Facebook SDK data was filled in Info.plist and creates Facebook login manager 
+ */
+- (void)configureProvider {
+  NSBundle *bundle = [[self class] frameworkBundle];
+  NSString *facebookAppId = [bundle objectForInfoDictionaryKey:kFacebookAppId];
+  NSString *facebookDisplayName = [bundle objectForInfoDictionaryKey:kFacebookDisplayName];
+
+  if (!(facebookAppId && facebookDisplayName)) {
+    [NSException raise:NSInternalInconsistencyException
+                format:@"Please set FacebookAppID, FacebookDisplayName, and\nURL types > Url "
+     @"Schemes in `Supporting Files/Info.plist` according to "
+     @"https://developers.facebook.com/docs/ios/getting-started"];
+  }
+
+  _loginManager = [[FBSDKLoginManager alloc] init];
+}
+
 @end

FirebaseFacebookAuthUITests/FIRFacebookAuthUITest.h

@@ -0,0 +1,21 @@
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  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 <FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.h>
+
+@interface FIRFacebookAuthUITest : FIRFacebookAuthUI
+
+@end

FirebaseFacebookAuthUITests/FIRFacebookAuthUITest.m

@@ -0,0 +1,28 @@
+//
+//  Copyright (c) 2016 Google Inc.
+//
+//  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 "FIRFacebookAuthUITest.h"
+
+@implementation FIRFacebookAuthUITest
+
++ (NSBundle *)frameworkBundle {
+  static NSBundle *frameworkBundle = nil;
+  static dispatch_once_t predicate;
+  dispatch_once(&predicate, ^{
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
+  });
+  return frameworkBundle;
+}
+@end

FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m

@@ -15,7 +15,7 @@
 //
 
 @import XCTest;
-@import FirebaseFacebookAuthUI;
+#import "FIRFacebookAuthUITest.h"
 
 @interface FirebaseFacebookAuthUITests : XCTestCase
 @property (nonatomic, strong) FIRFacebookAuthUI *provider;
@@ -25,7 +25,7 @@ @implementation FirebaseFacebookAuthUITests
 
 - (void)setUp {
   [super setUp];
-  self.provider = [[FIRFacebookAuthUI alloc] initWithAppID:@"an id"];
+  self.provider = [[FIRFacebookAuthUITest alloc] init];
 }
 
 - (void)testItExists {

FirebaseFacebookAuthUITests/Info.plist

@@ -18,5 +18,9 @@
 	<string>????</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
+	<key>FacebookAppID</key>
+	<string>{your-app-id}</string>
+	<key>FacebookDisplayName</key>
+	<string>{your-app-name}</string>
 </dict>
 </plist>

FirebaseGoogleAuthUI/FIRGoogleAuthUI.h

@@ -23,11 +23,6 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @interface FIRGoogleAuthUI : NSObject <FIRAuthProviderUI>
 
-/** @property clientID
-    @brief The Google Sign In client ID.
- */
-@property(nonatomic, copy, readonly) NSString *clientID;
-
 /** @property scopes
     @brief The scopes to use with Google Sign In.
     @remarks Defaults to using email and profile scopes. For a list of all scopes
@@ -36,24 +31,17 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic, copy, readonly) NSArray<NSString *> *scopes;
 
 /** @fn init
-    @brief Please use initWithClientId:
- */
-- (instancetype)init NS_UNAVAILABLE;
-
-/** @fn initWithClientID:
-    @brief Convenience initializer. Calls designated init with default 
-      scopes of "email" and "profile".
-    @param clientId The Google Sign In client ID.
+    @brief Convenience initializer. Calls designated init with default
+     scopes of "email" and "profile".
  */
-- (instancetype)initWithClientID:(NSString *)clientID;
+- (instancetype)init;
 
-/** @fn initWithClientID:scopes:
+/** @fn initWithScopes:
  @brief Designated initializer.
- @param clientId The Google Sign In client ID.
  @param scopes   The user account scopes required by the app. A list of possible scopes can be
    found at https://developers.google.com/identity/protocols/googlescopes
  */
-- (instancetype)initWithClientID:(NSString *)clientID scopes:(NSArray <NSString *> *)scopes NS_DESIGNATED_INITIALIZER;
+- (instancetype)initWithScopes:(NSArray <NSString *> *)scopes NS_DESIGNATED_INITIALIZER;
 
 @end
 

FirebaseGoogleAuthUI/FIRGoogleAuthUI.m

@@ -16,10 +16,12 @@
 
 #import "FIRGoogleAuthUI.h"
 
-#import <GoogleSignIn/GoogleSignIn.h>
+#import <FirebaseAnalytics/FirebaseAnalytics.h>
 #import <FirebaseAuth/FIRGoogleAuthProvider.h>
 #import <FirebaseAuth/FIRUserInfo.h>
 #import <FirebaseAuthUI/FIRAuthUIErrorUtils.h>
+#import <FirebaseAuthUI/FirebaseAuthUI.h>
+#import <GoogleSignIn/GoogleSignIn.h>
 
 /** @var kGoogleGamesScope
     @brief The OAuth scope string for the "Games" scope.
@@ -66,20 +68,12 @@ @implementation FIRGoogleAuthUI {
 }
 
 - (instancetype)init {
-  @throw [NSException exceptionWithName:@"Attempt to call unavailable initializer."
-                                 reason:@"Please call the designated initializer."
-                               userInfo:nil];
+  return [self initWithScopes:@[kGoogleUserInfoEmailScope, kGoogleUserInfoProfileScope]];
 }
 
-- (instancetype)initWithClientID:(NSString *)clientID {
-  return [self initWithClientID:clientID
-                         scopes:@[kGoogleUserInfoEmailScope, kGoogleUserInfoProfileScope]];
-}
-
-- (instancetype)initWithClientID:(NSString *)clientID scopes:(NSArray *)scopes {
+- (instancetype)initWithScopes:(NSArray *)scopes {
   self = [super init];
   if (self) {
-    _clientID = [clientID copy];
     _scopes = [scopes copy];
   }
   return self;
@@ -93,13 +87,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-        [mainBundlePath stringByAppendingPathComponent:@"FirebaseGoogleAuthUIBundle.bundle"];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }
@@ -230,7 +218,7 @@ - (GIDSignIn *)configuredGoogleSignIn {
   signIn.delegate = self;
   signIn.uiDelegate = self;
   signIn.shouldFetchBasicProfile = YES;
-  signIn.clientID = _clientID;
+  signIn.clientID = [[FIRApp defaultApp] options].clientID;
   signIn.scopes = _scopes;
   return signIn;
 }

FirebaseTwitterAuthUI/FIRTwitterAuthUI.m

@@ -19,11 +19,6 @@
 #import <TwitterKit/TwitterKit.h>
 #import "FIRTwitterAuthUI.h"
 
-/** @var kBundleFileName
- @brief The name of the bundle containing Twitter auth provider assets/resources.
- */
-static NSString *const kBundleFileName = @"FirebaseTwitterAuthUIBundle.bundle";
-
 /** @var kTableName
  @brief The name of the strings table to search for localized strings.
  */
@@ -44,13 +39,7 @@ + (NSBundle *)frameworkBundle {
   static NSBundle *frameworkBundle = nil;
   static dispatch_once_t predicate;
   dispatch_once(&predicate, ^{
-    NSString *mainBundlePath = [[NSBundle mainBundle] resourcePath];
-    NSString *frameworkBundlePath =
-    [mainBundlePath stringByAppendingPathComponent:kBundleFileName];
-    frameworkBundle = [NSBundle bundleWithPath:frameworkBundlePath];
-    if (!frameworkBundle) {
-      frameworkBundle = [NSBundle mainBundle];
-    }
+    frameworkBundle = [NSBundle bundleForClass:[self class]];
   });
   return frameworkBundle;
 }