Fix rebase issues

tradingticket · Oct 17, 2018 · 28fe7e7 · 28fe7e7
1 parent 3154513
commit 28fe7e7
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 61 deletions.
diff --git a/TradeItIosTicketSDK2/TradeItCryptoOrder.swift b/TradeItIosTicketSDK2/TradeItCryptoOrder.swift
@@ -248,28 +248,12 @@
         previewOrderResult: TradeItCryptoPreviewTradeResult
     ) -> TradeItPlaceOrderHandlers {
         return { onSuccess, onSecurityQuestion, onFailure in
-            let placeOrderRequest = TradeItPlaceTradeRequest(orderId: previewOrderResult.orderId)
+            let placeOrderRequest = TradeItPlaceTradeRequest(orderId: previewOrderResult.orderId, andInterAppAddressCallback: "")
             let placeResponseHandler = YCombinator { handler in
                 { (result: TradeItResult?) in
                     switch result {
                     case let placeOrderResult as TradeItPlaceOrderResult:
                         onSuccess(placeOrderResult)
-                    case let securityQuestion as TradeItSecurityQuestionResult:
-                        onSecurityQuestion(
-                            securityQuestion,
-                            { securityQuestionAnswer in
-                                self.linkedBrokerAccount?.cryptoTradeService?.answerSecurityQuestionPlaceOrder(securityQuestionAnswer, withCompletionBlock: handler)
-                            },
-                            {
-                                handler(
-                                    TradeItErrorResult(
-                                        title: "Authentication failed",
-                                        message: "The security question was canceled.",
-                                        code: .sessionError
-                                    )
-                                )
-                            }
-                        )
                     case let errorResult as TradeItErrorResult:
                         onFailure(errorResult)
                     default:

diff --git a/TradeItIosTicketSDK2/TradeItLinkedBrokerAccount.swift b/TradeItIosTicketSDK2/TradeItLinkedBrokerAccount.swift
@@ -182,7 +182,7 @@
         onSuccess: @escaping () -> Void,
         onVerifyUrl: @escaping (
             URL,
-            _ complete1FA: @escaping () -> Void,
+            _ complete1FA: @escaping () -> Void
         ) -> Void,
         onFailure: @escaping (TradeItErrorResult) -> Void
     ) {

diff --git a/TradeItIosTicketSDK2/TradeItOrder.swift b/TradeItIosTicketSDK2/TradeItOrder.swift
@@ -3,7 +3,7 @@ public typealias TradeItPreviewOrderResult = TradeItPreviewTradeResult
 public typealias TradeItPlaceOrderHandlers = (
     _ onSuccess: @escaping (TradeItPlaceOrderResult) -> Void,
     _ onVerifyUrl: @escaping (URL,
-        _ completeTradeChallenge: @escaping () -> Void,
+        _ completeTradeChallenge: @escaping () -> Void
     ) -> Void,
     _ onFailure: @escaping (TradeItErrorResult) -> Void
 ) -> Void
@@ -238,7 +238,7 @@ public typealias TradeItPlaceOrderHandlers = (
                         onVerifyUrl(
                             oAuthUrl,
                             {
-                                tradeService?.complete1FA(completionBlock: handler)
+                                self.tradeService?.complete1FA(completionBlock: handler)
                             }
                         )
                     case let errorResult as TradeItErrorResult:

diff --git a/TradeItIosTicketSDK2/TradeItYahooLauncher.swift b/TradeItIosTicketSDK2/TradeItYahooLauncher.swift
@@ -111,42 +111,6 @@ import SafariServices
         }
     }
 
-    @objc 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()
-                    }
-                )
-            }
-        }
-
-        if let cancelOrderViewController = originalViewController?.childViewControllers.last as? TradeItOrdersViewController {
-            if let originalViewController = originalViewController {
-                originalViewController.dismiss(
-                    animated: true,
-                    completion: {
-                        cancelOrderViewController.handleCancelOrderSecurityResponse()
-                    }
-                )
-            }
-        }
-    }
-
     @objc public func launchTrading(
         fromViewController viewController: UIViewController,
         withOrder order: TradeItOrder,

diff --git a/TradeItIosTicketSDK2/TradeService.swift b/TradeItIosTicketSDK2/TradeService.swift
@@ -18,11 +18,6 @@ protocol TradeService {
         _ data: TradeItPlaceTradeRequest,
         withCompletionBlock completionBlock: @escaping (TradeItResult) -> Void
     )
-
-    func answerSecurityQuestionPlaceOrder(
-        _ answer: String,
-        withCompletionBlock completionBlock: @escaping (TradeItResult) -> Void
-    )
 }
 
 extension TradeService {