Skip to content

Commit d0f1c23

Browse files
rosalyntanrosalyntan
committed
Fix and update demo app.
1 parent dac3ee1 commit d0f1c23

File tree

4 files changed

+40
-13
lines changed

4 files changed

+40
-13
lines changed

‎FirebaseFacebookAuthUI/Sources/FUIFacebookAuth.m‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ - (BOOL)handleOpenURL:(NSURL *)URL sourceApplication:(NSString *)sourceApplicati
304304

305305
#pragma mark -
306306

307-
/** @fn completeSignInFlowWithAccessToken:error:
307+
/** @fn completeSignInFlowWithAccessToken:idToken:error:
308308
@brief Called with the result of a Facebook sign-in attempt. Invokes and clears any pending
309309
sign in callback block.
310310
@param accessToken The Facebook access token, if the Facebook sign-in attempt with tracking enabled is successful.
@@ -325,9 +325,9 @@ - (void)completeSignInFlowWithAccessToken:(nullable NSString *)accessToken
325325
IDToken:idToken
326326
rawNonce:rawNonce];
327327
} else {
328-
// Assume accessToken cannot be nil if there's no error and idToken is nil.
329-
NSString *_Nonnull token = (id _Nonnull)accessToken;
330-
credential = [FIRFacebookAuthProvider credentialWithAccessToken:token];
328+
// Assume accessToken cannot be nil if there's no error and idToken is nil.
329+
NSString *_Nonnull token = (id _Nonnull)accessToken;
330+
credential = [FIRFacebookAuthProvider credentialWithAccessToken:token];
331331
}
332332
UIActivityIndicatorView *activityView =
333333
[FUIAuthBaseViewController addActivityIndicator:_presentingViewController.view];

‎samples/objc/FirebaseUI-demo-objc/FUIAppDelegate.m‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
@import Firebase;
2020
@import FirebaseAuthUI;
21+
@import FBSDKCoreKit;
2122
#import <GTMSessionFetcher/GTMSessionFetcherLogging.h>
2223

2324
@implementation FUIAppDelegate
@@ -26,13 +27,18 @@ - (BOOL)application:(UIApplication *)application
2627
didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
2728
[FIRApp configure];
2829
[GTMSessionFetcher setLoggingEnabled:YES];
30+
[[FBSDKApplicationDelegate sharedInstance] application:application
31+
didFinishLaunchingWithOptions:launchOptions];
2932
return YES;
3033
}
3134

3235
- (BOOL)application:(UIApplication *)app
3336
openURL:(NSURL *)url
3437
options:(NSDictionary<NSString*, id> *)options {
3538
NSString *sourceApplication = options[UIApplicationOpenURLOptionsSourceApplicationKey];
39+
[[FBSDKApplicationDelegate sharedInstance] application:app
40+
openURL:url
41+
options:options];
3642
return [self handleOpenUrl:url sourceApplication:sourceApplication];
3743
}
3844

‎samples/objc/FirebaseUI-demo-objc/Resources/Main.storyboard‎

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15400" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7RW-VL-qNI">
2+
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="7RW-VL-qNI">
33
<device id="retina4_7" orientation="portrait" appearance="light"/>
44
<dependencies>
55
<deployment identifier="iOS"/>
6-
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15404"/>
6+
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
77
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
88
</dependencies>
99
<scenes>
@@ -162,7 +162,7 @@
162162
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Authorization UI" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="YxK-c8-9q7">
163163
<rect key="frame" x="27" y="12" width="322" height="20"/>
164164
<fontDescription key="fontDescription" type="system" pointSize="16"/>
165-
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
165+
<color key="textColor" systemColor="darkTextColor"/>
166166
<nil key="highlightedColor"/>
167167
</label>
168168
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="JZd-6c-Soe">
@@ -191,7 +191,7 @@
191191
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Custom Scopes" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="T07-wL-pGr">
192192
<rect key="frame" x="27" y="12" width="322" height="20"/>
193193
<fontDescription key="fontDescription" type="system" pointSize="16"/>
194-
<color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
194+
<color key="textColor" systemColor="darkTextColor"/>
195195
<nil key="highlightedColor"/>
196196
</label>
197197
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="9Ma-Mx-g56">
@@ -225,14 +225,14 @@
225225
<nil key="textColor"/>
226226
<nil key="highlightedColor"/>
227227
</label>
228-
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="Link" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ig5-8M-jHk">
228+
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Link" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ig5-8M-jHk">
229229
<rect key="frame" x="244" y="10.5" width="48" height="21"/>
230230
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
231231
<fontDescription key="fontDescription" type="system" pointSize="12"/>
232232
<nil key="textColor"/>
233233
<nil key="highlightedColor"/>
234234
</label>
235-
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" ambiguous="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LiB-gr-jDR">
235+
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LiB-gr-jDR">
236236
<rect key="frame" x="300" y="5.5" width="49" height="31"/>
237237
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
238238
<connections>
@@ -273,6 +273,17 @@
273273
<nil key="textColor"/>
274274
<nil key="highlightedColor"/>
275275
</label>
276+
<label opaque="NO" userInteractionEnabled="NO" alpha="0.80000000000000004" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Limited" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XLV-Sd-fV6">
277+
<rect key="frame" x="244" y="11.5" width="48" height="21"/>
278+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
279+
<fontDescription key="fontDescription" type="system" pointSize="12"/>
280+
<nil key="textColor"/>
281+
<nil key="highlightedColor"/>
282+
</label>
283+
<switch opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" contentHorizontalAlignment="center" contentVerticalAlignment="center" on="YES" translatesAutoresizingMaskIntoConstraints="NO" id="H4b-GH-bc7" userLabel="Facebook Switch">
284+
<rect key="frame" x="300" y="6.5" width="49" height="31"/>
285+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
286+
</switch>
276287
</subviews>
277288
</tableViewCellContentView>
278289
</tableViewCell>
@@ -537,6 +548,7 @@
537548
<outlet property="customScopeSwitch" destination="9Ma-Mx-g56" id="Scy-Do-CrR"/>
538549
<outlet property="emailLabel" destination="ig5-8M-jHk" id="a2T-8z-dxJ"/>
539550
<outlet property="emailSwitch" destination="LiB-gr-jDR" id="I2g-oL-ZRC"/>
551+
<outlet property="facebookSwitch" destination="H4b-GH-bc7" id="z4w-iM-AYz"/>
540552
</connections>
541553
</tableViewController>
542554
<placeholder placeholderIdentifier="IBFirstResponder" id="1w1-3x-wCC" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -561,7 +573,7 @@
561573
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jIg-6e-k6g">
562574
<rect key="frame" x="0.0" y="617" width="375" height="50"/>
563575
<subviews>
564-
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T3i-kj-emg">
576+
<button opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="1000" horizontalCompressionResistancePriority="1000" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="T3i-kj-emg">
565577
<rect key="frame" x="333" y="8" width="34" height="34"/>
566578
<state key="normal" title="Load"/>
567579
<connections>
@@ -608,4 +620,9 @@
608620
<point key="canvasLocation" x="2377" y="315"/>
609621
</scene>
610622
</scenes>
623+
<resources>
624+
<systemColor name="darkTextColor">
625+
<color white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
626+
</systemColor>
627+
</resources>
611628
</document>

‎samples/objc/FirebaseUI-demo-objc/Samples/Auth/FUIAuthViewController.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ @interface FUIAuthViewController () <FUIAuthDelegate>
6464
@property (weak, nonatomic) IBOutlet UITableViewCell *cellEmail;
6565
@property (weak, nonatomic) IBOutlet UISwitch *emailSwitch;
6666
@property (weak, nonatomic) IBOutlet UILabel *emailLabel;
67+
@property (weak, nonatomic) IBOutlet UISwitch *facebookSwitch;
6768
@property (weak, nonatomic) IBOutlet UITableViewCell *cellUID;
6869
@property (weak, nonatomic) IBOutlet UITableViewCell *anonymousSignIn;
6970
@property (weak, nonatomic) IBOutlet UIBarButtonItem *buttonAuthorization;
@@ -375,12 +376,14 @@ - (void)showAlertWithTitlte:(NSString *)title message:(NSString *)message {
375376
- (NSArray *)getListOfIDPs {
376377
return [[self class] getListOfIDPs:[self.tableView indexPathsForSelectedRows]
377378
useCustomScopes:_customScopeSwitch.isOn
378-
useEmailLink:_emailSwitch.isOn];
379+
useEmailLink:_emailSwitch.isOn
380+
useFacebookLimitedLogin:_facebookSwitch.isOn];
379381
}
380382

381383
+ (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows
382384
useCustomScopes:(BOOL)useCustomScopes
383-
useEmailLink:(BOOL)useEmaiLink {
385+
useEmailLink:(BOOL)useEmaiLink
386+
useFacebookLimitedLogin:(BOOL)useLimitedLogin {
384387
NSMutableArray *providers = [NSMutableArray new];
385388

386389
for (NSIndexPath *indexPath in selectedRows) {
@@ -426,6 +429,7 @@ + (NSArray *)getListOfIDPs:(NSArray<NSIndexPath *> *)selectedRows
426429
@"user_friends",
427430
@"ads_read"]]
428431
:[[FUIFacebookAuth alloc] initWithAuthUI:[FUIAuth defaultAuthUI]];
432+
((FUIFacebookAuth *)provider).useLimitedLogin = useLimitedLogin;
429433
break;
430434
case kIDPTwitter:
431435
provider = [FUIOAuth twitterAuthProvider];

0 commit comments

Comments
 (0)