diff --git a/.DS_Store b/.DS_Store index 662a97a..19313ea 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/Vendoo.xcodeproj/project.pbxproj b/Vendoo.xcodeproj/project.pbxproj index b0a2396..f7312b0 100644 --- a/Vendoo.xcodeproj/project.pbxproj +++ b/Vendoo.xcodeproj/project.pbxproj @@ -23,7 +23,8 @@ 3E7CF4011CF6366300F486B2 /* EtsyRESTAPIManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7CF4001CF6366300F486B2 /* EtsyRESTAPIManager.swift */; }; 3E7CF4041CF6450D00F486B2 /* ListingObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E7CF4031CF6450D00F486B2 /* ListingObject.swift */; }; 3EA6689F1D0278E900EE57A8 /* TradingProxy in Resources */ = {isa = PBXBuildFile; fileRef = 3EA6689E1D0278E900EE57A8 /* TradingProxy */; }; - 3EA668A11D02836C00EE57A8 /* EbayWebServiceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */; }; + 3EA668A11D02836C00EE57A8 /* EbayWebServiceManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */; settings = {COMPILER_FLAGS = "-fvisibility=default"; }; }; + 3EA668A31D02ECB100EE57A8 /* libicucore.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EA668A21D02ECB100EE57A8 /* libicucore.tbd */; }; 3EB2F5161CF442CF002E6D2C /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3EB2F5151CF442CF002E6D2C /* Security.framework */; }; 3EC325111CF703A600626C48 /* ItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC325101CF703A600626C48 /* ItemCell.swift */; }; 3EC325151CF7104300626C48 /* ItemTableViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EC325141CF7104300626C48 /* ItemTableViewController.swift */; }; @@ -83,6 +84,7 @@ 3EA668961D026E7800EE57A8 /* Vendoo-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Vendoo-Bridging-Header.h"; sourceTree = ""; }; 3EA6689E1D0278E900EE57A8 /* TradingProxy */ = {isa = PBXFileReference; lastKnownFileType = folder; path = TradingProxy; sourceTree = ""; }; 3EA668A01D02836C00EE57A8 /* EbayWebServiceManager.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EbayWebServiceManager.swift; sourceTree = ""; }; + 3EA668A21D02ECB100EE57A8 /* libicucore.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libicucore.tbd; path = usr/lib/libicucore.tbd; sourceTree = SDKROOT; }; 3EB2F5151CF442CF002E6D2C /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = System/Library/Frameworks/Security.framework; sourceTree = SDKROOT; }; 3EC325101CF703A600626C48 /* ItemCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemCell.swift; sourceTree = ""; }; 3EC325141CF7104300626C48 /* ItemTableViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ItemTableViewController.swift; sourceTree = ""; }; @@ -107,6 +109,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3EA668A31D02ECB100EE57A8 /* libicucore.tbd in Frameworks */, 3EC3252F1CF894E500626C48 /* AVFoundation.framework in Frameworks */, 3EB2F5161CF442CF002E6D2C /* Security.framework in Frameworks */, D5995A6D02C7FCA4F561AAB3 /* Pods_Vendoo.framework in Frameworks */, @@ -135,6 +138,7 @@ 3E4897CE1D0062860069F742 /* Services */ = { isa = PBXGroup; children = ( + 3EA668941D026E2A00EE57A8 /* EbayServices */, 3E4897CF1D00629B0069F742 /* FirebaseServices */, 3E7CF3FF1CF6363200F486B2 /* EtsyServices */, 3EC325241CF7E6B300626C48 /* FacebookServices */, @@ -175,7 +179,6 @@ 3E6CC3551CF2A94B00E00A70 /* Vendoo */ = { isa = PBXGroup; children = ( - 3EA668941D026E2A00EE57A8 /* EbayServices */, 3E4897CE1D0062860069F742 /* Services */, 3EC3252B1CF8944800626C48 /* NewItemPostingSession */, 3EC325211CF7D91100626C48 /* TabbedScreens */, @@ -316,6 +319,7 @@ D989DD70699180D9DB9DA709 /* Frameworks */ = { isa = PBXGroup; children = ( + 3EA668A21D02ECB100EE57A8 /* libicucore.tbd */, 3EC3252E1CF894E500626C48 /* AVFoundation.framework */, 3EB2F5151CF442CF002E6D2C /* Security.framework */, F8F69918E43DC1276F42551F /* Pods_Vendoo.framework */, @@ -757,16 +761,93 @@ baseConfigurationReference = C9F6F7897E53ED9583C965E3 /* Pods-Vendoo.debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "Vendoo/**"; INFOPLIST_FILE = Vendoo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; New_Setting = ""; + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"c++\"", + "-l\"icucore\"", + "-l\"sqlite3\"", + "-l\"z\"", + "-framework", + "\"AFNetworking\"", + "-framework", + "\"AdSupport\"", + "-framework", + "\"AddressBook\"", + "-framework", + "\"AeroGearHttp\"", + "-framework", + "\"AeroGearOAuth2\"", + "-framework", + "\"Alamofire\"", + "-framework", + "\"Alamofire_SwiftyJSON\"", + "-framework", + "\"Bolts\"", + "-framework", + "\"CFNetwork\"", + "-framework", + "\"CoreGraphics\"", + "-framework", + "\"FBSDKCoreKit\"", + "-framework", + "\"FBSDKLoginKit\"", + "-framework", + "\"FBSDKShareKit\"", + "-framework", + "\"FirebaseAnalytics\"", + "-framework", + "\"FirebaseAuth\"", + "-framework", + "\"FirebaseDatabase\"", + "-framework", + "\"FirebaseInstanceID\"", + "-framework", + "\"FirebaseStorage\"", + "-framework", + "\"GDataXML_HTML\"", + "-framework", + "\"GoogleInterchangeUtilities\"", + "-framework", + "\"GoogleNetworkingUtilities\"", + "-framework", + "\"GoogleSymbolUtilities\"", + "-framework", + "\"GoogleUtilities\"", + "-framework", + "\"Locksmith\"", + "-framework", + "\"MobileCoreServices\"", + "-framework", + "\"OAuthSwift\"", + "-framework", + "\"PicoKit\"", + "-framework", + "\"SafariServices\"", + "-framework", + "\"Security\"", + "-framework", + "\"StoreKit\"", + "-framework", + "\"SwiftyJSON\"", + "-framework", + "\"SystemConfiguration\"", + "-framework", + "\"TYMActivityIndicatorView\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.Kroleo.Vendoo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_INCLUDE_PATHS = ""; SWIFT_OBJC_BRIDGING_HEADER = "Vendoo/Vendoo-Bridging-Header.h"; USER_HEADER_SEARCH_PATHS = "\"Vendoo/**\" \"Pods/**\""; + VALID_ARCHS = "arm64 armv7 armv7s"; }; name = Debug; }; @@ -775,16 +856,94 @@ baseConfigurationReference = 6979B7B8AF7AC049C2F23196 /* Pods-Vendoo.release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + ARCHS = "$(ARCHS_STANDARD)"; ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + GCC_SYMBOLS_PRIVATE_EXTERN = YES; INCLUDED_RECURSIVE_SEARCH_PATH_SUBDIRECTORIES = "Vendoo/**"; INFOPLIST_FILE = Vendoo/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; New_Setting = ""; + ONLY_ACTIVE_ARCH = NO; + OTHER_LDFLAGS = ( + "$(inherited)", + "-ObjC", + "-l\"c++\"", + "-l\"icucore\"", + "-l\"sqlite3\"", + "-l\"z\"", + "-framework", + "\"AFNetworking\"", + "-framework", + "\"AdSupport\"", + "-framework", + "\"AddressBook\"", + "-framework", + "\"AeroGearHttp\"", + "-framework", + "\"AeroGearOAuth2\"", + "-framework", + "\"Alamofire\"", + "-framework", + "\"Alamofire_SwiftyJSON\"", + "-framework", + "\"Bolts\"", + "-framework", + "\"CFNetwork\"", + "-framework", + "\"CoreGraphics\"", + "-framework", + "\"FBSDKCoreKit\"", + "-framework", + "\"FBSDKLoginKit\"", + "-framework", + "\"FBSDKShareKit\"", + "-framework", + "\"FirebaseAnalytics\"", + "-framework", + "\"FirebaseAuth\"", + "-framework", + "\"FirebaseDatabase\"", + "-framework", + "\"FirebaseInstanceID\"", + "-framework", + "\"FirebaseStorage\"", + "-framework", + "\"GDataXML_HTML\"", + "-framework", + "\"GoogleInterchangeUtilities\"", + "-framework", + "\"GoogleNetworkingUtilities\"", + "-framework", + "\"GoogleSymbolUtilities\"", + "-framework", + "\"GoogleUtilities\"", + "-framework", + "\"Locksmith\"", + "-framework", + "\"MobileCoreServices\"", + "-framework", + "\"OAuthSwift\"", + "-framework", + "\"PicoKit\"", + "-framework", + "\"SafariServices\"", + "-framework", + "\"Security\"", + "-framework", + "\"StoreKit\"", + "-framework", + "\"SwiftyJSON\"", + "-framework", + "\"SystemConfiguration\"", + "-framework", + "\"TYMActivityIndicatorView\"", + ); PRODUCT_BUNDLE_IDENTIFIER = com.Kroleo.Vendoo; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_INCLUDE_PATHS = ""; SWIFT_OBJC_BRIDGING_HEADER = "Vendoo/Vendoo-Bridging-Header.h"; USER_HEADER_SEARCH_PATHS = "\"Vendoo/**\" \"Pods/**\""; + VALID_ARCHS = "arm64 armv7 armv7s"; }; name = Release; }; diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate index ca02375..ef44121 100644 Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist index 6136c82..fc21683 100644 --- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist +++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -146,5 +146,21 @@ landmarkType = "5"> + + + + diff --git a/Vendoo/EbayWebServiceManager.swift b/Vendoo/EbayWebServiceManager.swift index 2730f48..64d91f5 100644 --- a/Vendoo/EbayWebServiceManager.swift +++ b/Vendoo/EbayWebServiceManager.swift @@ -7,15 +7,51 @@ // import Foundation +import PicoKit class EbayWebServiceManager: NSObject { - let tradingClient = EBayTradingServiceClient.sharedClient() + //API Manager class variables + //----------------------------------------------// + let baseURL = "https://openapi.etsy.com/v2/private" + + private var apiKey: String! + private var apiSecret: String! + private var userEmail:String = (NSUserDefaults.standardUserDefaults().objectForKey("email") as? String)! + var isAuthorized: Bool = NSUserDefaults.standardUserDefaults().boolForKey("ebayAuthorized") + //static let tradingClient = EBayTradingServiceClient.sharedClient() + //---------------------------------------------// + + override init(){ super.init() - self.tradingClient.debug = true + //EbayWebServiceManager.tradingClient.debug = true + } } + + +//MARK: - authentication methods +extension EbayWebServiceManager { + + func authorizeApp(){ + /* + let sessionRequest = Trading_GetSessionIDRequestType.init() + sessionRequest.ruName = "Kroleo-Kroleo-Vendoo-S-ktqeobkk" + EbayWebServiceManager.tradingClient.getSessionID(sessionRequest, success: ({ + (response: Trading_GetSessionIDResponseType!) -> Void in + + }), failure: ({ + (error: NSError!, bindable: PicoBindable!) -> Void in + + })) + */ + } + + func deauthorizeApp(){ + + } +} diff --git a/Vendoo/HomeViewController.swift b/Vendoo/HomeViewController.swift index 77e499e..d801892 100644 --- a/Vendoo/HomeViewController.swift +++ b/Vendoo/HomeViewController.swift @@ -14,6 +14,7 @@ class HomeViewController: UITabBarController { let etsyManager: EtsyRESTAPIManager = EtsyRESTAPIManager() let fbGraphManager = FacebookGraphAPIManager() let firebaseManager = FirebaseManager() + let ebayGraphManager = EbayWebServiceManager() var userListings: [Listing] = [] diff --git a/Vendoo/NetworksTableViewController.swift b/Vendoo/NetworksTableViewController.swift index 27b9f1e..23937a4 100644 --- a/Vendoo/NetworksTableViewController.swift +++ b/Vendoo/NetworksTableViewController.swift @@ -29,6 +29,7 @@ class NetworksTableViewController: UIViewController { private var graphManager: FacebookGraphAPIManager! = nil private var firManager: FirebaseManager! = nil private var etsyManager: EtsyRESTAPIManager! = nil + private var ebayManager: EbayWebServiceManager! @@ -144,6 +145,12 @@ extension NetworksTableViewController: UITableViewDataSource { case 0: //loads network cell for ebay cell = (self.tableView.dequeueReusableCellWithIdentifier("ebay", forIndexPath: indexPath) as! EbayTableViewCell) + + if(((self.tabBarController as? HomeViewController)?.ebayGraphManager.isAuthorized)!){ + + (cell as! EbayTableViewCell).networkToggle.setOn(true, animated: false) + } + break case 1: //loads network cell for amazon @@ -425,6 +432,10 @@ extension NetworksTableViewController: UITableViewDelegate { cell.networkToggle.on = true //code to authorize network + let tabBar = self.tabBarController + ((tabBar as? HomeViewController)?.ebayGraphManager.authorizeApp())! + + cell.networkToggle.on = ((tabBar as? HomeViewController)?.ebayGraphManager.isAuthorized)! } break diff --git a/Vendoo/Services.plist b/Vendoo/Services.plist index e2be465..6b26739 100644 --- a/Vendoo/Services.plist +++ b/Vendoo/Services.plist @@ -2,6 +2,15 @@ + Ebay + + consumerKey + Kroleo-Vendoo-SBX-64d8cb02c-937748da + devID + fbe42cd4-d9dd-4450-9cf1-b43055febe36 + CertID + SBX-4d8cb02c893a-af4f-4e6d-9558-b3a1 + Etsy accessToken