Ccct 1159 send request connectid verify firebase otp

app/res/values-fr/strings.xml

@@ -382,6 +382,11 @@ License.
     <string name="connect_phone_not_found">Numéro de téléphone introuvable</string>
     <string name="connect_phone_change_error">Erreur lors du changement de numéro de téléphone</string>
     <string name="connect_password_button">D\'ACCORD</string>
+    <string name="connect_otp_sent">OTP envoyé</string>
+    <string name="connect_otp_verified">OTP vérifié</string>
+    <string name="connect_otp_error">Erreur OTP</string>
+    <string name="connect_enter_otp">Entrez OTP</string>
+    <string name="connect_otp_verification_failed">La vérification OTP a échoué en raison de</string>
     <string name="connect_backup_code_title_set">Choisissez le code PIN</string>
     <string name="connect_backup_code_title_confirm">Confirmer le code PIN</string>
     <string name="connect_backup_code">Entrez le code PIN</string>

app/res/values-pt/strings.xml

@@ -383,6 +383,11 @@
     <string name="connect_phone_not_found">Número de telefone não encontrado</string>
     <string name="connect_phone_change_error">Erro ao alterar o número de telefone</string>
     <string name="connect_password_button">OK</string>
+    <string name="connect_otp_sent">OTP enviado</string>
+    <string name="connect_otp_verified">OTP verificado</string>
+    <string name="connect_otp_error">Erro de OTP</string>
+    <string name="connect_enter_otp">Digite OTP</string>
+    <string name="connect_otp_verification_failed">A verificação do OTP falhou devido a</string>
     <string name="connect_backup_code_title_set">Código de recuperação</string>
     <string name="connect_backup_code_title_confirm">Confirmar código de recuperação</string>
     <string name="connect_backup_code_message_title">Código de recuperação ConnectID</string>

app/res/values-sw/strings.xml

@@ -382,6 +382,11 @@
     <string name="connect_phone_not_found">Nambari ya simu haijapatikana</string>
     <string name="connect_phone_change_error">Hitilafu katika kubadilisha nambari ya simu</string>
     <string name="connect_password_button">Sawa</string>
+    <string name="connect_otp_sent">OTP Imetumwa</string>
+    <string name="connect_otp_verified">OTP Imethibitishwa</string>
+    <string name="connect_otp_error">Hitilafu ya OTP</string>
+    <string name="connect_enter_otp">Ingiza OTP</string>
+    <string name="connect_otp_verification_failed">Uthibitishaji wa OTP umeshindwa kutokana na</string>
     <string name="connect_backup_code_title_set">Chagua PIN</string>
     <string name="connect_backup_code_title_confirm">Thibitisha PIN</string>
     <string name="connect_backup_code">Weka PIN</string>

app/res/values-ti/strings.xml

@@ -371,6 +371,11 @@
     <string name="connect_phone_not_found">ቁጽሪ ስልኪ ሞባይል ኣይተረኽበን።</string>
     <string name="connect_phone_change_error">ቁጽሪ ስልኪ ቁፅሪ ሞባይል ኣብ ምቕያር ጌጋ</string>
     <string name="connect_password_button">እሺ</string>
+    <string name="connect_otp_sent">ኦቲፒ ተላኢኹ</string>
+    <string name="connect_otp_verified">OTP ተረጋጊጹ</string>
+    <string name="connect_otp_error">OTP ጌጋ</string>
+    <string name="connect_enter_otp">ኣብ ኦቲፒ ኣቲኻ</string>
+    <string name="connect_otp_verification_failed">OTP ምርግጋጽ ብሰንኪ...</string>
     <string name="connect_backup_code_title_set">ናይ ምሕዋይ ሕጊ</string>
     <string name="connect_backup_code_title_confirm">ናይ ምሕዋይ ኮድ ኣረጋግጽ</string>
     <string name="connect_backup_code_message_title">ConnectID ናይ ምሕዋይ ኮድ</string>

app/res/values/strings.xml

@@ -445,6 +445,12 @@
     <string name="connect_phone_change_error">Error changing phone number</string>
     <string name="connect_password_button">OK</string>
 
+    <string name="connect_otp_sent">OTP Sent</string>
+    <string name="connect_otp_verified">OTP Verified</string>
+    <string name="connect_otp_error">OTP Error</string>
+    <string name="connect_enter_otp">Enter OTP</string>
+    <string name="connect_otp_verification_failed">OTP verification failed due to </string>
+
     <string name="connect_backup_code_title_set">Backup Code</string>
     <string name="connect_backup_code_title_confirm">Confirm Backup Code</string>
     <string name="connect_backup_code_message_title">PersonalId Backup Code</string>

app/src/org/commcare/connect/PersonalIdManager.java

@@ -511,7 +511,7 @@ public void processSuccess(int responseCode, InputStream responseData) {
             }
 
             @Override
