[SIWA] Log In: add 'Continue with Apple' button to login options

Podfile

@@ -174,7 +174,7 @@ target 'WordPress' do
 
     pod 'Gridicons', '~> 0.16'
 
-    pod 'WordPressAuthenticator', '~> 1.8.0-beta.1'
+    pod 'WordPressAuthenticator', '~> 1.8.0-beta.3'
     # pod 'WordPressAuthenticator', :path => '../WordPressAuthenticator-iOS'
     # pod 'WordPressAuthenticator', :git => 'https://github.com/wordpress-mobile/WordPressAuthenticator-iOS.git', :branch => ''
 
@@ -188,8 +188,26 @@ target 'WordPress' do
         pod 'Nimble', '~> 7.3.1'
     end
 
-    ## Convert the 3rd-party license acknowledgements markdown into html for use in the app
+
     post_install do
+
+        ## Append SDKVersions.xcconfig contents to WordPressAuthenticator config files
+        Dir.glob("Pods/Target Support Files/WordPressAuthenticator/*.xcconfig") do |xc_config_filename|
+
+          ## Get WPAuth config file
+          xcconfig_path = "#{Dir.pwd}/#{xc_config_filename}"
+          xc_config = File.read(xcconfig_path)
+
+          ## Get WPiOS config file
+          custom_xcconfig_path = "#{Dir.pwd}/config/SDKVersions.xcconfig"
+          custom_xc_config = File.read(custom_xcconfig_path)
+
+          ## Write back to WPAuth config file, appending both configs.
+          File.open(xcconfig_path, 'w') { |file| file << xc_config << custom_xc_config }
+        end
+
+
+        ## Convert the 3rd-party license acknowledgements markdown into html for use in the app
         require 'commonmarker'
 
         project_root = File.dirname(__FILE__)

Podfile.lock

@@ -209,7 +209,7 @@ PODS:
   - WordPress-Aztec-iOS (1.8.0)
   - WordPress-Editor-iOS (1.8.0):
     - WordPress-Aztec-iOS (= 1.8.0)
-  - WordPressAuthenticator (1.8.0-beta.1):
+  - WordPressAuthenticator (1.8.0-beta.3):
     - 1PasswordExtension (= 1.8.5)
     - Alamofire (= 4.7.3)
     - CocoaLumberjack (~> 3.5)
@@ -298,7 +298,7 @@ DEPENDENCIES:
   - Starscream (= 3.0.6)
   - SVProgressHUD (= 2.2.5)
   - WordPress-Editor-iOS (~> 1.8.0)
-  - WordPressAuthenticator (~> 1.8.0-beta.1)
+  - WordPressAuthenticator (~> 1.8.0-beta.3)
   - WordPressKit (~> 4.4.0)
   - WordPressMocks (~> 0.0.5)
   - WordPressShared (~> 1.8.7-beta.1)
@@ -481,7 +481,7 @@ SPEC CHECKSUMS:
   UIDeviceIdentifier: 8f8a24b257a4d978c8d40ad1e7355b944ffbfa8c
   WordPress-Aztec-iOS: 5022d76e7c4cd2a492f670944e24b9dd05639763
   WordPress-Editor-iOS: e0116fe2c4d3e0d2c325f053d9becdf637bfd708
-  WordPressAuthenticator: 0bf13c318d198c59f8cbe0a5ad955214abc1bcc8
+  WordPressAuthenticator: 66b0f1b4b445e102859ff669d21603d9b645480a
   WordPressKit: 9e6f4ffbec47aea18ce9f7a4cec7a785df9935db
   WordPressMocks: d8088f718439556ff3856d5881aef581740cd26a
   WordPressShared: fc1ef47c3dc91237ef225706bb21ea10c9e4388f
@@ -492,6 +492,6 @@ SPEC CHECKSUMS:
   ZendeskSDK: c2e49fd16a73e43e490f777cea67dd852b819ace
   ZIPFoundation: 89df685c971926b0323087952320bdfee9f0b6ef
 
