cordova-plugin-oauth 3.0.1 → 4.0.1

package/README.md

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2021 Ayogo Health Inc.
+  Copyright 2021-2022 Ayogo Health Inc.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -29,6 +29,10 @@ falling back to their browser.
 
 **Note:** This plugin might conflict with the Cordova In-App Browser plugin!
 
+> ℹ️ **This plugin uses AndroidX!**
+>
+> Use version 3.x if you are building without AndroidX enabled.
+
 
 Installation
 ------------
@@ -51,7 +55,7 @@ Supported Platforms
 -------------------
 
 * **iOS** (cordova-ios >= 6.1.0)
-* **Android** (cordova-android >= 8.0.0)
+* **Android** (cordova-android >= 9.0.0)
 
 
 Usage
@@ -107,6 +111,6 @@ Licence
 -------
 
 Released under the Apache 2.0 Licence.  
-Copyright © 2020 Ayogo Health Inc.
+Copyright © 2020-2022 Ayogo Health Inc.
 
-[coc]: https://github.com/AyogoHealth/cordova-plugin-oauth/blob/master/CODE_OF_CONDUCT.md
+[coc]: https://github.com/AyogoHealth/cordova-plugin-oauth/blob/main/CODE_OF_CONDUCT.md

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "cordova-plugin-oauth",
-  "version": "3.0.1",
+  "version": "4.0.1",
   "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",
@@ -18,6 +19,11 @@
     "cordova-android",
     "cordova-ios"
   ],
+  "files": [
+    "src",
+    "www",
+    "plugin.xml"
+  ],
   "cordova": {
     "platforms": [
       "ios",
@@ -27,7 +33,7 @@
   "engines": [
     {
       "name": "cordova-android",
-      "version": ">= 8.0.0"
+      "version": ">= 9.0.0"
     },
     {
       "name": "cordova-ios",

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="4.0.1">
   <name>cordova-plugin-oauth</name>
   <description>Cordova plugin for performing OAuth login flows.</description>
   <keywords>cordova,ios,android,oauth</keywords>
@@ -26,7 +26,7 @@ limitations under the License.
 
   <engines>
     <engine name="cordova-ios" version=">= 6.1.0" />
-    <engine name="cordova-android" version=">= 8.0.0" />
+    <engine name="cordova-android" version=">= 9.0.0" />
   </engines>
 
   <js-module src="www/oauth.js" name="OAuth">
@@ -82,8 +82,8 @@ limitations under the License.
 
     <source-file src="src/android/OAuthPlugin.java" target-dir="src/com/ayogo/cordova/oauth" />
 
-    <preference name="ANDROID_SUPPORT_CUSTOM_TABS_VERSION" default="28.+" />
+    <preference name="ANDROID_SUPPORT_CUSTOM_TABS_VERSION" default="1.3.0" />
 
-    <framework src="com.android.support:customtabs:$ANDROID_SUPPORT_CUSTOM_TABS_VERSION" />
+    <framework src="androidx.browser:browser:$ANDROID_SUPPORT_CUSTOM_TABS_VERSION" />
   </platform>
 </plugin>

package/src/android/OAuthPlugin.java

@@ -23,7 +23,7 @@ import android.content.IntentFilter;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
-import android.support.customtabs.CustomTabsIntent;
+import androidx.browser.customtabs.CustomTabsIntent;
 import android.text.TextUtils;
 
 import java.util.ArrayList;
@@ -33,6 +33,7 @@ import org.apache.cordova.CallbackContext;
 import org.apache.cordova.CordovaInterface;
 import org.apache.cordova.CordovaPlugin;
 import org.apache.cordova.CordovaWebView;
+import org.apache.cordova.CordovaWebViewEngine;
 import org.apache.cordova.LOG;
 import org.apache.cordova.PluginResult;
 
@@ -121,7 +122,14 @@ public class OAuthPlugin extends CordovaPlugin {
                 }
 
                 final String msg = jsobj.toString();
-                this.webView.getEngine().evaluateJavascript("window.dispatchEvent(new MessageEvent('message', { data: 'oauth::" + msg + "' }));", null);
+                CordovaWebViewEngine engine = this.webView.getEngine();
+                final String jsCode = "window.dispatchEvent(new MessageEvent('message', { data: 'oauth::" + msg + "' }));";
+                if (engine != null) {
+                    engine.evaluateJavascript(jsCode, null);
+                } else {
+                    this.webView.sendJavascript(jsCode);
+                }
+
             } catch (JSONException e) {
                 LOG.e(TAG, "JSON Serialization failed");
                 e.printStackTrace();

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)
+            }
         }
     }
 

package/.editorconfig

@@ -1,20 +0,0 @@
-# Copyright 2017 Ayogo Health Inc
-root = true
-
-[*]
-end_of_line = lf
-indent_style = space
-insert_final_newline = true
-charset = utf-8
-trim_trailing_whitespace = true
-indent_size = 2
-
-[*.java]
-indent_size = 4
-
-[*.swift]
-indent_size = 4
-
-[*.md]
-indent_size = 4
-trim_trailing_whitespace = false

package/CODE_OF_CONDUCT.md

@@ -1,77 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at opensource@ayogo.com. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
-