Fix regressions found in the login with OAuth flow

Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewController.swift

@@ -37,6 +37,10 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
     |> \.translatesAutoresizingMaskIntoConstraints .~ false
   }()
 
+  private lazy var signupOrLoginWithOAuthButton = { UIButton(type: .custom)
+    |> \.translatesAutoresizingMaskIntoConstraints .~ false
+  }()
+
   private lazy var loginContextStackView = { UIStackView() }()
   private lazy var logoImageView = { UIImageView(frame: .zero) }()
   internal var processingView: ProcessingView? = ProcessingView(frame: .zero)
@@ -138,15 +142,12 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
       }
       |> UILabel.lens.text %~ { _ in Strings.Get_notified_when_your_friends_back_and_launch_projects() }
 
-    if self.viewModel.outputs.loginWithOAuthEnabled {
-      // TODO: Add and translate a new version of this string for this page.
-      _ = self.loginButton |> greenButtonStyle
-      self.loginButton
-        .setTitle(Strings.login_tout_generic_intent_traditional_signup_or_login_button(), for: .normal)
-    } else {
-      _ = self.loginButton |> greyButtonStyle
-      self.loginButton.setTitle(Strings.login_tout_back_intent_traditional_login_button(), for: .normal)
-    }
+    _ = self.loginButton |> greyButtonStyle
+    self.loginButton.setTitle(Strings.login_tout_back_intent_traditional_login_button(), for: .normal)
+
+    _ = self.signupOrLoginWithOAuthButton |> greenButtonStyle
+    self.signupOrLoginWithOAuthButton
+      .setTitle(Strings.login_tout_generic_intent_traditional_signup_or_login_button(), for: .normal)
 
     _ = self.loginContextStackView
       |> UIStackView.lens.spacing .~ Styles.gridHalf(1)
@@ -190,6 +191,12 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
         self?.pushSignupViewController()
       }
 
