cordova-plugin-firebase-authentication 4.0.2 → 7.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-firebase-authentication",
-  "version": "4.0.2",
+  "version": "7.0.0",
   "description": "Cordova plugin for Firebase Authentication",
   "cordova": {
     "id": "cordova-plugin-firebase-authentication",
@@ -18,10 +18,6 @@
   "bugs": {
     "url": "https://github.com/chemerisuk/cordova-plugin-firebase-authentication/issues"
   },
-  "scripts": {
-    "version": "replace -s 'version=\"(.+)(?=\">)' 'version=\"'$npm_package_version plugin.xml && git add plugin.xml",
-    "postversion": "git push && git push --tags"
-  },
   "homepage": "https://github.com/chemerisuk/cordova-plugin-firebase-authentication#readme",
   "funding": "https://github.com/chemerisuk/cordova-plugin-firebase-authentication?sponsor=1",
   "keywords": [
@@ -32,5 +28,17 @@
     "ecosystem:cordova",
     "cordova-android",
     "cordova-ios"
-  ]
+  ],
+  "scripts": {
+    "preversion": "npm run docs && rm -rf docs",
+    "version": "perl -i -pe 's/(version=)\"\\d+\\.\\d+\\.\\d+\"/$1\"'$npm_package_version'\"$2/' plugin.xml && git add .",
+    "postversion": "git push && git push --tags",
+    "predocs": "tsc www/* --declaration --allowJs --checkJs --lib es2015,dom --emitDeclarationOnly --outDir types",
+    "docs": "typedoc && perl -i -pe 's/README.md#/#/g' ./docs/README.md",
+    "postdocs": "perl -i -0pe 's/(<!-- TypedocGenerated -->).*/$1\n\n/gms' README.md && cat ./docs/README.md >> README.md"
+  },
+  "devDependencies": {
+    "typedoc": "^0.23.9",
+    "typedoc-plugin-markdown": "^3.13.4"
+  }
 }

package/plugin.xml

@@ -1,7 +1,7 @@
 <plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
 xmlns:android="http://schemas.android.com/apk/res/android"
            id="cordova-plugin-firebase-authentication"
-      version="4.0.2">
+      version="7.0.0">
 
     <name>cordova-plugin-firebase-authentication</name>
     <description>Cordova plugin for Firebase Authentication</description>
@@ -15,13 +15,13 @@ xmlns:android="http://schemas.android.com/apk/res/android"
     </js-module>
 
     <engines>
-        <engine name="cordova" version=">=9.0.0"/>
-        <engine name="cordova-android" version=">=8.0.0"/>
+        <engine name="cordova" version=">=10.0.0"/>
+        <engine name="cordova-android" version=">=11.0.0"/>
         <engine name="cordova-ios" version=">=6.0.0"/>
     </engines>
 
     <platform name="ios">
-        <preference name="IOS_FIREBASE_AUTH_VERSION" default="~> 7.0.0"/>
+        <preference name="IOS_FIREBASE_POD_VERSION" default="9.3.0" />
 
         <config-file target="config.xml" parent="/*">
             <feature name="FirebaseAuthentication">
@@ -37,14 +37,14 @@ xmlns:android="http://schemas.android.com/apk/res/android"
             <config>
                 <source url="https://cdn.cocoapods.org/"/>
             </config>
-            <pods>
-                <pod name="Firebase/Auth" spec="$IOS_FIREBASE_AUTH_VERSION" />
+            <pods use-frameworks="true">
+                <pod name="Firebase/Auth" spec="$IOS_FIREBASE_POD_VERSION" />
             </pods>
         </podspec>
     </platform>
 
     <platform name="android">
-        <preference name="ANDROID_FIREBASE_AUTH_VERSION" default="20.0.+"/>
+        <preference name="ANDROID_FIREBASE_BOM_VERSION" default="30.3.1" />
 
         <config-file target="res/xml/config.xml" parent="/*">
             <feature name="FirebaseAuthentication">
