Introduce FUIPrivacyAndTermsOfServiceView to make the message consistent across all sign in screens.

Author: Yue-Wang-Google

FirebaseAuthUI/FUIAuthPickerViewController.m

@@ -23,6 +23,8 @@
 #import "FUIAuthUtils.h"
 #import "FUIAuth_Internal.h"
 #import "FUIEmailEntryViewController.h"
+#import "FUIPrivacyAndTermsOfServiceView.h"
+
 
 /** @var kErrorUserInfoEmailKey
     @brief The key for the email address in the userinfo dictionary of a sign in error.
@@ -57,7 +59,7 @@
 @implementation FUIAuthPickerViewController {
   UIView *_buttonContainerView;
 
-  IBOutlet UITextView *_privacyPolicyAndTOSView;
+  IBOutlet FUIPrivacyAndTermsOfServiceView *_privacyPolicyAndTOSView;
 }
 
 - (instancetype)initWithAuthUI:(FUIAuth *)authUI {
@@ -135,48 +137,10 @@ - (void)viewDidLoad {
     emailButton.accessibilityIdentifier = kEmailButtonAccessibilityID;
     [_buttonContainerView addSubview:emailButton];
   }
-  _privacyPolicyAndTOSView.attributedText = [self privacyPolicyAndTOS];
-  _privacyPolicyAndTOSView.textColor = [UIColor lightGrayColor];
+  _privacyPolicyAndTOSView.authUI = self.authUI;
+  [_privacyPolicyAndTOSView useFullMessage];
 }
 
-- (NSAttributedString *)privacyPolicyAndTOS {
-  if (!self.authUI.TOSURL.absoluteString.length &&
-      !self.authUI.privacyPolicyURL.absoluteString.length) {
-    return nil;
-  }
-  if (!self.authUI.TOSURL.absoluteString.length ||
-    !self.authUI.privacyPolicyURL.absoluteString.length) {
-    NSLog(@"The terms of service and privacy policy URLs for your app must be provided together. Pl"
-        "ease set the terms of service policy using [FUIAuth defaultAuthUI].TOSURL and the privacy"
-        " policy URL using [FUIAuth defaultAuthUI].privacyPolicyURL");
-    return nil;
-  }
-  NSString *privacyPolicyAndTOSString =
-      [NSString stringWithFormat:FUILocalizedString(kStr_TermsOfServiceAuthPicker),
-          FUILocalizedString(kStr_TermsOfService), FUILocalizedString(kStr_PrivacyPolicy)];
-  NSMutableAttributedString *attributedLinkText =
-      [[NSMutableAttributedString alloc] initWithString:privacyPolicyAndTOSString];
-
-  NSRange TOSRange =
-      [privacyPolicyAndTOSString rangeOfString:FUILocalizedString(kStr_TermsOfService)];
-
-  if (TOSRange.length) {
-    [attributedLinkText addAttribute:NSLinkAttributeName
-                               value:self.authUI.TOSURL
-                               range:TOSRange];
-  }
-  NSRange privacyPolicyRange =
-    [privacyPolicyAndTOSString rangeOfString:FUILocalizedString(kStr_PrivacyPolicy)];
-
-  if (privacyPolicyRange.length) {
-    [attributedLinkText addAttribute:NSLinkAttributeName
-                               value:self.authUI.privacyPolicyURL
-                               range:privacyPolicyRange];
-  }
-  return attributedLinkText;
-}
-
-
 - (void)viewDidLayoutSubviews {
   [super viewDidLayoutSubviews];
 

FirebaseAuthUI/FUIAuthPickerViewController.xib

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,16 +21,23 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" editable="NO" usesAttributedText="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xez-8g-dy2">
+                <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" usesAttributedText="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xez-8g-dy2" customClass="FUIPrivacyAndTermsOfServiceView">
                     <rect key="frame" x="16" y="618" width="343" height="49"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                     <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="49" id="DYU-T6-FUV"/>
+                    </constraints>
                     <attributedString key="attributedText"/>
                     <textInputTraits key="textInputTraits" autocapitalizationType="sentences" textContentType="url"/>
                     <dataDetectorType key="dataDetectorTypes" link="YES"/>
                 </textView>
             </subviews>
             <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+            <constraints>
+                <constraint firstItem="Xez-8g-dy2" firstAttribute="leading" secondItem="kfP-Vq-eU2" secondAttribute="leadingMargin" id="146-w9-1AF"/>
+                <constraint firstItem="Xez-8g-dy2" firstAttribute="trailing" secondItem="kfP-Vq-eU2" secondAttribute="trailingMargin" id="Hoh-mG-IDs"/>
+                <constraint firstAttribute="bottom" secondItem="Xez-8g-dy2" secondAttribute="bottom" id="uZS-Dj-pya"/>
+            </constraints>
             <point key="canvasLocation" x="25.5" y="51.5"/>
         </view>
     </objects>

FirebaseAuthUI/FUIAuthStrings.h

@@ -62,9 +62,8 @@ extern NSString *const kStr_SignInWithEmail;
 extern NSString *const kStr_SignUpTitle;
 extern NSString *const kStr_SignUpTooManyTimesError;
 extern NSString *const kStr_TermsOfService;
-extern NSString *const kStr_TermsOfServiceNotice;
-extern NSString *const kStr_TermsOfServiceAuthPicker;
 extern NSString *const kStr_PrivacyPolicy;
+extern NSString *const kStr_TermsOfServiceMessage;
 extern NSString *const kStr_UserNotFoundError;
 extern NSString *const kStr_WeakPasswordError;
 extern NSString *const kStr_WrongPasswordError;

FirebaseAuthUI/FUIAuthStrings.m

@@ -68,9 +68,8 @@
 NSString *const kStr_SignUpTitle = @"SignUpTitle";
 NSString *const kStr_SignUpTooManyTimesError = @"SignUpTooManyTimesError";
 NSString *const kStr_TermsOfService = @"TermsOfService";
-NSString *const kStr_TermsOfServiceNotice = @"TermsOfServiceNotice";
-NSString *const kStr_TermsOfServiceAuthPicker = @"TermsOfServiceAuthPicker";
 NSString *const kStr_PrivacyPolicy = @"PrivacyPolicy";
+NSString *const kStr_TermsOfServiceMessage = @"TermsOfServiceMessage";
 NSString *const kStr_UserNotFoundError = @"UserNotFoundError";
 NSString *const kStr_WeakPasswordError = @"WeakPasswordError";
 NSString *const kStr_WrongPasswordError = @"WrongPasswordError";

FirebaseAuthUI/FUIAuthTableViewCell.xib

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -20,13 +20,13 @@
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="120" translatesAutoresizingMaskIntoConstraints="NO" id="sfp-hN-0cm">
-                        <rect key="frame" x="16" y="12" width="42" height="19.5"/>
+                        <rect key="frame" x="24" y="12" width="42" height="19.5"/>
                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="placeholder" textAlignment="natural" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="h79-sO-Wvr">
-                        <rect key="frame" x="74" y="12" width="238" height="20"/>
+                        <rect key="frame" x="82" y="12" width="222" height="20"/>
                         <fontDescription key="fontDescription" type="system" pointSize="16"/>
                         <textInputTraits key="textInputTraits" enablesReturnKeyAutomatically="YES"/>
                     </textField>

FirebaseAuthUI/FUIEmailEntryViewController.m

@@ -25,6 +25,7 @@
 #import "FUIAuth_Internal.h"
 #import "FUIPasswordSignInViewController.h"
 #import "FUIPasswordSignUpViewController.h"
+#import "FUIPrivacyAndTermsOfServiceView.h"
 
 /** @var kCellReuseIdentifier
     @brief The reuse identifier for table view cell.
@@ -64,6 +65,12 @@ @implementation FUIEmailEntryViewController {
       @brief The @c UITableView used to store all UI elements.
    */
   __weak IBOutlet UITableView *_tableView;
