Retrieving verificationId and code from credential object and passsin…

…g it along to cordova
monove · Sep 20, 2018 · cdb7894 · cdb7894
1 parent 5176a4c
commit cdb7894
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/src/android/FirebasePlugin.java b/src/android/FirebasePlugin.java
@@ -724,13 +724,17 @@ public void onVerificationCompleted(PhoneAuthCredential credential) {
                             // 2 - Auto-retrieval. On some devices Google Play services can automatically
                             //     detect the incoming verification SMS and perform verificaiton without
                             //     user action.
-                            Log.d(TAG, "success: verifyPhoneNumber.onVerificationCompleted - callback and create a custom JWT Token on server and sign in with custom token - we cant do anything");
+                            Log.d(TAG, "success: verifyPhoneNumber.onVerificationCompleted");
 
                             JSONObject returnResults = new JSONObject();
                             try {
-                                returnResults.put("verificationId", false);
+                                String verificationId = getPrivateField(credential, "zzfc");
+                                String code = getPrivateField(credential, "zzfd");
+
+                                returnResults.put("verificationId", verificationId);
+                                returnResults.put("code", code);
                                 returnResults.put("instantVerification", true);
-                            } catch (JSONException e) {
+                            } catch(JSONException | IllegalAccessException | NoSuchFieldException e){
                                 Crashlytics.logException(e);
                                 callbackContext.error(e.getMessage());
                                 return;
@@ -782,7 +786,7 @@ public void onCodeSent(String verificationId, PhoneAuthProvider.ForceResendingTo
                             callbackContext.sendPluginResult(pluginresult);
                         }
                     };
-
+	
                     PhoneAuthProvider.getInstance().verifyPhoneNumber(number, // Phone number to verify
                             timeOutDuration, // Timeout duration
                             TimeUnit.SECONDS, // Unit of timeout
@@ -795,6 +799,12 @@ public void onCodeSent(String verificationId, PhoneAuthProvider.ForceResendingTo
             }
         });
     }
+
+    private String getPrivateField(PhoneAuthCredential credential, String field) throws NoSuchFieldException, IllegalAccessException {
+        Field credentialField = credential.getClass().getDeclaredField(field);
+        credentialField.setAccessible(true);
+        return (String) credentialField.get(credential);
+    }
 
     //
     // Firebase Performace