Merge pull request #566 from stytchauth/stytchui-funk

Fix some funk in StytchUI

Author: nidal-stytch

Sources/StytchUI/StytchUIClient/StytchUIClient.swift

@@ -16,7 +16,7 @@ public enum StytchUIClient {
     /// - Publishes a `Void` value each time a dismissal event occurs.
     /// - Never completes with a failure, so subscribers can safely remain attached for the lifetime of the application.
     public static var dismissUI: AnyPublisher<Void, Never> {
-        B2BAuthenticationManager.dismissUI
+        dismissUIPublisher.eraseToAnyPublisher()
     }
 
     private static let dismissUIPublisher = PassthroughSubject<Void, Never>()

Sources/StytchUI/StytchUIClient/ViewControllers/AuthHomeViewController/AuthHomeViewController.swift

@@ -98,13 +98,13 @@ extension AuthHomeViewController {
     }
 
     @objc func authenticateBiometricsButtonTapped() {
-        StytchB2BUIClient.startLoading()
+        StytchUIClient.startLoading()
         Task {
             do {
-                StytchB2BUIClient.stopLoading()
+                StytchUIClient.stopLoading()
                 _ = try await StytchClient.biometrics.authenticate(parameters: .init())
             } catch {
-                StytchB2BUIClient.stopLoading()
+                StytchUIClient.stopLoading()
                 ErrorPublisher.publishError(error)
                 presentErrorAlert(error: error)
             }

Sources/StytchUI/StytchUIClient/ViewControllers/AuthHomeViewController/AuthHomeViewModel.swift

@@ -26,16 +26,22 @@ extension AuthHomeViewModel {
                 if state.config.supportsBiometricsAndOAuth {
                     productComponents.appendIfNotPresent(.oAuthButtons)
                     productComponents.appendIfNotPresent(.biometrics)
+                } else {
+                    productComponents.appendIfNotPresent(.oAuthButtons)
                 }
             case .biometrics:
                 if state.config.supportsBiometricsAndOAuth {
                     productComponents.appendIfNotPresent(.biometrics)
                     productComponents.appendIfNotPresent(.oAuthButtons)
+                } else {
+                    productComponents.appendIfNotPresent(.biometrics)
                 }
             }
         }
 
-        if state.config.supportsInputProducts, state.config.supportsOauth || state.config.supportsBiometrics {
+        let shouldShowBiometrics = StytchClient.biometrics.availability.isAvailableRegistered && state.config.supportsBiometrics
+
+        if state.config.supportsInputProducts, state.config.supportsOauth || shouldShowBiometrics {
             if let index = productComponents.firstIndex(of: .inputProducts) {
                 if index == 0 {
                     productComponents.insert(.divider, at: 1)

Sources/StytchUI/StytchUIClient/ViewControllers/AuthInputViewController/AuthInputViewController.swift

@@ -43,7 +43,7 @@ final class AuthInputViewController: BaseViewController<AuthInputState, AuthInpu
     private lazy var inputs: [Input] = {
         var inputs: [Input] = []
 
-        if let otpMethods = viewModel.state.config.otpOptions?.methods {
+        if viewModel.state.config.supportsOTP == true, let otpMethods = viewModel.state.config.otpOptions?.methods {
             for method in otpMethods {
                 switch method {
                 case .sms:

Sources/StytchUI/StytchUIClient/ViewControllers/OAuthViewController/OAuthViewController.swift

@@ -30,13 +30,13 @@ final class OAuthViewController: BaseViewController<OAuthState, OAuthViewModel>
 
     @objc private func didTapOAuthButton(sender: UIControl) {
         guard let (_, provider) = viewModel.state.config.oauthProviders.enumerated().first(where: { $0.offset == sender.tag }) else { return }
-        StytchB2BUIClient.startLoading()
+        StytchUIClient.startLoading()
         Task {
             do {
-                StytchB2BUIClient.stopLoading()
+                StytchUIClient.stopLoading()
                 try await viewModel.startOAuth(provider: provider)
             } catch {
-                StytchB2BUIClient.stopLoading()
+                StytchUIClient.stopLoading()
                 try? await EventsClient.logEvent(parameters: .init(eventName: "ui_authentication_failure", error: error))
                 ErrorPublisher.publishError(error)
                 presentErrorAlert(error: error)