-PODFILE CHECKSUM: 9b5d8c2aec940634a0565572e4438ad609114151
+PODFILE CHECKSUM: f59185bb5177d1e6a692c04cc86cd3a2ef83ce75
 
 COCOAPODS: 1.6.1

WordPress/Classes/Utility/BuildInformation/FeatureFlag.swift

@@ -9,6 +9,7 @@ enum FeatureFlag: Int {
     case statsInsightsManagement
     case domainCredit
     case murielColors
+    case signInWithApple
 
     /// Returns a boolean indicating if the feature is enabled
     var enabled: Bool {
@@ -27,6 +28,13 @@ enum FeatureFlag: Int {
             return true
         case .murielColors:
             return true
+        case .signInWithApple:
+            // SIWA can NOT be enabled for internal builds
+            // Ref https://github.com/wordpress-mobile/WordPress-iOS/pull/12332#issuecomment-521994963
+            if BuildConfiguration.current == .a8cBranchTest || BuildConfiguration.current == .a8cPrereleaseTesting {
+                return false
+            }
+            return BuildConfiguration.current == .localDeveloper
         }
     }
 }

WordPress/Classes/ViewRelated/NUX/WordPressAuthenticationManager.swift

@@ -30,7 +30,8 @@ class WordPressAuthenticationManager: NSObject {
                                                                 googleLoginServerClientId: ApiCredentials.googleLoginServerClientId(),
                                                                 googleLoginScheme: ApiCredentials.googleLoginSchemeId(),
                                                                 userAgent: WPUserAgent.wordPress(),
-                                                                showNewLoginFlow: true)
+                                                                showNewLoginFlow: true,
+                                                                enableSignInWithApple: FeatureFlag.signInWithApple.enabled)
 
         let style = WordPressAuthenticatorStyle(primaryNormalBackgroundColor: .primaryButtonBackground,
                                                 primaryNormalBorderColor: .primaryButtonBorder,

WordPress/WordPress.xcodeproj/project.pbxproj

@@ -3312,6 +3312,7 @@
 		98F1B1292111017900139493 /* NoResultsStockPhotosConfiguration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NoResultsStockPhotosConfiguration.swift; sourceTree = "<group>"; };
 		98F537A622496CF300B334F9 /* SiteStatsTableHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SiteStatsTableHeaderView.swift; sourceTree = "<group>"; };
 		98F537A822496D0D00B334F9 /* SiteStatsTableHeaderView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SiteStatsTableHeaderView.xib; sourceTree = "<group>"; };
+		98FB6E9F23074CE5002DDC8D /* SDKVersions.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = SDKVersions.xcconfig; sourceTree = "<group>"; };
 		98FCFC212231DF43006ECDD4 /* PostStatsTitleCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PostStatsTitleCell.swift; sourceTree = "<group>"; };
 		98FCFC222231DF43006ECDD4 /* PostStatsTitleCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = PostStatsTitleCell.xib; sourceTree = "<group>"; };
 		99D675225C3282AC88B89F04 /* Pods-WordPressTodayWidget.release-internal.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WordPressTodayWidget.release-internal.xcconfig"; path = "../Pods/Target Support Files/Pods-WordPressTodayWidget/Pods-WordPressTodayWidget.release-internal.xcconfig"; sourceTree = "<group>"; };
@@ -9041,6 +9042,7 @@
 		F14B5F6F208E648200439554 /* config */ = {
 			isa = PBXGroup;
 			children = (
+				98FB6E9F23074CE5002DDC8D /* SDKVersions.xcconfig */,
 				F14B5F75208E64F900439554 /* Version.internal.xcconfig */,
 				F14B5F74208E64F900439554 /* Version.public.xcconfig */,
 				F14B5F70208E648200439554 /* WordPress.debug.xcconfig */,