Update SMART submodule and adapt

smart-on-fhir · Sep 24, 2016 · 546c9d6 · 546c9d6
1 parent 727dbdc
commit 546c9d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/SoF-MedList.xcodeproj/project.pbxproj b/SoF-MedList.xcodeproj/project.pbxproj
@@ -253,7 +253,7 @@
 		EE9EE7091AC49C3D002D8B49 /* SwiftSMART-OSXTests.xctest */ = {
 			isa = PBXReferenceProxy;
 			fileType = wrapper.cfbundle;
-			path = "SwiftSMART-OSXTests.xctest";
+			path = "SwiftSMART-macOSTests.xctest";
 			remoteRef = EE9EE7081AC49C3D002D8B49 /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};

diff --git a/SoF-MedList/AppDelegate.swift b/SoF-MedList/AppDelegate.swift
@@ -16,7 +16,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 	var window: UIWindow?
 
 	lazy var smart: Client = Client(
-		baseURL: "https://fhir-api-dstu2.smarthealthit.org",
+		baseURL: URL(string: "https://fhir-api-dstu2.smarthealthit.org")!,
 		settings: [
 			"client_id": "my_mobile_app",
 			"client_name": "SMART on FHIR iOS Medication Sample App",
@@ -28,17 +28,17 @@ class AppDelegate: UIResponder, UIApplicationDelegate
 	)
 
 	func application(_ app: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]? = nil) -> Bool {
-			let splitViewController = self.window!.rootViewController as! UISplitViewController
-			let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.endIndex-1] as! UINavigationController
-			splitViewController.delegate = navigationController.topViewController as! DetailViewController
+		let splitViewController = self.window!.rootViewController as! UISplitViewController
+		let navigationController = splitViewController.viewControllers[splitViewController.viewControllers.endIndex-1] as! UINavigationController
+		splitViewController.delegate = navigationController.topViewController as! DetailViewController
 
 		return true
 	}
 
 
 	// MARK: - SMART Tasks
 
-	func selectPatient(callback: @escaping (_ patient: Patient?, _ error: Error?) -> Void) {
+	func selectPatient(_ callback: @escaping (_ patient: Patient?, _ error: Error?) -> Void) {
 		smart.authProperties.embedded = true
 //		smart.authProperties.granularity = .patientSelectWeb
 		smart.authProperties.granularity = .patientSelectNative

diff --git a/Swift-SMART b/Swift-SMART
+1 −1		OAuth2
+9 −2		Sources/Client/Auth.swift
+5 −5		Sources/Client/Server.swift
+6 −11		Sources/iOS/Auth+iOS.swift
+2 −9		Sources/macOS/Auth+macOS.swift
+1 −1		Swift-FHIR