Cimb - Yahoo screen - Implements trading 1FA

Author: guillaumedebavelaere

ExampleApp/AppDelegate.swift

@@ -219,6 +219,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     private func handleExampleVerify1FA(verify1FACallbackUrl: URL, host: String) {
         let VERIFY_1FA = "complete1FA"
+        let YAHOO_HOST = "completeYahoo1FA"
         if var topViewController = UIApplication.shared.keyWindow?.rootViewController {
             while let presentedViewController = topViewController.presentedViewController {
                 topViewController = presentedViewController
@@ -235,6 +236,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                     onTopmostViewController: topViewController,
                     verify1FACallbackUrl: verify1FACallbackUrl
                 )
+            case YAHOO_HOST:
+                TradeItSDK.yahooLauncher.handleVerify1FACallback(
+                    onTopmostViewController: topViewController,
+                    verify1FACallbackUrl: verify1FACallbackUrl
+                )
             default:
                 print("=====> ERROR: Received unknown verify 1 FA callback URL host: \(host)")
             }

TradeItIosTicketSDK2/TradeItYahooLauncher.swift

@@ -98,6 +98,31 @@ import SafariServices
         }
     }
 
+    public func handleVerify1FACallback(
+        onTopmostViewController topMostViewController: UIViewController,
+        verify1FACallbackUrl: URL
+    ) {
+        print("=====> handleVerify1FACallback: \(verify1FACallbackUrl.absoluteString)")
+
+        var originalViewController: UIViewController?
+
+        // Check for the OAuth "popup" screen
+        if topMostViewController is SFSafariViewController {
+            originalViewController = topMostViewController.presentingViewController
+        }
+
+        if let tradeItYahooTradePreviewViewController = originalViewController?.childViewControllers.last as? TradeItYahooTradePreviewViewController {
+            if let originalViewController = originalViewController {
+                originalViewController.dismiss(
+                    animated: true,
+                    completion: {
+                        tradeItYahooTradePreviewViewController.handleTradeSecurityResponse()
+                    }
+                )
+            }
+        }
+    }
+
     public func launchTrading(
         fromViewController viewController: UIViewController,
         withOrder order: TradeItOrder,

TradeItIosTicketSDK2/TradeItYahooTradePreviewViewController.swift

@@ -109,13 +109,10 @@ class TradeItYahooTradePreviewViewController: TradeItYahooViewController, UITabl
 
                         self.fireViewEventNotification(view: .submitted)
                     },
-                    { securityQuestion, answerSecurityQuestion, cancelSecurityQuestion in
-                        self.alertManager.promptUserToAnswerSecurityQuestion(
-                            securityQuestion,
-                            onViewController: self,
-                            onAnswerSecurityQuestion: answerSecurityQuestion,
-                            onCancelSecurityQuestion: cancelSecurityQuestion
-                        )
+                    { url, complete1FA in
+                        self.tradeSecurityHandler = complete1FA
+                        let safariViewController = SFSafariViewController(url: url)
+                        self.present(safariViewController, animated: true, completion: nil)
                     },
                     { errorResult in
                         activityView.hide(animated: true)
@@ -240,7 +237,20 @@ class TradeItYahooTradePreviewViewController: TradeItYahooViewController, UITabl
     }
 
     // MARK: Private
-    
+
+    private var tradeSecurityHandler: (() -> Void)?
+    internal func handleTradeSecurityResponse() {
+        if let tradeSecurityHandler = self.tradeSecurityHandler {
+            tradeSecurityHandler()
+        } else {
+            return self.alertManager.showError(
+                TradeItErrorResult.tradeError(withSystemMessage: "Trade could not be submitted please try again."),
+                onViewController: self
+            )
+        }
+
+    }
+
     private func updatePlaceOrderButtonStatus() {
         if allAcknowledgementsAccepted() {
             self.actionButton.enable()