-            public void processFailure(int responseCode) {
+            public void processFailure(int responseCode, @Nullable InputStream errorResponse) {
                 Logger.log("ERROR", String.format(Locale.getDefault(), "Failed: %d", responseCode));
             }
 

app/src/org/commcare/connect/network/ApiPersonalId.java

@@ -228,12 +228,15 @@ public void onResponse(@NonNull Call<ResponseBody> call, @NonNull Response<Respo
                         callback.processSuccess(response.code(), responseStream);
                     } catch (IOException e) {
                         // Handle error when reading the stream
-                        callback.processFailure(response.code());
+                        callback.processFailure(response.code(), null);
                     }
                 } else {
                     // Handle validation errors
                     logNetworkError(response);
-                    callback.processFailure(response.code());
+                    if (response.errorBody() != null){
+                        callback.processFailure(response.code(), response.errorBody().byteStream());
+                    }
+                    callback.processFailure(response.code(), null);
                 }
             }
 
@@ -294,6 +297,17 @@ public static void startConfiguration(Context context, Map<String, String> body,
         callApi(context, call, callback);
     }
 
+    public static void validateFirebaseIdToken(String token,Context context, String firebaseIdToken, IApiCallback callback) {
+        HashMap<String, String> params = new HashMap<>();
+        params.put("token", firebaseIdToken);
+        AuthInfo authInfo = new AuthInfo.TokenAuth(token);
+        String tokenAuth = HttpUtils.getCredential(authInfo);
+        Objects.requireNonNull(tokenAuth);
+        ApiService apiService = ApiClient.getClientApi();
+        Call<ResponseBody> call = apiService.validateFirebaseIdToken(tokenAuth,params);
+        callApi(context, call, callback);
+    }
+
     public static void addOrVerifyName(Context context, String name, String token, IApiCallback callback) {
         HashMap<String, String> params = new HashMap<>();
         params.put("name", name);

app/src/org/commcare/connect/network/ConnectNetworkHelper.java

@@ -340,7 +340,7 @@ public void processClientError(int responseCode) {
                         ConnectSsoHelper.discardTokens(context, null);
                         handler.processTokenUnavailableError();
                     } else {
-                        handler.processFailure(responseCode);
+                        handler.processFailure(responseCode, null);
                     }
                 }
             }
@@ -353,7 +353,7 @@ public void processServerError(int responseCode) {
                 CrashUtil.reportException(new Exception(message));
 
                 //500 error for internal server error
-                handler.processFailure(responseCode);
+                handler.processFailure(responseCode, null);
             }
 
             @Override
@@ -363,7 +363,7 @@ public void processOther(int responseCode) {
                 String message = String.format(Locale.getDefault(), "Call:%s\nResponse code:%d", url, responseCode);
                 CrashUtil.reportException(new Exception(message));
 
-                handler.processFailure(responseCode);
+                handler.processFailure(responseCode, null);
             }
 
             @Override
@@ -373,7 +373,7 @@ public void handleIOException(IOException exception) {
                     handler.processNetworkFailure();
                 } else {
                     Logger.exception("IO Exception during API call", exception);
-                    handler.processFailure(-1);
+                    handler.processFailure(-1, null);
                 }
             }
 

app/src/org/commcare/connect/network/IApiCallback.java

@@ -1,13 +1,15 @@
 package org.commcare.connect.network;
 
