Fix Update authContext smart-on-fhir#33

EricMentele · Jul 23, 2020 · a9552f9 · a9552f9
1 parent f5d2830
commit a9552f9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -5,4 +5,5 @@ Contributors to the codebase, in reverse chronological order:
 
 - Dave Carlson, @drdavec
 - Pascal Pfiffner, @p2
+- Eric Mentele, @EricMentele
 
diff --git a/Sources/iOS/Auth+iOS.swift b/Sources/iOS/Auth+iOS.swift
@@ -20,7 +20,9 @@ extension Auth {
 	- parameter callback:   The callback that is called when authorization completes or fails
 	*/
 	func authorize(with oauth: OAuth2, properties: SMARTAuthProperties, callback: @escaping ((OAuth2JSON?, OAuth2Error?) -> Void)) {
-		authContext = UIApplication.shared.keyWindow?.rootViewController
+
+		let rootViewController = UIApplication.shared.keyWindow?.rootViewController
+		authContext = rootViewController?.presentedViewController ?? rootViewController
 
 		oauth.authConfig.authorizeContext = authContext
 		oauth.authConfig.authorizeEmbedded = properties.embedded
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,4 +5,5 @@ Contributors to the codebase, in reverse chronological order:

		- Dave Carlson, @drdavec
		- Pascal Pfiffner, @p2
		- Eric Mentele, @EricMentele