+
+  /** @var _termsOfServiceView
+   @brief The @c Text view which displays Terms of Service.
+   */
+  __weak IBOutlet FUIPrivacyAndTermsOfServiceView *_termsOfServiceView;
+
 }
 
 - (instancetype)initWithAuthUI:(FUIAuth *)authUI {
@@ -94,6 +101,8 @@ - (void)viewDidLoad {
                                            action:@selector(next)];
   nextButtonItem.accessibilityIdentifier = kNextButtonAccessibilityID;
   self.navigationItem.rightBarButtonItem = nextButtonItem;
+  _termsOfServiceView.authUI = self.authUI;
+  [_termsOfServiceView useFullMessage];
 
   [self enableDynamicCellHeightForTableView:_tableView];
 }

FirebaseAuthUI/FUIEmailEntryViewController.xib

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="12120" systemVersion="16F73" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="FUIEmailEntryViewController">
             <connections>
-                <outlet property="_tableView" destination="H6t-i3-acV" id="ivu-Xo-dPw"/>
+                <outlet property="_tableView" destination="sqQ-Fo-hB1" id="5Ek-qF-gTL"/>
+                <outlet property="_termsOfServiceView" destination="9ea-qX-Sdg" id="T20-ZO-fz9"/>
                 <outlet property="view" destination="bth-CL-c9r" id="F2l-k9-ffn"/>
             </connections>
         </placeholder>