@@ -54,14 +54,15 @@ xmlns:android="http://schemas.android.com/apk/res/android"
         </config-file>
 
         <config-file target="config.xml" parent="/*">
+            <preference name="AndroidXEnabled" value="true" />
             <preference name="GradlePluginGoogleServicesEnabled" value="true" />
-            <preference name="GradlePluginGoogleServicesVersion" value="4.3.3" />
+            <preference name="GradlePluginGoogleServicesVersion" value="4.3.13" />
         </config-file>
 
-        <dependency id="cordova-support-android-plugin" version="~1.0.0"/>
-        <dependency id="cordova-support-google-services" version="^1.3.2"/>
+        <dependency id="cordova-support-android-plugin" version="~2.0.3"/>
 
-        <framework src="com.google.firebase:firebase-auth:$ANDROID_FIREBASE_AUTH_VERSION" />
+        <framework src="platform('com.google.firebase:firebase-bom:$ANDROID_FIREBASE_BOM_VERSION')" />
+        <framework src="com.google.firebase:firebase-auth" />
 
         <source-file src="src/android/FirebaseAuthenticationPlugin.java"
             target-dir="src/by/chemerisuk/cordova/firebase/" />

package/src/android/FirebaseAuthenticationPlugin.java

@@ -1,18 +1,19 @@
 package by.chemerisuk.cordova.firebase;
 
+import static com.google.android.gms.tasks.Tasks.await;
+
 import android.net.Uri;
 import android.util.Log;
 
 import by.chemerisuk.cordova.support.CordovaMethod;
 import by.chemerisuk.cordova.support.ReflectiveCordovaPlugin;
 
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.auth.AuthCredential;
 import com.google.firebase.auth.FacebookAuthProvider;
 import com.google.firebase.auth.FirebaseAuth;
 import com.google.firebase.auth.FirebaseUser;
 import com.google.firebase.auth.FirebaseAuth.AuthStateListener;
+import com.google.firebase.auth.GetTokenResult;
 import com.google.firebase.auth.GoogleAuthProvider;
 import com.google.firebase.auth.PhoneAuthCredential;
 import com.google.firebase.auth.PhoneAuthOptions;
@@ -22,6 +23,7 @@ import com.google.firebase.FirebaseException;
 import com.google.firebase.auth.UserProfileChangeRequest;
 
 import org.apache.cordova.CallbackContext;
+import org.apache.cordova.CordovaArgs;
 import org.apache.cordova.PluginResult;
 
 import org.json.JSONException;
