WIP

Author: guillaumedebavelaere

ExampleApp/AppDelegate.swift

@@ -11,6 +11,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         TradeItSDK.configure(
             apiKey: AppDelegate.API_KEY,
             oAuthCallbackUrl: URL(string: "tradeItExampleScheme://completeOAuth")!,
+            verify1FACallbackUrl: URL(string: "tradeItExampleScheme://complete1FA")!,
             environment: AppDelegate.ENVIRONMENT,
             userCountryCode: "US"
         )
@@ -45,16 +46,20 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         print("=====> Received OAuth callback URL: \(url.absoluteString)")
 
         let MANUAL_HOST = "manualCompleteOAuth"
+        let VERIFY_1FA = "complete1FA"
 
         // Check for the intended url.scheme, url.host, and url.path before proceeding
         if let urlComponents = URLComponents(url: url, resolvingAgainstBaseURL: false),
             urlComponents.scheme == "tradeitexamplescheme",
             let host = urlComponents.host,
-            let queryItems = urlComponents.queryItems,
-            let oAuthVerifier = queryItems.filter({ $0.name == "oAuthVerifier" }).first?.value {
+            let queryItems = urlComponents.queryItems {
 
             if host == MANUAL_HOST {
-                self.completeManualOAuth(oAuthVerifier: oAuthVerifier)
+                if let oAuthVerifier = queryItems.filter({ $0.name == "oAuthVerifier" }).first?.value {
+                    self.completeManualOAuth(oAuthVerifier: oAuthVerifier)
+                }
+            } else if host == VERIFY_1FA {
+                self.handleExampleVerify1FA(verify1FACallbackUrl: url, host: host)
             } else {
                 self.handleExampleOAuth(oAuthCallbackUrl: url, host: host)
             }
@@ -211,6 +216,30 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             }
         }
     }
+
+    private func handleExampleVerify1FA(verify1FACallbackUrl: URL, host: String) {
+        let VERIFY_1FA = "complete1FA"
+        if var topViewController = UIApplication.shared.keyWindow?.rootViewController {
+            while let presentedViewController = topViewController.presentedViewController {
+                topViewController = presentedViewController
+            }
+
+            if let navController = topViewController as? UINavigationController,
+                let navTopViewController = navController.topViewController {
+                topViewController = navTopViewController
+            }
+
+            switch host {
+            case VERIFY_1FA:
+                TradeItSDK.launcher.handleVerify1FACallback(
+                    onTopmostViewController: topViewController,
+                    verify1FACallbackUrl: verify1FACallbackUrl
+                )
+            default:
+                print("=====> ERROR: Received unknown verify 1 FA callback URL host: \(host)")
+            }
+        }
+    }
 }
 
 // Only implement this protocol if you need to inject your own market data

ExampleApp/ExampleViewController.swift

@@ -239,12 +239,12 @@ class ExampleViewController: UIViewController, UITableViewDataSource, UITableVie
                         action: {
                             let order = TradeItOrder()
                             // Any order fields that are set will pre-populate the ticket.
-                            order.symbol = "CMG"
-                            order.quantity = 10
-                            order.action = .sell
-                            order.type = .stopLimit
-                            order.limitPrice = 20
-                            order.stopPrice = 30
+                            order.symbol = "T39"
+                            order.quantity = 100
+                            order.action = .buy
+                            order.type = .limit
+                            order.limitPrice = 0.5
+//                            order.stopPrice = 30
                             order.expiration = .goodUntilCanceled
                             TradeItSDK.launcher.launchTrading(fromViewController: self, withOrder: order)
                         }

Podfile.lock

@@ -25,7 +25,7 @@ DEPENDENCIES:
   - Quick (~> 0.10.0)
 
 SPEC REPOS:
-  https://github.com/CocoaPods/Specs.git:
+  https://github.com/cocoapods/specs.git:
     - BEMCheckBox
     - JSONModel
     - MBProgressHUD
@@ -43,4 +43,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 8de6c042a9db9777f64178e4995be9fd85814f2f
 
-COCOAPODS: 1.5.0
+COCOAPODS: 1.5.2

TradeItIosEmsApi/TradeItComplete1FARequest.h

@@ -0,0 +1,9 @@
+#import <TradeItIosTicketSDK2/TradeItIosTicketSDK2.h>
+
+@interface TradeItComplete1FARequest : TradeItRequest
+
+-(nonnull id) initWithToken:(NSString* _Nullable) token;
+
+@property (copy) NSString * _Nullable token;
+
+@end

TradeItIosEmsApi/TradeItComplete1FARequest.m

@@ -0,0 +1,13 @@
+#import "TradeItComplete1FARequest.h"
+
+@implementation TradeItComplete1FARequest
+
+-(id) initWithToken:(NSString*) token {
+    self = [super init];
+    if(self){
+        self.token = token;
+    }
+    return self;
+}
+
+@end

TradeItIosEmsApi/TradeItIosEmsApiLib.h

@@ -66,6 +66,8 @@
 #import "TradeItFxOrderCapabilities.h"
 #import "TradeItFxOrderCapabilitiesResult.h"
 #import "TradeItFxQuoteRequest.h"
+#import "TradeItVerifyOAuthURLResult.h"
+#import "TradeItComplete1FARequest.h"
 
 // Use the BalanceService to get account balance information
 #import "TradeItAccountOverviewRequest.h"

TradeItIosEmsApi/TradeItPlaceTradeRequest.h

@@ -11,7 +11,8 @@
 
 @interface TradeItPlaceTradeRequest : TradeItRequest
 
-- (id _Nonnull)initWithOrderId:(NSString * _Nonnull) orderId;
+- (id _Nonnull)initWithOrderId:(NSString * _Nonnull) orderId
+    andInterAppAddressCallback:(NSString * _Nonnull) interAppAddressCallback;
 
 // The orderId as returned from the TradeItPreviewTradeRequest
 @property (copy) NSString * _Nullable orderId;
@@ -21,4 +22,6 @@
 // Setting this will be overriden
 @property (copy) NSString * _Nullable token;
 
+@property (copy) NSString * _Nullable interAppAddressCallback;
+
 @end

TradeItIosEmsApi/TradeItPlaceTradeRequest.m

@@ -10,10 +10,12 @@
 
 @implementation TradeItPlaceTradeRequest
 
-- (id)initWithOrderId:(NSString *) orderId {
+- (id)initWithOrderId:(NSString *) orderId
+andInterAppAddressCallback:(NSString *) interAppAddressCallback {
     self = [super init];
     if (self) {
         self.orderId = orderId;
+        self.interAppAddressCallback = interAppAddressCallback;
     }
     return self;
 }

TradeItIosEmsApi/TradeItResult.h

@@ -43,6 +43,8 @@
 
 - (BOOL)isSecurityQuestion;
 
+- (BOOL)isVerify1FA;
+
 - (BOOL)isReviewOrder;
 
 - (BOOL)isError;

TradeItIosEmsApi/TradeItResult.m

@@ -25,6 +25,10 @@ - (BOOL)isSecurityQuestion {
     return [@"INFORMATION_NEEDED" isEqualToString:self.status];
 }
 
+- (BOOL)isVerify1FA {
+    return [@"VERIFY_1FA" isEqualToString:self.status];
+}
+
 - (BOOL)isReviewOrder {
     return [@"REVIEW_ORDER" isEqualToString:self.status];
 }