cordova-plugin-oauth 1.1.0 → 2.0.2

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "cordova-plugin-oauth",
-  "version": "1.1.0",
+  "version": "2.0.2",
   "author": "Ayogo Health Inc. <info@ayogo.com>",
   "contributors": [
-    "Darryl Pogue <darryl@dpogue.ca>"
+    "Darryl Pogue <darryl@dpogue.ca>",
+    "Harel Mazor"
   ],
   "description": "Cordova plugin for performing OAuth login flows.",
   "license": "Apache-2.0",

package/plugin.xml

@@ -14,7 +14,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-oauth" version="1.1.0">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-oauth" version="2.0.2">
   <name>cordova-plugin-oauth</name>
   <description>Cordova plugin for performing OAuth login flows.</description>
   <keywords>cordova,ios,android,oauth</keywords>

package/src/ios/OAuthPlugin.swift

@@ -32,7 +32,9 @@ class ASWebAuthenticationSessionOAuthSessionProvider : OAuthSessionProvider {
     var delegate : AnyObject?
 
     required init(_ endpoint : URL, callbackScheme : String) {
-        self.aswas = ASWebAuthenticationSession(url: endpoint, callbackURLScheme: callbackScheme, completionHandler: { (callBack:URL?, error:Error?) in
+        let url: URL = URL(string: callbackScheme)!
+        let callbackURLScheme: String = url.scheme ?? callbackScheme
+        self.aswas = ASWebAuthenticationSession(url: endpoint, callbackURLScheme: callbackURLScheme, completionHandler: { (callBack:URL?, error:Error?) in
             if let incomingUrl = callBack {
                 NotificationCenter.default.post(name: NSNotification.Name.CDVPluginHandleOpenURL, object: incomingUrl)
             }
@@ -40,13 +42,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 +118,7 @@ class SafariAppOAuthSessionProvider : OAuthSessionProvider {
 
 
 @objc(CDVOAuthPlugin)
-class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate {
+class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate, ASWebAuthenticationPresentationContextProviding {
     var authSystem : OAuthSessionProvider?
     var callbackScheme : String?
     var logger : OSLog?
@@ -127,7 +127,9 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate {
         let appID = Bundle.main.bundleIdentifier!
 
         self.callbackScheme = "\(appID)://oauth_callback"
-        self.logger = OSLog(subsystem: appID, category: "Cordova")
+        if #available(iOS 10.0, *) {
+            self.logger = OSLog(subsystem: appID, category: "Cordova")
+        }
 
         NotificationCenter.default.addObserver(self,
                 selector: #selector(OAuthPlugin._handleOpenURL(_:)),
@@ -186,7 +188,11 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate {
             jsobj[$0.name] = $0.value
         }
 
-        os_log("OAuth called back with parameters.", log: self.logger!, type: .info)
+        if #available(iOS 10.0, *) {
+            os_log("OAuth called back with parameters.", log: self.logger!, type: .info)
+        } else {
+            NSLog("OAuth called back with parameters.")
+        }
 
         do {
             let data = try JSONSerialization.data(withJSONObject: jsobj)
@@ -195,7 +201,11 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate {
             self.webViewEngine.evaluateJavaScript("window.dispatchEvent(new MessageEvent('message', { data: 'oauth::\(msg)' }));", completionHandler: nil)
         } catch {
             let errStr = "JSON Serialization failed: \(error)"
-            os_log("%@", log: self.logger!, type: .error, errStr)
+            if #available(iOS 10.0, *) {
+                os_log("%@", log: self.logger!, type: .error, errStr)
+            } else {
+                NSLog(errStr)
+            }
         }
     }
 
@@ -218,13 +228,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

package/www/oauth.js

@@ -20,7 +20,7 @@ var noop = function() { };
 
 
 module.exports = function(url, name, features) {
-  if (name.match(/^oauth:/)) {
+  if (name && name.match && name.match(/^oauth:/)) {
     cordova.exec(noop, noop, 'OAuth', 'startOAuth', [url]);
   } else {
     var originalWindowOpen = modulemapper.getOriginalSymbol(window, 'open');