@@ -29,6 +31,8 @@ import org.json.JSONObject;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
+import androidx.annotation.NonNull;
+
 
 public class FirebaseAuthenticationPlugin extends ReflectiveCordovaPlugin implements AuthStateListener {
     private static final String TAG = "FirebaseAuthentication";
@@ -39,19 +43,18 @@ public class FirebaseAuthenticationPlugin extends ReflectiveCordovaPlugin implem
     @Override
     protected void pluginInitialize() {
         Log.d(TAG, "Starting Firebase Authentication plugin");
-
         firebaseAuth = FirebaseAuth.getInstance();
     }
 
     @CordovaMethod
-    private void setAuthStateChanged(boolean disable, CallbackContext callbackContext) {
-        if (this.authStateCallback != null) {
-            this.authStateCallback = null;
+    private void setAuthStateChanged(CordovaArgs args, CallbackContext callbackContext) throws JSONException {
+        boolean disable = args.getBoolean(0);
+        if (authStateCallback != null) {
+            authStateCallback = null;
             firebaseAuth.removeAuthStateListener(this);
         }
-
         if (!disable) {
-            this.authStateCallback = callbackContext;
+            authStateCallback = callbackContext;
             firebaseAuth.addAuthStateListener(this);
         }
     }
@@ -63,112 +66,108 @@ public class FirebaseAuthenticationPlugin extends ReflectiveCordovaPlugin implem
     }
 
     @CordovaMethod
-    private void getIdToken(boolean forceRefresh, final CallbackContext callbackContext) {
+    private void getIdToken(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        boolean forceRefresh = args.getBoolean(0);
         FirebaseUser user = firebaseAuth.getCurrentUser();
-
         if (user == null) {
             callbackContext.error("User is not authorized");
         } else {
-            user.getIdToken(forceRefresh).addOnCompleteListener(cordova.getActivity(), task -> {
-                if (task.isSuccessful()) {
-                    callbackContext.success(task.getResult().getToken());
-                } else {
-                    callbackContext.error(task.getException().getMessage());
-                }
-            });
+            GetTokenResult result = await(user.getIdToken(forceRefresh));
+            callbackContext.success(result.getToken());
         }
     }
 
     @CordovaMethod
-    private void createUserWithEmailAndPassword(String email, String password, CallbackContext callbackContext) {
-        firebaseAuth.createUserWithEmailAndPassword(email, password)
-                .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+    private void createUserWithEmailAndPassword(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String email = args.getString(0);
+        String password = args.getString(1);
+        await(firebaseAuth.createUserWithEmailAndPassword(email, password));
+        callbackContext.success();
     }
 
     @CordovaMethod
-    private void sendEmailVerification(CallbackContext callbackContext) {
+    private void sendEmailVerification(CallbackContext callbackContext) throws Exception {
         FirebaseUser user = firebaseAuth.getCurrentUser();
-
         if (user == null) {
             callbackContext.error("User is not authorized");
         } else {
-            user.sendEmailVerification()
-                    .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+            await(user.sendEmailVerification());
+            callbackContext.success();
         }
     }
 
     @CordovaMethod
-    private void sendPasswordResetEmail(String email, CallbackContext callbackContext) {
-        firebaseAuth.sendPasswordResetEmail(email)
-                .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+    private void sendPasswordResetEmail(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String email = args.getString(0);
+        await(firebaseAuth.sendPasswordResetEmail(email));
+        callbackContext.success();
     }
 
     @CordovaMethod
-    private void signInAnonymously(final CallbackContext callbackContext) {
-        firebaseAuth.signInAnonymously()
-                .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+    private void signInAnonymously(CallbackContext callbackContext) throws Exception {
+        await(firebaseAuth.signInAnonymously());
+        callbackContext.success();
     }
 
     @CordovaMethod
-    private void signInWithEmailAndPassword(String email, String password, CallbackContext callbackContext) {
-        firebaseAuth.signInWithEmailAndPassword(email, password)
-                .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+    private void signInWithEmailAndPassword(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String email = args.getString(0);
+        String password = args.getString(1);
+        await(firebaseAuth.signInWithEmailAndPassword(email, password));
+        callbackContext.success();
     }
 
     @CordovaMethod
-    private void signInWithGoogle(String idToken, String accessToken, CallbackContext callbackContext) {
+    private void signInWithGoogle(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String idToken = args.getString(0);
+        String accessToken = args.getString(1);
         signInWithCredential(GoogleAuthProvider.getCredential(idToken, accessToken), callbackContext);
     }
 
     @CordovaMethod
-    private void signInWithFacebook(String accessToken, CallbackContext callbackContext) {
+    private void signInWithFacebook(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String accessToken = args.getString(0);
         signInWithCredential(FacebookAuthProvider.getCredential(accessToken), callbackContext);
     }
 
     @CordovaMethod
-    private void signInWithTwitter(String token, String secret, CallbackContext callbackContext) {
+    private void signInWithTwitter(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String token = args.getString(0);
+        String secret = args.getString(1);
         signInWithCredential(TwitterAuthProvider.getCredential(token, secret), callbackContext);
     }
 
-    private void signInWithCredential(AuthCredential credential, CallbackContext callbackContext) {
-        firebaseAuth.signInWithCredential(credential)
-                .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
-    }
-
-    private Task<?> signInWithPhoneCredential(PhoneAuthCredential credential) {
-        FirebaseUser user = firebaseAuth.getCurrentUser();
-
-        if (user != null) {
-            return user.updatePhoneNumber(credential);
-        } else {
-            return firebaseAuth.signInWithCredential(credential);
-        }
-    }
-
     @CordovaMethod
-    private void signInWithVerificationId(String verificationId, String code, CallbackContext callbackContext) {
-        signInWithPhoneCredential(PhoneAuthProvider.getCredential(verificationId, code))
-                .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+    private void signInWithVerificationId(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String verificationId = args.getString(0);
+        String code = args.getString(1);
+        await(firebaseAuth.signInWithCredential(PhoneAuthProvider.getCredential(verificationId, code)));
+        callbackContext.success();
     }
 
     @CordovaMethod
-    private void verifyPhoneNumber(String phoneNumber, long timeoutMillis, final CallbackContext callbackContext) {
+    private void verifyPhoneNumber(CordovaArgs args, CallbackContext callbackContext) throws JSONException {
+        String phoneNumber = args.getString(0);
+        long timeoutMillis = args.optLong(1);
         PhoneAuthOptions.Builder options = PhoneAuthOptions.newBuilder(firebaseAuth)
                 .setActivity(cordova.getActivity())
                 .setPhoneNumber(phoneNumber)
                 .setCallbacks(new PhoneAuthProvider.OnVerificationStateChangedCallbacks() {
                     @Override
-                    public void onVerificationCompleted(PhoneAuthCredential credential) {
-                        signInWithPhoneCredential(credential);
+                    public void onVerificationCompleted(@NonNull PhoneAuthCredential credential) {
+                        FirebaseUser user = firebaseAuth.getCurrentUser();
+                        if (user != null) {
+                            user.updatePhoneNumber(credential);
+                        }
                     }
 
                     @Override
-                    public void onCodeSent(String verificationId, PhoneAuthProvider.ForceResendingToken forceResendingToken) {
+                    public void onCodeSent(@NonNull String verificationId, @NonNull PhoneAuthProvider.ForceResendingToken forceResendingToken) {
                         callbackContext.success(verificationId);
                     }
 
                     @Override
-                    public void onVerificationFailed(FirebaseException e) {
+                    public void onVerificationFailed(@NonNull FirebaseException e) {
                         callbackContext.error(e.getMessage());
                     }
                 });
@@ -176,77 +175,68 @@ public class FirebaseAuthenticationPlugin extends ReflectiveCordovaPlugin implem
         if (timeoutMillis > 0) {
             options.setTimeout(timeoutMillis, MILLISECONDS);
         }
-
         PhoneAuthProvider.verifyPhoneNumber(options.build());
     }
 
     @CordovaMethod
-    private void signInWithCustomToken(String idToken, CallbackContext callbackContext) {
-        firebaseAuth.signInWithCustomToken(idToken)
-                .addOnCompleteListener(cordova.getActivity(),createCompleteListener(callbackContext));
+    private void signInWithCustomToken(CordovaArgs args, CallbackContext callbackContext) throws Exception {
+        String idToken = args.getString(0);
+        await(firebaseAuth.signInWithCustomToken(idToken));
+        callbackContext.success();
     }
 
     @CordovaMethod
     private void signOut(CallbackContext callbackContext) {
         firebaseAuth.signOut();
-
         callbackContext.success();
     }
 
     @CordovaMethod
-    private void setLanguageCode(String languageCode, CallbackContext callbackContext) {
+    private void setLanguageCode(CordovaArgs args, CallbackContext callbackContext) throws JSONException {
+        String languageCode = args.getString(0);
         if (languageCode == null) {
             firebaseAuth.useAppLanguage();
         } else {
             firebaseAuth.setLanguageCode(languageCode);
         }
-
         callbackContext.success();
     }
 
     @CordovaMethod
-    private void updateProfile(JSONObject params, CallbackContext callbackContext) {
+    private void updateProfile(CordovaArgs args, CallbackContext callbackContext) throws Exception {
         FirebaseUser user = firebaseAuth.getCurrentUser();
-
         if (user == null) {
             callbackContext.error("User is not authorized");
-        }
-        else {
+        } else {
+            JSONObject params = args.getJSONObject(0);
             UserProfileChangeRequest request = createProfileChangeRequest(params);
-            user.updateProfile(request)
-                    .addOnCompleteListener(cordova.getActivity(), createCompleteListener(callbackContext));
+            await(user.updateProfile(request));
+            callbackContext.success();
         }
     }
 
     @CordovaMethod
-    private void useEmulator(String host, int port, CallbackContext callbackContext) {
+    private void useEmulator(CordovaArgs args, CallbackContext callbackContext) throws JSONException {
+        String host = args.getString(0);
+        int port = args.getInt(1);
         firebaseAuth.useEmulator(host, port);
+        callbackContext.success();
+    }
 
+    private void signInWithCredential(AuthCredential credential, CallbackContext callbackContext) throws Exception {
+        await(firebaseAuth.signInWithCredential(credential));
         callbackContext.success();
     }
 
     @Override
-    public void onAuthStateChanged(FirebaseAuth auth) {
-        if (this.authStateCallback != null) {
+    public void onAuthStateChanged(@NonNull FirebaseAuth auth) {
+        if (authStateCallback != null) {
             PluginResult pluginResult = getProfileResult(firebaseAuth.getCurrentUser());
             pluginResult.setKeepCallback(true);
-            this.authStateCallback.sendPluginResult(pluginResult);
+            authStateCallback.sendPluginResult(pluginResult);
         }
     }
 
-    private static <T> OnCompleteListener<T> createCompleteListener(final CallbackContext callbackContext) {
-        return new OnCompleteListener<T>() {
-            @Override
-            public void onComplete(Task task) {
-                if (task.isSuccessful()) {
-                    callbackContext.success();
-                } else {
-                    callbackContext.error(task.getException().getMessage());
-                }
-            }
-        };
-    }
-
     private static PluginResult getProfileResult(FirebaseUser user) {
         if (user == null) {
             return new PluginResult(PluginResult.Status.OK, (String)null);
@@ -271,19 +261,16 @@ public class FirebaseAuthenticationPlugin extends ReflectiveCordovaPlugin implem
         }
     }
 
-    private static UserProfileChangeRequest createProfileChangeRequest(JSONObject jsonObject) {
+    private static UserProfileChangeRequest createProfileChangeRequest(JSONObject jsonObject) throws JSONException {
         UserProfileChangeRequest.Builder requestBuilder = new UserProfileChangeRequest.Builder();
-
         if (jsonObject.has("displayName")) {
-            String displayName = jsonObject.optString("displayName", null);
+            String displayName = jsonObject.getString("displayName");
             requestBuilder = requestBuilder.setDisplayName(displayName);
         }
-
         if (jsonObject.has("photoURL")) {
-            String photoURL = jsonObject.optString("photoURL", null);
+            String photoURL = jsonObject.getString("photoURL");
             requestBuilder = requestBuilder.setPhotoUri(Uri.parse(photoURL));
         }
-
         return requestBuilder.build();
     }
 }

package/src/ios/FirebaseAuthenticationPlugin.h

@@ -1,6 +1,6 @@
 #import <Cordova/CDV.h>
 
-@import Firebase;
+@import FirebaseAuth;
 
 @interface FirebaseAuthenticationPlugin : CDVPlugin
 

package/src/ios/FirebaseAuthenticationPlugin.m

@@ -1,5 +1,7 @@
 #import "FirebaseAuthenticationPlugin.h"
 
+@import FirebaseCore;
+
 @implementation FirebaseAuthenticationPlugin
 
 - (void)pluginInitialize {

package/tsconfig.json

@@ -0,0 +1,15 @@
+{
+  "typedocOptions": {
+    "out": "docs",
+    "readme": "none",
+    "entryPoints": "./types",
+    "exclude": "./types/index.d.ts",
+    "entryPointStrategy": "expand",
+    "hideBreadcrumbs": true,
+    "hideInPageTOC": true,
+    "hidePageTitle": true,
+    "hideMembersSymbol": true,
+    "disableSources": true,
+    "githubPages": false
+  }
+}