cordova-plugin-oauth 3.0.1 → 3.0.2

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "cordova-plugin-oauth",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "author": "Ayogo Health Inc. <info@ayogo.com>",
   "contributors": [
     "Darryl Pogue <darryl@dpogue.ca>",
-    "Charalampos Pournaris <charpour@gmail.com>"
+    "Charalampos Pournaris <charpour@gmail.com>",
+    "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="3.0.1">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="cordova-plugin-oauth" version="3.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)
             }
@@ -125,7 +127,9 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate, ASWebAuthenticati
         let urlScheme = self.commandDelegate.settings["oauthscheme"] as! String
 
         self.callbackScheme = "\(urlScheme)://oauth_callback"
-        self.logger = OSLog(subsystem: urlScheme, category: "Cordova")
+        if #available(iOS 10.0, *) {
+            self.logger = OSLog(subsystem: urlScheme, category: "Cordova")
+        }
 
         NotificationCenter.default.addObserver(self,
                 selector: #selector(OAuthPlugin._handleOpenURL(_:)),
@@ -184,7 +188,11 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate, ASWebAuthenticati
             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)
@@ -193,7 +201,11 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate, ASWebAuthenticati
             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)
+            }
         }
     }