Cimb - implements 1 FA when canceling an order

Author: guillaumedebavelaere

TradeItIosEmsApi/TradeItCancelOrderRequest.h

@@ -5,5 +5,8 @@
 @property (nonatomic, copy, nullable) NSString * token;
 @property (nonatomic, copy, nullable) NSString * accountNumber;
 @property (nonatomic, copy, nullable) NSString * orderNumber;
+@property (nonatomic, copy, nullable) NSString * interAppAddressCallback;
+
+- (_Nonnull id)initWithInterAppAddressCallback:(NSString * _Nonnull)interAppAddressCallback;
 
 @end

TradeItIosEmsApi/TradeItCancelOrderRequest.m

@@ -1,5 +1,13 @@
 #import "TradeItCancelOrderRequest.h"
 
 @implementation TradeItCancelOrderRequest
+    - (id)initWithInterAppAddressCallback:(NSString *)interAppAddressCallback {
+        self = [super init];
 
+        if (self) {
+            self.interAppAddressCallback = interAppAddressCallback;
+        }
+
+        return self;
+    }
 @end

TradeItIosTicketSDK2/TradeItLauncher.swift

@@ -86,6 +86,17 @@ protocol OAuthCompletionListener {
                 )
             }
         }
+
+        if let cancelOrderViewController = originalViewController?.childViewControllers.last as? TradeItOrdersViewController {
+            if let originalViewController = originalViewController {
+                originalViewController.dismiss(
+                    animated: true,
+                    completion: {
+                        cancelOrderViewController.handleCancelOrderSecurityResponse()
+                    }
+                )
+            }
+        }
     }
 
     public func launchPortfolio(fromViewController viewController: UIViewController) {

TradeItIosTicketSDK2/TradeItLinkedBrokerAccount.swift

@@ -171,19 +171,18 @@
 
     public func cancelOrder(orderNumber: String,
                             onSuccess: @escaping () -> Void,
-                            onSecurityQuestion: @escaping (
-                                TradeItSecurityQuestionResult,
-                                _ submitAnswer: @escaping (String) -> Void,
-                                _ onCancelSecurityQuestion: @escaping () -> Void
+                            onVerifyUrl: @escaping (
+                                                URL,
+                                                _ complete1FA: @escaping () -> Void
                             ) -> Void,
                             onFailure: @escaping (TradeItErrorResult) -> Void) {
-        let request = TradeItCancelOrderRequest()
+        let request = TradeItCancelOrderRequest(interAppAddressCallback: TradeItSDK.verify1FACallbackUrl.absoluteString)
         request.accountNumber = self.accountNumber
         request.orderNumber = orderNumber
         self.orderService?.cancelOrder(
             request,
             onSuccess: onSuccess,
-            onSecurityQuestion: onSecurityQuestion,
+            onVerifyUrl: onVerifyUrl,
             onFailure: { error in
                 self.setError(error)
                 onFailure(error)

TradeItIosTicketSDK2/TradeItOrderService.swift

@@ -36,10 +36,9 @@ internal class TradeItOrderService: NSObject {
     func cancelOrder(
         _ data: TradeItCancelOrderRequest,
         onSuccess: @escaping () -> Void,
-        onSecurityQuestion: @escaping (
-            TradeItSecurityQuestionResult,
-            _ submitAnswer: @escaping (String) -> Void,
-            _ onCancelSecurityQuestion: @escaping () -> Void
+        onVerifyUrl: @escaping (
+                            URL,
+                            _ complete1FA: @escaping () -> Void
         ) -> Void,
         onFailure: @escaping (TradeItErrorResult) -> Void
         ) {
@@ -54,24 +53,23 @@ internal class TradeItOrderService: NSObject {
         let cancelOrderResponseHandler = YCombinator { handler in
             { (result: TradeItResult?) in
                 switch result {
-                case _ as TradeItAllOrderStatusResult:
-                    onSuccess()
-                case let securityQuestion as TradeItSecurityQuestionResult:
-                    onSecurityQuestion(
-                        securityQuestion,
-                        { securityQuestionAnswer in
-                            self.answerSecurityQuestionCancelOrder(securityQuestionAnswer, withCompletionBlock: handler)
-                        },
-                        {
-                            handler(
-                                TradeItErrorResult(
-                                    title: "Authentication failed",
-                                    message: "The security question was canceled.",
-                                    code: .sessionError
-                                )
+                case let verifyOAuthURLResult as TradeItVerifyOAuthURLResult:
+                    guard let oAuthUrl = verifyOAuthURLResult.oAuthUrl() else {
+                        onFailure(
+                            TradeItErrorResult(
+                                title: "Received empty OAuth verify popup URL"
                             )
+                        )
+                        return
+                    }
+                    onVerifyUrl(
+                        oAuthUrl,
+                        {
+                            self.complete1FA(completionBlock: handler)
                         }
                     )
+                case _ as TradeItAllOrderStatusResult:
+                    onSuccess()
                 case let errorResult as TradeItErrorResult:
                     onFailure(errorResult)
                 default:
@@ -84,14 +82,15 @@ internal class TradeItOrderService: NSObject {
             cancelOrderResponseHandler(result)
         }
     }
-    
-    func answerSecurityQuestionCancelOrder(_ answer: String, withCompletionBlock completionBlock: @escaping (TradeItResult) -> Void) {
-        let secRequest = TradeItSecurityQuestionRequest(token: self.session.token, andAnswer: answer)
+
+    func complete1FA(completionBlock: @escaping (TradeItResult) -> Void) {
+        let complete1FARequest = TradeItComplete1FARequest(token: self.session.token)
         let request = TradeItRequestFactory.buildJsonRequest(
-            for: secRequest,
-            emsAction: "user/answerSecurityQuestion",
+            for: complete1FARequest,
+            emsAction: "user/complete1FA",
             environment: self.session.connector.environment
         )
+
         self.session.connector.send(request, targetClassType: TradeItAllOrderStatusResult.self) { result in
             completionBlock(
                 result ?? TradeItErrorResult.tradeError(withSystemMessage: "Error canceling order.")

TradeItIosTicketSDK2/TradeItOrdersViewController.swift

@@ -1,6 +1,7 @@
 import UIKit
 import PromiseKit
 import MBProgressHUD
+import SafariServices
 
 class TradeItOrdersViewController: TradeItViewController, TradeItOrdersTableDelegate {
     var ordersTableViewManager: TradeItOrdersTableViewManager?
@@ -90,13 +91,10 @@ class TradeItOrdersViewController: TradeItViewController, TradeItOrdersTableDele
                     activityView.hide(animated: true)
                     self.loadOrders()
                 },
-                onSecurityQuestion: { securityQuestion, answerSecurityQuestion, cancelSecurityQuestion in
-                    self.alertManager.promptUserToAnswerSecurityQuestion(
-                        securityQuestion,
-                        onViewController: self,
-                        onAnswerSecurityQuestion: answerSecurityQuestion,
-                        onCancelSecurityQuestion: cancelSecurityQuestion
-                    )
+                onVerifyUrl: { url, complete1FA in
+                    self.cancelOrderSecurityHandler = complete1FA
+                    let safariViewController = SFSafariViewController(url: url)
+                    self.present(safariViewController, animated: true, completion: nil)
                 },
                 onFailure: { error in
                     activityView.hide(animated: true)
@@ -121,7 +119,19 @@ class TradeItOrdersViewController: TradeItViewController, TradeItOrdersTableDele
             onCancelActionTapped: {}
         )
     }
-    
+
+    private var cancelOrderSecurityHandler: (() -> Void)?
+    internal func handleCancelOrderSecurityResponse() {
+        if let cancelOrderSecurityHandler = self.cancelOrderSecurityHandler {
+            cancelOrderSecurityHandler()
+        } else {
+            return self.alertManager.showError(
+                TradeItErrorResult.error(withSystemMessage: "Canceling order could not be submitted please try again."),
+                onViewController: self
+            )
+        }
+    }
+
     // MARK: private
 
     private func loadOrders() {