Merge pull request #179 from wordpress-mobile/issue/auth_init_configs

Auth init: login configs

Author: ScoutHarris

WordPressAuthenticator.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name          = "WordPressAuthenticator"
-  s.version       = "1.10.7-beta.1"
+  s.version       = "1.10.7-beta.2"
   s.summary       = "WordPressAuthenticator implements an easy and elegant way to authenticate your WordPress Apps."
 
   s.description   = <<-DESC

WordPressAuthenticator/Authenticator/WordPressAuthenticatorConfiguration.swift

@@ -46,10 +46,10 @@ public struct WordPressAuthenticatorConfiguration {
     let userAgent: String
 
     /// Flag indicating which Log In flow to display.
-    /// In the new flow, when Log In is selected, a button view is displayed with options.
-    /// In the old flow, when Log In is selected, the email login view is displayed with alternative options.
+    /// If enabled, when Log In is selected, a button view is displayed with options.
+    /// If disabled, when Log In is selected, the email login view is displayed with alternative options.
     ///
-    let showNewLoginFlow: Bool
+    let showLoginOptions: Bool
 
     /// Flag indicating if the login options button view should be displayed in the site address flow.
     /// If enabled, the options button view will be displayed after the site address has been entered
@@ -61,6 +61,10 @@ public struct WordPressAuthenticatorConfiguration {
     ///
     let enableSignInWithApple: Bool
 
+    /// Flag indicating if the unified login/signup flow should be displayed.
+    ///
+    let enableUnifiedAuth: Bool
+    
     /// Designated Initializer
     ///
     public init (wpcomClientId: String,
@@ -73,9 +77,10 @@ public struct WordPressAuthenticatorConfiguration {
                  googleLoginServerClientId: String,
                  googleLoginScheme: String,
                  userAgent: String,
-                 showNewLoginFlow: Bool = false,
+                 showLoginOptions: Bool = false,
                  showLoginOptionsFromSiteAddress: Bool = false,
-                 enableSignInWithApple: Bool = false) {
+                 enableSignInWithApple: Bool = false,
+                 enableUnifiedAuth: Bool = false) {
 
         self.wpcomClientId = wpcomClientId
         self.wpcomSecret = wpcomSecret
@@ -87,8 +92,9 @@ public struct WordPressAuthenticatorConfiguration {
         self.googleLoginServerClientId = googleLoginServerClientId
         self.googleLoginScheme = googleLoginScheme
         self.userAgent = userAgent
-        self.showNewLoginFlow = showNewLoginFlow
+        self.showLoginOptions = showLoginOptions
         self.showLoginOptionsFromSiteAddress = showLoginOptionsFromSiteAddress
         self.enableSignInWithApple = enableSignInWithApple
+        self.enableUnifiedAuth = enableUnifiedAuth
     }
 }

WordPressAuthenticator/Extensions/WPStyleGuide+Login.swift

@@ -155,7 +155,7 @@ extension WPStyleGuide {
 
         let button: UIButton
 
-        if WordPressAuthenticator.shared.configuration.showNewLoginFlow {
+        if WordPressAuthenticator.shared.configuration.showLoginOptions {
             let baseString =  NSLocalizedString("Or log in by _entering your site address_.", comment: "Label for button to log in using site address. Underscores _..._ denote underline.")
 
             let attrStrNormal = baseString.underlined(color: style.subheadlineColor, underlineColor: style.textButtonColor)

WordPressAuthenticator/Signin/LoginEmailViewController.swift

@@ -29,7 +29,7 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
     var didFindSafariSharedCredentials = false
     var didRequestSafariSharedCredentials = false
     open var offerSignupOption = false
-    private let showNewLoginFlow = WordPressAuthenticator.shared.configuration.showNewLoginFlow
+    private let showLoginOptions = WordPressAuthenticator.shared.configuration.showLoginOptions
 
     private struct Constants {
         static let alternativeLogInAnimationDuration: TimeInterval = 0.33
@@ -46,8 +46,8 @@ open class LoginEmailViewController: LoginViewController, NUXKeyboardResponder {
         localizeControls()
         setupOnePasswordButtonIfNeeded()
 
-        alternativeLoginLabel?.isHidden = showNewLoginFlow
-        if !showNewLoginFlow {
+        alternativeLoginLabel?.isHidden = showLoginOptions
+        if !showLoginOptions {
             addGoogleButton()
         }
 

WordPressAuthenticator/Signin/LoginPrologueViewController.swift

@@ -105,7 +105,7 @@ class LoginPrologueViewController: LoginViewController {
     // MARK: - Actions
 
     private func loginTapped() {
-        if WordPressAuthenticator.shared.configuration.showNewLoginFlow {
+        if WordPressAuthenticator.shared.configuration.showLoginOptions {
             performSegue(withIdentifier: .showLoginMethod, sender: self)
         } else {
             performSegue(withIdentifier: .showEmailLogin, sender: self)