cordova-plugin-oauth 2.0.2 → 3.0.2

package/README.md

@@ -1,5 +1,5 @@
 <!--
-  Copyright 2019 Ayogo Health Inc.
+  Copyright 2021 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.
@@ -34,14 +34,23 @@ Installation
 ------------
 
 ```
-cordova plugin add cordova-plugin-oauth
+cordova plugin add cordova-plugin-oauth [--variable URL_SCHEME=mycoolapp]
 ```
 
+By default, the plugin registers the app ID as a scheme to be used as the
+OAuth callback URL, and expects a host of `oauth_callback` (i.e., if your
+app's ID is `com.example.foo`, your OAuth redirect URL should be
+`com.example.foo://oauth_callback`).
+
+The scheme for the OAuth callback URL can be changed by providing a
+`URL_SCHEME` variable when installing. If your `URL_SCHEME` is `mycoolapp`,
+then your OAuth redirect URL should be `mycoolapp://oauth_callback`.
+
 
 Supported Platforms
 -------------------
 
-* **iOS** (cordova-ios >= 5.0.0)
+* **iOS** (cordova-ios >= 6.1.0)
 * **Android** (cordova-android >= 8.0.0)
 
 
@@ -56,11 +65,6 @@ Usage
     window.open(endpoint, 'oauth:google', '');
     ```
 
-    By default, the plugin registers the app ID as a scheme to be used as the
-    OAuth callback URL, and expects a host of `oauth_callback` (i.e., if your
-    app's ID is `com.example.foo`, your OAuth redirect URL should be
-    `com.example.foo://oauth_callback`).
-
 2.  The plugin will open the OAuth login page in a new browser window.
 
 3.  When the OAuth process is complete and it redirects to your app scheme, the
@@ -103,6 +107,6 @@ Licence
 -------
 
 Released under the Apache 2.0 Licence.  
-Copyright © 2019 Ayogo Health Inc.
+Copyright © 2020 Ayogo Health Inc.
 
 [coc]: https://github.com/AyogoHealth/cordova-plugin-oauth/blob/master/CODE_OF_CONDUCT.md

package/package.json

@@ -1,9 +1,10 @@
 {
   "name": "cordova-plugin-oauth",
-  "version": "2.0.2",
+  "version": "3.0.2",
   "author": "Ayogo Health Inc. <info@ayogo.com>",
   "contributors": [
     "Darryl Pogue <darryl@dpogue.ca>",
+    "Charalampos Pournaris <charpour@gmail.com>",
     "Harel Mazor"
   ],
   "description": "Cordova plugin for performing OAuth login flows.",
@@ -31,7 +32,7 @@
     },
     {
       "name": "cordova-ios",
-      "version": ">= 5.0.0"
+      "version": ">= 6.1.0"
     }
   ],
   "dependencies": {}

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="2.0.2">
+<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>
@@ -22,8 +22,10 @@ limitations under the License.
   <repo>https://github.com/AyogoHealth/cordova-plugin-oauth.git</repo>
   <issues>https://github.com/AyogoHealth/cordova-plugin-oauth/issues</issues>
 
+  <preference name="URL_SCHEME" default="$PACKAGE_NAME" />
+
   <engines>
-    <engine name="cordova-ios" version=">= 5.0.0" />
+    <engine name="cordova-ios" version=">= 6.1.0" />
     <engine name="cordova-android" version=">= 8.0.0" />
   </engines>
 
@@ -31,6 +33,9 @@ limitations under the License.
     <clobbers target="open" />
   </js-module>
 
+  <config-file target="config.xml" parent="/*">
+    <preference name="OAuthScheme" value="$URL_SCHEME"/>
+  </config-file>
 
   <platform name="ios">
     <config-file parent="/*" target="config.xml">
@@ -47,7 +52,7 @@ limitations under the License.
         <dict>
           <key>CFBundleURLSchemes</key>
           <array>
-            <string>$PACKAGE_NAME</string>
+            <string>$URL_SCHEME</string>
           </array>
         </dict>
       </array>
@@ -71,7 +76,7 @@ limitations under the License.
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
 
-        <data android:scheme="$PACKAGE_NAME" android:host="oauth_callback" />
+        <data android:scheme="$URL_SCHEME" android:host="oauth_callback" />
       </intent-filter>
     </config-file>
 

package/src/ios/OAuthPlugin.swift

@@ -124,11 +124,11 @@ class OAuthPlugin : CDVPlugin, SFSafariViewControllerDelegate, ASWebAuthenticati
     var logger : OSLog?
 
     override func pluginInitialize() {
-        let appID = Bundle.main.bundleIdentifier!
+        let urlScheme = self.commandDelegate.settings["oauthscheme"] as! String
 
-        self.callbackScheme = "\(appID)://oauth_callback"
+        self.callbackScheme = "\(urlScheme)://oauth_callback"
         if #available(iOS 10.0, *) {
-            self.logger = OSLog(subsystem: appID, category: "Cordova")
+            self.logger = OSLog(subsystem: urlScheme, category: "Cordova")
         }
 
         NotificationCenter.default.addObserver(self,