Merge pull request #11 from AyogoHealth/NFP-1073

[iOS] Fix OAuth on iOS 13
AyogoHealth · Jun 10, 2020 · 61170a8 · 61170a8
2 parents 5945807 + 723894b
commit 61170a8
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/ios/OAuthPlugin.swift b/src/ios/OAuthPlugin.swift
@@ -40,13 +40,11 @@ class ASWebAuthenticationSessionOAuthSessionProvider : OAuthSessionProvider {
     }
 
     func start() {
-        #if swift(>=5.1)
-            if #available(iOS 13.0, *) {
-                if let provider = self.delegate as? ASWebAuthenticationPresentationContextProviding {
-                    self.aswas.presentationContextProvider = provider
-                }
+        if #available(iOS 13.0, *) {
+            if let provider = self.delegate as? ASWebAuthenticationPresentationContextProviding {
+                self.aswas.presentationContextProvider = provider
             }
-        #endif
+        }
 
         self.aswas.start()
     }
@@ -118,7 +116,7 @@ class SafariAppOAuthSessionProvider : OAuthSessionProvider {
 
 
 @objc(CDVOAuthPlugin)
-class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate {
+class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate, ASWebAuthenticationPresentationContextProviding {
     var authSystem : OAuthSessionProvider?
     var callbackScheme : String?
     var logger : OSLog?
@@ -218,13 +216,9 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate {
        self.authSystem?.cancel()
        self.authSystem = nil
     }
-}
 
-#if swift(>=5.1)
-extension OAuthPlugin : ASWebAuthenticationPresentationContextProviding {
     @available(iOS 13.0, *)
     func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
         return self.viewController.view.window ?? ASPresentationAnchor()
     }
 }
-#endif