+    self.viewModel.outputs.startOAuthSignupOrLogin
+      .observeForControllerAction()
+      .observeValues { [weak self] _ in
+        self?.pushOAuthFlow()
+      }
+
     self.viewModel.outputs.logIntoEnvironmentWithApple
       .observeValues { [weak self] accessTokenEnv in
         AppEnvironment.login(accessTokenEnv)
@@ -298,6 +305,10 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
     self.contextLabel.rac.text = self.viewModel.outputs.logInContextText
     self.bringCreativeProjectsToLifeLabel.rac.hidden = self.viewModel.outputs.headlineLabelHidden
 
+    self.loginButton.rac.hidden = self.viewModel.outputs.showLoginWithOAuth
+    self.signupButton.rac.hidden = self.viewModel.outputs.showLoginWithOAuth
+    self.signupOrLoginWithOAuthButton.rac.hidden = self.viewModel.outputs.showLoginWithOAuth.signal.negate()
+
     self.viewModel.outputs.headlineLabelHidden
       .observeForUI()
       .observeValues { [weak self] isHidden in
@@ -357,12 +368,9 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
     _ = ([self.appleLoginButton, self.fbLoginButton, self.getNotifiedLabel], self.fbLoginStackView)
       |> ksr_addArrangedSubviewsToStackView()
 
-    if self.viewModel.outputs.loginWithOAuthEnabled {
-      self.emailLoginStackView.addArrangedSubview(self.loginButton)
-    } else {
-      self.emailLoginStackView.addArrangedSubview(self.signupButton)
-      self.emailLoginStackView.addArrangedSubview(self.loginButton)
-    }
+    self.emailLoginStackView.addArrangedSubview(self.signupOrLoginWithOAuthButton)
+    self.emailLoginStackView.addArrangedSubview(self.signupButton)
+    self.emailLoginStackView.addArrangedSubview(self.loginButton)
   }
 
   private func setupConstraints() {
@@ -391,6 +399,8 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
     )
     self.loginButton.addTarget(self, action: #selector(self.loginButtonPressed(_:)), for: .touchUpInside)
     self.signupButton.addTarget(self, action: #selector(self.signupButtonPressed), for: .touchUpInside)
+    self.signupOrLoginWithOAuthButton
+      .addTarget(self, action: #selector(self.signupOrLoginWithOAuthButtonPressed), for: .touchUpInside)
   }
 
   private func attemptAppleLogin() {
@@ -410,13 +420,17 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
   }
 
   fileprivate func pushLoginViewController() {
-    if self.viewModel.outputs.loginWithOAuthEnabled, let session = createAuthorizationSession() {
-      session.presentationContextProvider = self
-      session.start()
-    } else {
-      self.navigationController?.pushViewController(LoginViewController.instantiate(), animated: true)
-      self.navigationItem.backBarButtonItem = UIBarButtonItem.back(nil, selector: nil)
+    self.navigationController?.pushViewController(LoginViewController.instantiate(), animated: true)
+    self.navigationItem.backBarButtonItem = UIBarButtonItem.back(nil, selector: nil)
+  }
+
+  fileprivate func pushOAuthFlow() {
+    guard featureLoginWithOAuthEnabled(), let session = createAuthorizationSession() else {
+      return
     }
+
+    session.presentationContextProvider = self
+    session.start()
   }
 
   fileprivate func createAuthorizationSession() -> ASWebAuthenticationSession? {
@@ -548,6 +562,10 @@ public final class LoginToutViewController: UIViewController, MFMailComposeViewC
   @objc private func signupButtonPressed() {
     self.viewModel.inputs.signupButtonPressed()
   }
+
+  @objc private func signupOrLoginWithOAuthButtonPressed() {
+    self.viewModel.inputs.signupOrLoginWithOAuthButtonPressed()
+  }
 }
 
 extension LoginToutViewController: TabBarControllerScrollable {

Kickstarter-iOS/Features/LoginTout/Controller/LoginToutViewControllerTests.swift

@@ -15,11 +15,16 @@ internal final class LoginToutViewControllerTests: TestCase {
   }
 
   func testLoginToutView() {
+    let mockConfigClient = MockRemoteConfigClient()
+    mockConfigClient.features = [
+      RemoteConfigFeature.loginWithOAuthEnabled.rawValue: false
+    ]
+
     let devices = [Device.phone4_7inch, Device.phone5_8inch, Device.pad]
     let intents = [LoginIntent.generic, .starProject, .messageCreator, .backProject]
 
     orthogonalCombos(Language.allLanguages, devices, intents).forEach { language, device, intent in
-      withEnvironment(language: language) {
+      withEnvironment(language: language, remoteConfigClient: mockConfigClient) {
         let controller = LoginToutViewController.configuredWith(loginIntent: intent)
         let (parent, _) = traitControllers(device: device, orientation: .portrait, child: controller)
 

Library/RemoteConfig/RemoteConfigFeature+Helpers.swift

@@ -1,10 +1,12 @@
 /// Return remote config values either a value from the cloud, if it found one, or a default value based on the provided key
+private func featureEnabled(feature: RemoteConfigFeature, defaultValue: Bool = false) -> Bool {
+  let valueFromDefaults = AppEnvironment.current.userDefaults
+    .remoteConfigFeatureFlags[feature.rawValue]
 
-private func featureEnabled(feature: RemoteConfigFeature) -> Bool {
-  return AppEnvironment.current.userDefaults
-    .remoteConfigFeatureFlags[feature.rawValue] ??
-    (AppEnvironment.current.remoteConfigClient?
-      .isFeatureEnabled(featureKey: feature) ?? false)
+  let valueFromRemoteConfig = AppEnvironment.current.remoteConfigClient?
+    .isFeatureEnabled(featureKey: feature)
+
+  return valueFromDefaults ?? valueFromRemoteConfig ?? defaultValue
 }
 
 public func featureBlockUsersEnabled() -> Bool {
@@ -32,7 +34,7 @@ public func featureReportThisProjectEnabled() -> Bool {
 }
 
 public func featureLoginWithOAuthEnabled() -> Bool {
-  featureEnabled(feature: .loginWithOAuthEnabled)
+  featureEnabled(feature: .loginWithOAuthEnabled, defaultValue: true)
 }
 
 public func featureUseKeychainForOAuthTokenEnabled() -> Bool {

Library/ViewModels/LoginToutViewModel.swift

@@ -41,6 +41,9 @@ public protocol LoginToutViewModelInputs {
   /// Call when sign up button is pressed
   func signupButtonPressed()
 
+  /// Call with login with OAuth button is pressed
+  func signupOrLoginWithOAuthButtonPressed()
+
   /// Call when a user session starts.
   func userSessionStarted()
 
@@ -92,6 +95,9 @@ public protocol LoginToutViewModelOutputs {
   /// Emits when Signup view should be shown
   var startSignup: Signal<(), Never> { get }
 
+  /// Emits when OAuth flow should be shown
+  var startOAuthSignupOrLogin: Signal<(), Never> { get }
+
   /// Emits a Facebook user and access token when Facebook login has occurred
   var startFacebookConfirmation: Signal<(ErrorEnvelope.FacebookUser?, String), Never> { get }
 
@@ -100,7 +106,7 @@ public protocol LoginToutViewModelOutputs {
 
   /// True if the feature flag for OAuth login is true.
   /// Note that this is not a signal, because we don't want it to ever change after the screen is loaded.
-  var loginWithOAuthEnabled: Bool { get }
+  var showLoginWithOAuth: Signal<Bool, Never> { get }
 }
 
 public protocol LoginToutViewModelType {
@@ -125,6 +131,7 @@ public final class LoginToutViewModel: LoginToutViewModelType, LoginToutViewMode
     self.isLoading = isLoading.signal.skipRepeats()
     self.startLogin = self.loginButtonPressedProperty.signal
     self.startSignup = self.signupButtonPressedProperty.signal
+    self.startOAuthSignupOrLogin = self.signupOrLoginWithOAuthButtonPressedProperty.signal
     self.attemptFacebookLogin = self.facebookLoginButtonPressedProperty.signal
     self.attemptAppleLogin = self.appleLoginButtonPressedProperty.signal.ignoreValues()
 
@@ -269,7 +276,9 @@ public final class LoginToutViewModel: LoginToutViewModelType, LoginToutViewMode
 
     self.logIntoEnvironmentWithApple = logIntoEnvironmentWithApple.signal
     self.logIntoEnvironmentWithFacebook = logIntoEnvironmentWithFacebook.signal
-    self.loginWithOAuthEnabled = featureLoginWithOAuthEnabled()
+    self.showLoginWithOAuth = self.viewWillAppearProperty.signal.map { _ in
+      featureLoginWithOAuthEnabled()
+    }
   }
 
   public var inputs: LoginToutViewModelInputs { return self }
@@ -329,6 +338,11 @@ public final class LoginToutViewModel: LoginToutViewModelType, LoginToutViewMode
     self.signupButtonPressedProperty.value = ()
   }
 
+  fileprivate let signupOrLoginWithOAuthButtonPressedProperty = MutableProperty(())
+  public func signupOrLoginWithOAuthButtonPressed() {
+    self.signupOrLoginWithOAuthButtonPressedProperty.value = ()
+  }
+
   fileprivate let userSessionStartedProperty = MutableProperty(())
   public func userSessionStarted() {
     self.userSessionStartedProperty.value = ()
@@ -356,10 +370,11 @@ public final class LoginToutViewModel: LoginToutViewModelType, LoginToutViewMode
   public let startFacebookConfirmation: Signal<(ErrorEnvelope.FacebookUser?, String), Never>
   public let startLogin: Signal<(), Never>
   public let startSignup: Signal<(), Never>
+  public let startOAuthSignupOrLogin: Signal<(), Never>
   public let startTwoFactorChallenge: Signal<String, Never>
   public let showAppleErrorAlert: Signal<String, Never>
   public let showFacebookErrorAlert: Signal<AlertError, Never>
-  public let loginWithOAuthEnabled: Bool
+  public let showLoginWithOAuth: Signal<Bool, Never>
 }
 
 private func statusString(_ forStatus: LoginIntent) -> String {

Library/ViewModels/LoginToutViewModelTests.swift

@@ -25,7 +25,9 @@ final class LoginToutViewModelTests: TestCase {
   fileprivate let startFacebookConfirmation = TestObserver<String, Never>()
   fileprivate let startLogin = TestObserver<(), Never>()
   fileprivate let startSignup = TestObserver<(), Never>()
+  fileprivate let startOAuthSignupOrLogin = TestObserver<(), Never>()
   fileprivate let startTwoFactorChallenge = TestObserver<String, Never>()
+  fileprivate let showLoginWithOAuth = TestObserver<Bool, Never>()
 
   override func setUp() {
     super.setUp()
@@ -47,7 +49,9 @@ final class LoginToutViewModelTests: TestCase {
       .observe(self.startFacebookConfirmation.observer)
     self.vm.outputs.startLogin.observe(self.startLogin.observer)
     self.vm.outputs.startSignup.observe(self.startSignup.observer)
+    self.vm.outputs.startOAuthSignupOrLogin.observe(self.startOAuthSignupOrLogin.observer)
     self.vm.outputs.startTwoFactorChallenge.observe(self.startTwoFactorChallenge.observer)
+    self.vm.outputs.showLoginWithOAuth.observe(self.showLoginWithOAuth.observer)
   }
 
   func testLoginIntent_Pledge() {
@@ -117,6 +121,43 @@ final class LoginToutViewModelTests: TestCase {
     )
   }
 
+  func testStartSignupOrLoginWithOAuth() {
+    self.vm.inputs.viewWillAppear()
+    self.vm.inputs.signupOrLoginWithOAuthButtonPressed()
+    self.startOAuthSignupOrLogin.assertValueCount(1, "OAuth signup/loginlogin emitted")
+  }
+
+  func testShowSignupOrLoginWithOAuth_featureFlagOn() {
+    let mockConfigClient = MockRemoteConfigClient()
+    mockConfigClient.features = [
+      RemoteConfigFeature.loginWithOAuthEnabled.rawValue: true
+    ]
+
+    withEnvironment(remoteConfigClient: mockConfigClient) {
+      self.vm.inputs.viewWillAppear()
+      self.showLoginWithOAuth.assertValues([true])
+    }
+  }
+
+  func testShowSignupOrLoginWithOAuth_featureFlagOff() {
+    let mockConfigClient = MockRemoteConfigClient()
+    mockConfigClient.features = [
+      RemoteConfigFeature.loginWithOAuthEnabled.rawValue: false
+    ]
+
+    withEnvironment(remoteConfigClient: mockConfigClient) {
+      self.vm.inputs.viewWillAppear()
+      self.showLoginWithOAuth.assertValues([false])
+    }
+  }
+
+  func testShowSignupOrLoginWithOAuth_featureFlagUnset() {
+    withEnvironment(remoteConfigClient: nil) {
+      self.vm.inputs.viewWillAppear()
+      self.showLoginWithOAuth.assertValues([true])
+    }
+  }
+
   func testHeadlineLabelHidden() {
     self.vm.inputs.configureWith(.starProject, project: nil, reward: nil)
     self.vm.inputs.viewWillAppear()