+import androidx.annotation.Nullable;
+
 import java.io.InputStream;
 
 /**
  * Interface for callbacks when network request completes
  */
 public interface IApiCallback {
     void processSuccess(int responseCode, InputStream responseData);
-    void processFailure(int responseCode);
+    void processFailure(int responseCode, @Nullable InputStream errorResponse);
     void processNetworkFailure();
     void processOldApiError();
     void processTokenUnavailableError();

app/src/org/commcare/connect/network/PersonalIdApiHandler.java

@@ -2,7 +2,11 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.widget.Toast;
 
+import androidx.annotation.Nullable;
+
+import org.commcare.CommCareApplication;
 import org.commcare.android.database.connect.models.PersonalIdSessionData;
 import org.commcare.connect.network.parser.AddOrVerifyNameParser;
 import org.commcare.connect.network.parser.CompleteProfileResponseParser;
@@ -40,18 +44,32 @@ private IApiCallback createCallback(PersonalIdSessionData sessionData,
         return new IApiCallback() {
             @Override
             public void processSuccess(int responseCode, InputStream responseData) {
-                try (InputStream in = responseData) {
-                    JSONObject json = new JSONObject(new String(StreamsUtil.inputStreamToByteArray(in)));
-                    parser.parse(json, sessionData);
-                    onSuccess(sessionData);
-                } catch (IOException | JSONException e) {
-                    Logger.exception("Error parsing API response", e);
-                    onFailure(PersonalIdApiErrorCodes.JSON_PARSING_ERROR);
+                if (parser != null) {
+                    try (InputStream in = responseData) {
+                        JSONObject json = new JSONObject(new String(StreamsUtil.inputStreamToByteArray(in)));
+                        parser.parse(json, sessionData);
+                    } catch (IOException | JSONException e) {
+                        Logger.exception("Error parsing API response", e);
+                        onFailure(PersonalIdApiErrorCodes.JSON_PARSING_ERROR);
+                    }
                 }
+                onSuccess(sessionData);
             }
 
             @Override
-            public void processFailure(int responseCode) {
+            public void processFailure(int responseCode, @Nullable InputStream errorResponse) {
+                if (errorResponse != null) {
+                    try (InputStream in = errorResponse) {
+                        JSONObject json = new JSONObject(new String(StreamsUtil.inputStreamToByteArray(in)));
+                        if (json.has("error")) {
+                            Toast.makeText(CommCareApplication.instance(), json.optString("error"),
+                                    Toast.LENGTH_LONG).show();
+                        }
+                    } catch (IOException | JSONException e) {
+                        Logger.exception("Error parsing API error response", e);
+                        onFailure(defaultFailureCode);
+                    }
+                }
                 onFailure(defaultFailureCode);
             }
 
@@ -87,6 +105,12 @@ public void makeStartConfigurationCall(Activity activity,
                         new StartConfigurationResponseParser(),
                         PersonalIdApiErrorCodes.INVALID_RESPONSE_ERROR));
     }
+    public void validateFirebaseIdToken(Activity activity, String firebaseIdToken,PersonalIdSessionData sessionData) {
+        ApiPersonalId.validateFirebaseIdToken(sessionData.getToken(),activity,firebaseIdToken,
+                createCallback(sessionData,
+                        null,
+                        PersonalIdApiErrorCodes.INVALID_RESPONSE_ERROR));
+    }
 
     public void addOrVerifyNameCall(Activity activity, String name, PersonalIdSessionData sessionData) {
         ApiPersonalId.addOrVerifyName(activity, name, sessionData.getToken(),

app/src/org/commcare/connect/network/connectId/ApiEndPoints.java

@@ -4,6 +4,7 @@ public class ApiEndPoints {
     public static final String connectTokenURL = "/o/token/";
     public static final String connectHeartbeatURL = "/users/heartbeat";
     public static final String connectFetchDbKeyURL = "/users/fetch_db_key";
+    public static final String validateFirebaseIdToken = "/users/validate_firebase_id_token";
     public static final String checkName = "/users/check_name";
     public static final String startConfiguration = "/users/start_configuration";
     public static final String phoneAvailable = "/users/phone_available";

app/src/org/commcare/connect/network/connectId/ApiService.java

@@ -13,6 +13,9 @@ public interface ApiService {
     Call<ResponseBody> startConfiguration(@Header("CC-Integrity-Token") String integrityToken,
             @Header("CC-Request-Hash") String requestHash,
             @Body Map<String, String> registrationRequest);
+    @POST(ApiEndPoints.validateFirebaseIdToken)
+    Call<ResponseBody> validateFirebaseIdToken(@Header("Authorization") String token,
+                                               @Body Map<String, String> firebaseIdToken);
 
     @POST(ApiEndPoints.checkName)
     Call<ResponseBody> checkName(@Header("Authorization") String token,

app/src/org/commcare/fragments/personalId/PersonalIdBackupCodeFragment.java

@@ -233,4 +233,4 @@ private void navigateToSuccess() {
                 getString(R.string.connect_recovery_success_message),
                 ConnectConstants.PERSONALID_RECOVERY_SUCCESS);
     }
-}
+}

app/src/org/commcare/fragments/personalId/PersonalIdNameFragment.java

@@ -9,22 +9,19 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.WindowManager;
-import android.widget.Toast;
-
-import org.commcare.activities.connect.viewmodel.PersonalIdSessionDataViewModel;
-import org.commcare.android.database.connect.models.PersonalIdSessionData;
-import org.commcare.connect.network.ConnectNetworkHelper;
-import org.commcare.connect.network.PersonalIdApiErrorHandler;
-import org.commcare.connect.network.PersonalIdApiHandler;
-import org.commcare.dalvik.R;
-import org.commcare.dalvik.databinding.ScreenPersonalidNameBinding;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.navigation.NavDirections;
 import androidx.navigation.Navigation;
 
+import org.commcare.activities.connect.viewmodel.PersonalIdSessionDataViewModel;
+import org.commcare.android.database.connect.models.PersonalIdSessionData;
+import org.commcare.connect.network.PersonalIdApiErrorHandler;
+import org.commcare.connect.network.PersonalIdApiHandler;
+import org.commcare.dalvik.databinding.ScreenPersonalidNameBinding;
+
 public class PersonalIdNameFragment extends Fragment {
     private ScreenPersonalidNameBinding binding;
     private Activity activity;