@@ -20,21 +21,41 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" allowsSelection="NO" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="H6t-i3-acV">
+                <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="sqQ-Fo-hB1">
                     <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                    <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                    <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                    <view key="tableFooterView" contentMode="scaleToFill" id="zAD-Xd-4qt">
+                        <rect key="frame" x="0.0" y="896.5" width="375" height="100"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" editable="NO" text="Terms of Service" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9ea-qX-Sdg" customClass="FUIPrivacyAndTermsOfServiceView">
+                                <rect key="frame" x="10" y="0.0" width="355" height="100"/>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.28999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="12"/>
+                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                            </textView>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="9ea-qX-Sdg" secondAttribute="trailing" constant="10" id="XIO-RK-VZ7"/>
+                            <constraint firstItem="9ea-qX-Sdg" firstAttribute="top" secondItem="zAD-Xd-4qt" secondAttribute="top" id="b5A-Zf-YCc"/>
+                            <constraint firstAttribute="bottom" secondItem="9ea-qX-Sdg" secondAttribute="bottom" id="iuk-lu-1BT"/>
+                            <constraint firstItem="9ea-qX-Sdg" firstAttribute="leading" secondItem="zAD-Xd-4qt" secondAttribute="leading" constant="10" id="lMZ-cS-2hg"/>
+                        </constraints>
+                    </view>
                     <connections>
-                        <outlet property="dataSource" destination="-1" id="33A-3M-w3R"/>
-                        <outlet property="delegate" destination="-1" id="bIJ-CI-bmt"/>
+                        <outlet property="dataSource" destination="-1" id="Sw5-oz-cWe"/>
+                        <outlet property="delegate" destination="-1" id="xr0-I0-wCb"/>
                     </connections>
                 </tableView>
             </subviews>
             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
             <constraints>
-                <constraint firstItem="H6t-i3-acV" firstAttribute="centerY" secondItem="bth-CL-c9r" secondAttribute="centerY" id="HOf-5w-2pQ"/>
-                <constraint firstItem="H6t-i3-acV" firstAttribute="height" secondItem="bth-CL-c9r" secondAttribute="height" id="Kxk-eP-6fy"/>
-                <constraint firstItem="H6t-i3-acV" firstAttribute="width" secondItem="bth-CL-c9r" secondAttribute="width" id="Sjr-B8-2fW"/>
-                <constraint firstItem="H6t-i3-acV" firstAttribute="centerX" secondItem="bth-CL-c9r" secondAttribute="centerX" id="eD1-nP-vHs"/>
+                <constraint firstAttribute="trailing" secondItem="sqQ-Fo-hB1" secondAttribute="trailing" id="5Me-cs-Zxv"/>
+                <constraint firstItem="sqQ-Fo-hB1" firstAttribute="top" secondItem="bth-CL-c9r" secondAttribute="top" id="OYw-Zf-Kez"/>
+                <constraint firstAttribute="bottom" secondItem="sqQ-Fo-hB1" secondAttribute="bottom" id="c4f-G4-8CC"/>
+                <constraint firstItem="sqQ-Fo-hB1" firstAttribute="leading" secondItem="bth-CL-c9r" secondAttribute="leading" id="y2b-6O-eFn"/>
             </constraints>
         </view>
     </objects>

FirebaseAuthUI/FUIPasswordRecoveryViewController.m

@@ -22,6 +22,7 @@
 #import "FUIAuthTableViewCell.h"
 #import "FUIAuthUtils.h"
 #import "FUIAuth_Internal.h"
+#import "FUIPrivacyAndTermsOfServiceView.h"
 
 /** @var kCellReuseIdentifier
     @brief The reuse identifier for table view cell.
@@ -38,6 +39,7 @@ @interface FUIPasswordRecoveryViewController () <UITableViewDataSource, UITextFi
     @brief The text view in the footer of the table.
  */
 @property(nonatomic, strong) IBOutlet UITextView *footerTextView;
+@property(nonatomic, strong) IBOutlet FUIPrivacyAndTermsOfServiceView *termsOfServiceView;
 
 @end
 
@@ -103,6 +105,9 @@ - (void)viewDidLayoutSubviews {
   _footerTextView.textContainerInset =
       UIEdgeInsetsMake(0, kFooterTextViewHorizontalInset, 0, kFooterTextViewHorizontalInset);
   [self.footerTextView sizeToFit];
+
+  self.termsOfServiceView.authUI = self.authUI;
+  [self.termsOfServiceView useFooterMessage];
 }
 
 #pragma mark - Actions