@sanctum-key/react-native-sdk 1.0.23 → 1.0.25

package/src/modules/api/CardAuthentification.ts

@@ -3,7 +3,7 @@ import { cropByObb, getObbConfidence, OBB_CONFIDENCE_THRESHOLD } from "../../uti
 import { GovernmentDocumentType, IBbox } from "../../types/KYC.types";
 import { KycEnvironment } from "../../types/env.types";
 import { logger } from "../../utils/logger";
-import { countryData } from "../../config/countriesData";
+// import { countryData } from "../../config/countriesData";
 
 interface CardObbData {
     obb: number[][];
@@ -31,7 +31,8 @@ export async function frontVerification(
         currentSide: string,
         templatePath?: string,
         mrzType?: string,
-        issuingSubdivision?: string
+        issuingSubdivision?: string,
+        clientSideBarcodeData?: string // 🚨 ADDED: Accept the SDK barcode data
     },
     env: KycEnvironment = 'PRODUCTION'
 ) {
@@ -86,7 +87,7 @@ export async function frontVerification(
             : null;
             
         let points: number[][] | null = null;
-        console.log(points)
+        console.log(points);
         let isCardInFrame = true;
         let hasCroppedSides = false;
         
@@ -119,7 +120,7 @@ export async function frontVerification(
             croppedBase64 = crop.base64;
             bbox = crop.bbox;
         } catch { }
-
+        
         if (result.code === 'CA') {
             try {
                 logger.log("Tentative d'extraction OCR (Front) - Canada Only");
@@ -132,13 +133,16 @@ export async function frontVerification(
                     token: token,
                     postfix: result.currentSide || 'front'
                 });
-
-                if (documentData && documentData.data && Object.keys(documentData.data).length === 0) {
+                if (documentData?.no_data || (documentData && documentData.data && Object.keys(documentData.data).length === 0)) {
                     logger.log("Front OCR Extraction Failed: Backend returned empty data dict.");
-                    throw new Error("Impossible de lire les informations du document. L'image est peut-être floue ou mal éclairée.");
+                    if (!hasBarcode && !hasMrz) {
+                        throw new Error("Impossible de lire les informations du document. L'image est peut-être floue ou mal éclairée.");
+                    }
                 }
             } catch (err: any) {
-                logger.log("Front OCR Extraction Error:", err?.message || err);
+                const errorMsg = typeof err === 'object' ? JSON.stringify(err) : err;
+                logger.log("Front OCR Extraction Error:", errorMsg);
+                throw new Error(err?.message || "Impossible d'extraire les données. Veuillez reprendre la photo.");
             }
         }
         
@@ -169,27 +173,16 @@ export async function frontVerification(
                 throw new Error(err?.message || "Erreur lors de l'extraction MRZ. Veuillez reprendre la photo.");
             }
         }
+        
 
-        if (hasBarcode) {
-            try {
-                logger.log("Tentative d'extraction barcode (Front)");
-                barcode = await kycService.extractBarcode({ fileUri: result.path || '', token: token }, env);
-            } catch (e: any) {
-                logger.log("Front Barcode Extraction Error:", e?.message);
-                // If it exclusively has a barcode (no MRZ) and barcode fails, throw.
-                if (!mrz) {
-                    throw new Error(`Lecture Barcode échouée: ${e?.message || 'Veuillez réessayer'}`);
-                }
-            }
-        }
         
-        return { 
-            ...detected, 
-            croppedBase64, 
-            bbox, 
-            ...(mrz ? { mrz } : {}), 
+        return {
+            ...detected,
+            croppedBase64,
+            bbox,
+            ...(mrz ? { mrz } : {}),
             ...(barcode ? { barcode } : {}),
-            ...(documentData ? { documentData } : {}) 
+            ...(documentData ? { documentData } : {})
         };
         
     } catch (e: any) {
@@ -208,8 +201,9 @@ export async function backVerification(
         templatePath?: string,
         mrzType?: string,
         templateResponse?: ApiVerificationResponse,
-        issuingSubdivision?: string, 
-        frontTemplatePath?: string
+        issuingSubdivision?: string,
+        frontTemplatePath?: string,
+        clientSideBarcodeData?: string // 🚨 ADDED: Accept the SDK barcode data
     },
     env: KycEnvironment = 'PRODUCTION'
 ) {
@@ -233,7 +227,7 @@ export async function backVerification(
                 card_in_frame: true,
                 cropped_sides: []
             }];
-
+            
             if (hasMrz) {
                 return {
                     success: true,
@@ -278,7 +272,7 @@ export async function backVerification(
         if (!cardData) throw new Error('CARD_NOT_FULLY_IN_FRAME');
         
         let points: number[][] | null = null;
-        console.log(points)
+        console.log(points);
         let isCardInFrame = false;
         let hasCroppedSides = true;
         
@@ -307,16 +301,15 @@ export async function backVerification(
         const activeTemplatePath = templateResponse.template_path || result.templatePath || '';
         
         if (activeTemplatePath) {
-            const expectedCountryName = countryData[result.code]?.name_en || '';
+            // Note: Make sure ISO_TO_COUNTRY_NAME is properly defined or imported if needed here
             const hasCodeMatch = activeTemplatePath.includes(`_${result.code}_`);
-            const hasNameMatch = expectedCountryName && activeTemplatePath.toLowerCase().includes(expectedCountryName.toLowerCase());
-            
-            if (!hasCodeMatch && !hasNameMatch) {
-                logger.log(`Template mismatch! Expected: ${result.code} (${expectedCountryName}), Detected: ${activeTemplatePath}`);
+            // Assuming you have countryData available, otherwise you can rely just on CodeMatch
+            if (!hasCodeMatch && !activeTemplatePath.toLowerCase().includes(result.code.toLowerCase())) {
+                logger.log(`Template mismatch! Expected region: ${result.code}, Detected: ${activeTemplatePath}`);
                 throw new Error(`Le document ne correspond pas au pays sélectionné (${result.code}).`);
             }
         }
-
+        
         if (result.frontTemplatePath && activeTemplatePath) {
             try {
                 const frontPy = result.frontTemplatePath.split("/").pop()?.replace(/\.(jpg|png)$/i, ".py");
@@ -325,9 +318,9 @@ export async function backVerification(
                 if (frontPy && backPy) {
                     logger.log(`Validating Front (${frontPy}) vs Back (${backPy}) for region ${result.code}`);
                     
-                    const isCanadianSubRegionDoc = result.code === 'CA' && ['hic'].includes(result.selectedDocumentType);
+                    const isCanadianSubRegionDoc = result.code === 'CA' && ['pr'].includes(result.selectedDocumentType);
                     const safeSubRegion = isCanadianSubRegionDoc ? (result.issuingSubdivision || "") : "";
-
+                    
                     const matchValidation = await kycService.validateBackTemplate({
                         region: result.code,
                         docType: result.selectedDocumentType,
@@ -350,7 +343,7 @@ export async function backVerification(
         
         logger.log("Framing, Country, and Match verified successfully. Proceeding to Data Extraction.");
         let extractionResult: any = {};
-
+        
         if (result.code === 'CA') {
             try {
                 logger.log("Tentative d'extraction OCR (Back) - Canada Only");
@@ -363,14 +356,19 @@ export async function backVerification(
                     token: token,
                     postfix: result.currentSide || 'back'
                 });
-
-                if (documentData && documentData.data && Object.keys(documentData.data).length === 0) {
-                    logger.log("Front OCR Extraction Failed: Backend returned empty data dict.");
-                    throw new Error("Impossible de lire les informations du document. L'image est peut-être floue ou mal éclairée.");
+                
+                if (documentData?.no_data || (documentData?.data && Object.keys(documentData.data).length === 0)) {
+                    logger.log("Back OCR Extraction: No text data found (Normal for barcode-only sides).");
+                    if (!hasBarcode && !hasMrz) {
+                        throw new Error("Impossible de lire les informations du document. L'image est peut-être floue ou mal éclairée.");
+                    }
+                } else {
+                    extractionResult.documentData = documentData;
                 }
-                extractionResult.documentData = documentData;
             } catch (err: any) {
-                logger.log("Back OCR Extraction Error:", err?.message || err);
+                const errorMsg = typeof err === 'object' ? JSON.stringify(err) : err;
+                logger.log("Back OCR Extraction Error:", errorMsg);
+                throw new Error(err?.message || "Impossible d'extraire les données. Veuillez reprendre la photo.");
             }
         }
         
@@ -392,25 +390,13 @@ export async function backVerification(
                 if (mrz?.parsed_data?.status === 'FAILURE' || mrz?.success === false) {
                     throw new Error(mrz?.parsed_data?.status_message || 'Lecture MRZ échouée');
                 }
-                extractionResult.mrz = mrz; 
+                extractionResult.mrz = mrz;
             } catch (mrzError: any) {
                 logger.log(`MRZ échoué: ${mrzError?.message}`);
                 throw new Error(`Lecture MRZ invalide: ${mrzError?.message || 'Veuillez nettoyer l\'objectif et réessayer'}`);
             }
         }
         
-        if (hasBarcode) {
-            try {
-                logger.log("Tentative d'extraction barcode (Back)");
-                const barcode = await kycService.extractBarcode({ fileUri: result.path!, token: token }, env);
-                extractionResult.barcode = barcode;
-            } catch (e: any) {
-                // If it explicitly expects a barcode (and not an MRZ) and fails, throw to user
-                if (!extractionResult.mrz) {
-                    throw new Error(`Lecture Barcode échouée: ${e?.message}`);
-                }
-            }
-        }
         
         let bbox: IBbox | undefined;
         let croppedBase64: string | undefined;