@authme/identity-verification 2.7.4 → 2.8.1-patch.1

package/index.cjs

@@ -7,6 +7,7 @@ require('core-js/modules/web.dom-collections.iterator.js');
 require('core-js/modules/es.object.assign.js');
 require('core-js/modules/es.array.includes.js');
 require('core-js/modules/es.string.includes.js');
+require('core-js/modules/es.promise.js');
 var core = require('@authme/core');
 var engine = require('@authme/engine');
 var idRecognition = require('@authme/id-recognition');
@@ -16,7 +17,6 @@ require('core-js/modules/es.regexp.to-string.js');
 var liveness = require('@authme/liveness');
 require('core-js/modules/es.parse-float.js');
 require('core-js/modules/es.number.to-fixed.js');
-require('core-js/modules/es.promise.js');
 require('core-js/modules/es.symbol.description.js');
 var lottie = require('lottie-web');
 require('core-js/modules/es.array.reduce.js');
@@ -82,7 +82,8 @@ const defaultIdentityVerificationConfig = {
   apiBaseUrl: '/',
   scriptPath: '/assets/',
   dataTransferMethod: 'binary',
-  OCRIdcardResultFormat: 'default'
+  OCRIdcardResultFormat: 'default',
+  customParameters: ''
 };
 const defaultExtraDocumentConfig = {
   active: true,
@@ -128,7 +129,9 @@ const defaultIdRecognitionConfig = {
   antiFraudIMetalTagValidCountTh: false,
   cardTypes: [],
   cardTypeConfigs: [],
-  captureTimeout: -1
+  captureTimeout: -1,
+  resultImageFormat: 'jpg',
+  confirmPageEnabled: true
 };
 
 function setCorrectViewHeight() {
@@ -24476,9 +24479,14 @@ function renderConfirmUI({
   document.body.appendChild(confirmContainerElem);
   return new Promise((resolve, reject) => {
     confirmContainerElem.querySelector('.confirm-btn').addEventListener('click', e => {
-      const modifiedDetails = Object.fromEntries(Object.keys(items.details).map(column => {
-        var _a, _b;
-        return [column, (_b = (_a = confirmContainerElem.querySelector(`[name="${column}"]`)) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : ''];
+      const modifiedDetails = Object.fromEntries(Object.entries(items.details).map(([column, originalValue]) => {
+        var _a;
+        const inputElement = confirmContainerElem.querySelector(`[name="${column}"]`);
+        const inputValue = (_a = inputElement === null || inputElement === void 0 ? void 0 : inputElement.value) !== null && _a !== void 0 ? _a : '';
+        return [column, {
+          isModified: inputValue !== originalValue,
+          value: inputValue
+        }];
       }));
       sendStatusAction$1(core.StatusAction.Confirm);
       confirmContainerElem.remove();
@@ -25451,6 +25459,72 @@ const countdownTimer = (time, doSomething) => {
     end: getStatus
   };
 };
+const blobToBase64 = image => __awaiter(void 0, void 0, void 0, function* () {
+  return new Promise((resolve, reject) => {
+    // Use FileReader to convert Blob to base64
+    const reader = new FileReader();
+    reader.onloadend = function () {
+      if (reader.result) {
+        // Strip off the data URL prefix to get just the base64-encoded bytes
+        const base64String = reader.result.split(',')[1];
+        resolve(base64String);
+      } else {
+        reject(new Error('Failed to convert Blob to base64'));
+      }
+    };
+    reader.onerror = function (error) {
+      reject(error);
+    };
+    reader.readAsDataURL(image);
+  });
+});
+const blobToImageBase64 = image => __awaiter(void 0, void 0, void 0, function* () {
+  return new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(image);
+    reader.onloadend = () => resolve(reader.result);
+    reader.onerror = reject;
+  });
+});
+const result2ModifiedData = (result, modifiedResult) => {
+  if (!modifiedResult) {
+    const obj = {};
+    for (const key in result) {
+      obj[key] = {
+        isModified: false,
+        value: result[key]
+      };
+    }
+    return obj;
+  }
+  const modifiedData = {};
+  Object.keys(result).forEach(key => {
+    var _a;
+    if ((_a = modifiedResult[key]) === null || _a === void 0 ? void 0 : _a.isModified) {
+      modifiedData[key] = {
+        isModified: true,
+        value: modifiedResult[key].value
+      };
+    } else {
+      modifiedData[key] = {
+        isModified: false,
+        value: result[key]
+      };
+    }
+  });
+  return modifiedData;
+};
+const modifiedData2Result = modifiedResult => {
+  const result = {};
+  if (!modifiedResult) {
+    console.error('modifiedData2Result: modifiedResult is empty');
+    return;
+  }
+  Object.keys(modifiedResult).forEach(key => {
+    result[key] = modifiedResult[key].value;
+  });
+  return result;
+};
 
 const translateService = core.getTranslateInstance();
 // TODO 處理參數
@@ -26235,7 +26309,7 @@ function startOCR(config) {
         if (toastManualCapture) {
           toastManualCapture.clear();
         }
-        return rxjs.from(type === idRecognition.EAuthMeCardClass.Passport && config.ocrConfig.disablePassportConfirm ? rxjs.of(false) : checkConfirmImageManual(canvasSizeInfo)).pipe(rxjs.switchMap(needRetry => {
+        return rxjs.from(type === idRecognition.EAuthMeCardClass.Passport && config.ocrConfig.disablePassportConfirm || !config.ocrConfig.confirmPageEnabled ? rxjs.of(false) : checkConfirmImageManual(canvasSizeInfo)).pipe(rxjs.switchMap(needRetry => {
           util.startSpinner(translateService.translate('sdk.general.uploading'));
           if (needRetry) {
             util.hideElement(confirmImageContainer);
@@ -26285,7 +26359,7 @@ function startOCR(config) {
       })), rxjs.tap(() => received = true))))));
     };
     const autoCapture = canvasSizeInfo => {
-      return rxjs.of(canvasSizeInfo).pipe(handleOcrSendFrame(canvasSizeInfo, image, video, config.recognition, 30, false, 'jpg', cardType, type), rxjs.tap(x => applyTextByResult(x.result)), rxjs.filter(({
+      return rxjs.of(canvasSizeInfo).pipe(handleOcrSendFrame(canvasSizeInfo, image, video, config.recognition, 30, false, config.ocrConfig.resultImageFormat, cardType, type), rxjs.tap(x => applyTextByResult(x.result)), rxjs.filter(({
         result
       }) => result.eStatus === idRecognition.EAuthMeCardOCRStatus.Pass || result.eStatus === idRecognition.EAuthMeMRZServiceStatus.Success), rxjs.take(1), rxjs.tap(() => {
         if (countdownCaptureTimer && countdownCaptureTimer.end && !countdownCaptureTimer.end()) {
@@ -26303,7 +26377,7 @@ function startOCR(config) {
         util.hideElement(scanAnimationContainer);
       }), rxjs.map(() => resp))), rxjs.switchMap(({
         result
-      }) => rxjs.from(type === idRecognition.EAuthMeCardClass.Passport && config.ocrConfig.disablePassportConfirm ? rxjs.of(false) : checkConfirmImage(result.imageData, result.iWidth, result.iHeight)).pipe(rxjs.switchMap(needRetry => {
+      }) => rxjs.from(type === idRecognition.EAuthMeCardClass.Passport && config.ocrConfig.disablePassportConfirm || !config.ocrConfig.confirmPageEnabled ? rxjs.of(false) : checkConfirmImage(result.imageData, result.iWidth, result.iHeight)).pipe(rxjs.switchMap(needRetry => {
         if (countdownCaptureTimer && countdownCaptureTimer.end) {
           if (needRetry && !countdownCaptureTimer.end()) {
             countdownCaptureTimer = countdownTimer(captureTimeoutTimer, () => {
@@ -26423,7 +26497,8 @@ function startOCR(config) {
     }), rxjs.switchMap(canvasSizeInfo => rxjs.from(config.init(canvasSizeInfo.canvasWidth, canvasSizeInfo.canvasHeight)).pipe(rxjs.tap(x => ocrEngineConfig = x), rxjs.tap(() => __awaiter(this, void 0, void 0, function* () {
       if (config.ocrConfig.needAntiFraud) return;
       util.stopSpinner();
-    })), rxjs.tap(() => eventListenerService$1.start()))))).pipe(rxjs.tap(() => {
+    })), rxjs.tap(() => eventListenerService$1.start()) // TODO check useless
+    )))).pipe(rxjs.tap(() => {
       sendStatusAction$1(core.StatusAction.Uploading);
       util.hideElement(videoContainer);
       util.startSpinner(translateService.translate('sdk.general.uploading'));
@@ -26431,36 +26506,41 @@ function startOCR(config) {
       setStatusEvent$1(cardClassResultMapping(config.acceptTypes[config.acceptTypes.length - 1]));
       util.stopSpinner();
       container.style.display = 'none';
-    }), rxjs.concatMap(result => {
+    }), rxjs.concatMap(result => __awaiter(this, void 0, void 0, function* () {
       setStatusView(core.StatusView.Confirm);
-      function resultFromConfirmUI() {
-        return __awaiter(this, void 0, void 0, function* () {
-          if (sdkFlowTimeout) clearTimeout(sdkFlowTimeout);
-          return Object.assign(Object.assign({}, result), {
-            details: yield renderConfirmUI({
-              cardType: config.ocrConfig.type,
-              items: {
-                columns: Object.keys(result.details).sort((a, b) => {
-                  const aScore = idRecognition.getRecognitionColumnOrder(a);
-                  const bScore = idRecognition.getRecognitionColumnOrder(b);
-                  return aScore - bScore || a.localeCompare(b);
-                }),
-                details: result.details
-              },
-              options: {
-                headerIcon: config.ocrConfig.icon,
-                translate: key => translateService.translate(key)
-              }
-            })
-          });
+      let modifiedData = result2ModifiedData(result.details);
+      if (config.ocrConfig.displayResultPage) {
+        modifiedData = yield renderConfirmUI({
+          cardType: config.ocrConfig.type,
+          items: {
+            columns: Object.keys(result.details).sort((a, b) => {
+              const aScore = idRecognition.getRecognitionColumnOrder(a);
+              const bScore = idRecognition.getRecognitionColumnOrder(b);
+              return aScore - bScore || a.localeCompare(b);
+            }),
+            details: result.details
+          },
+          options: {
+            headerIcon: config.ocrConfig.icon,
+            translate: key => translateService.translate(key)
+          }
         });
       }
       flags.onConfirm = true;
-      return config.ocrConfig.displayResultPage ? rxjs.defer(resultFromConfirmUI) : rxjs.of(result);
-    }), rxjs.map(x => ({
-      isSuccess: true,
-      message: '',
-      data: x
+      util.Storage.setItem('scanId', result.scanId);
+      util.Storage.setItem('data', result.details);
+      util.Storage.setItem('confirmedData', modifiedData2Result(modifiedData));
+      return {
+        scanId: result.scanId,
+        isSuccess: true,
+        message: '',
+        data: result.details,
+        modifiedData: modifiedData,
+        backCropImage: result.backCropImage,
+        frontCropImage: result.frontCropImage,
+        frontImage: result.frontImage,
+        backImage: result.backImage
+      };
     })), rxjs.takeUntil(unsubscribe$), rxjs.finalize(() => {
       sendStatusDescription$1(core.StatusDescription.Complete);
       util.stopSpinner();
@@ -26470,7 +26550,7 @@ function startOCR(config) {
       const type = currentType('get', null).type;
       const cardType = currentType('get', null).cardType;
       const ctx = image.getContext('2d');
-      const imageData = util.getImageData(image, ctx, video, canvasSizeInfo, false, 'jpg');
+      const imageData = util.getImageData(image, ctx, video, canvasSizeInfo, false, config.ocrConfig.resultImageFormat);
       const imageBlob = util.UintArrayToBlob(canvasSizeInfo.width, canvasSizeInfo.height, imageData.data);
       const cancelResultObj = {
         isSuccess: false,
@@ -27430,13 +27510,28 @@ class LivenessModule {
       const frameList = [];
       const resultList = [];
       let id = '';
+      let pubKey = '';
+      let shouldEncrypt = false;
+      const encryptDataBase64 = data => __awaiter(this, void 0, void 0, function* () {
+        const dataString = JSON.stringify(data);
+        const encoder = new TextEncoder();
+        const uint8Array = encoder.encode(dataString);
+        // TODO check encrypt function
+        const resultEncrypt = yield this.fasService.encryptBlob(uint8Array, pubKey);
+        return resultEncrypt;
+      });
       try {
         const result = yield rxjs.firstValueFrom(startLiveness({
           init: () => __awaiter(this, void 0, void 0, function* () {
+            var _a;
             const resp = yield liveness.LivenessAPI.IdentityVerification.init(true, config.passive, config.compareCustomerClientId);
             id = resp.id;
-            if (resp.parameters.pubKey) {
-              yield this.fasService.setPublicKeyForJson(resp.parameters.pubKey);
+            pubKey = resp.parameters.pubKey;
+            shouldEncrypt = (_a = resp.shouldEncrypt) !== null && _a !== void 0 ? _a : shouldEncrypt;
+            if (!shouldEncrypt) {
+              yield this.fasService.setPublicKeyForJson(pubKey);
+            } else {
+              yield this.fasService.setPublicKeyForJson('');
             }
             yield this.fasService.init();
             const params = yield this.fasService.getParams();
@@ -27474,10 +27569,10 @@ class LivenessModule {
             return params;
           }),
           onFrame: (data, base64) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _b;
             const result = yield this.fasService.recognition(data);
             if (this.canvas) {
-              const debugData = yield (_a = this.fasService) === null || _a === void 0 ? void 0 : _a.getDebugImageData(data);
+              const debugData = yield (_b = this.fasService) === null || _b === void 0 ? void 0 : _b.getDebugImageData(data);
               const ctx = this.canvas.getContext('2d');
               this.canvas.width = frameWidth;
               this.canvas.height = frameHeight;
@@ -27515,13 +27610,13 @@ class LivenessModule {
             const meta = yield this.fasService.getReport();
             yield SendRequestWithRetry$2(() => this.postResult(id, frameList, resultList, meta, {
               uploadFullFrame: config.uploadFullFrame
-            }));
+            }, shouldEncrypt, encryptDataBase64));
             const result = yield this.getResult(id);
             return result.isPass;
           }),
           onDestroy: () => __awaiter(this, void 0, void 0, function* () {
-            var _b;
-            yield (_b = this.fasService) === null || _b === void 0 ? void 0 : _b.destroy();
+            var _c;
+            yield (_c = this.fasService) === null || _c === void 0 ? void 0 : _c.destroy();
           }),
           getNormalizedROI: () => __awaiter(this, void 0, void 0, function* () {
             return yield this.fasService.getNormalizedFaceROI();
@@ -27560,7 +27655,7 @@ class LivenessModule {
       }
     });
   }
-  postResult(id, frameList, resultList, meta, options = {}) {
+  postResult(id, frameList, resultList, meta, options = {}, shouldEncrypt, encryptDataBase64) {
     return __awaiter(this, void 0, void 0, function* () {
       let uploadTarget = [];
       // 1. iIsKeyFrame Image
@@ -27583,31 +27678,66 @@ class LivenessModule {
         id,
         index: x.index,
         data: x.data
-      })).map(body => this.engine.getConfig().dataTransferMethod === 'base64' ? liveness.LivenessAPI.IdentityVerification.uploadFrame(body) : liveness.LivenessAPI.IdentityVerification.uploadFrameFile(body)));
-      return liveness.LivenessAPI.IdentityVerification.uploadMeta({
+      })).map(body => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        // this.engine.getConfig().dataTransferMethod === 'base64'
+        //   ? LivenessAPI.IdentityVerification.uploadFrame(body)
+        //   : LivenessAPI.IdentityVerification.uploadFrameFile(body)
+        if (shouldEncrypt) {
+          body.data = (_a = body === null || body === void 0 ? void 0 : body.data) === null || _a === void 0 ? void 0 : _a.split('base64,')[1];
+          return liveness.LivenessAPI.IdentityVerification.uploadFrame({
+            id: body.id,
+            encryptedBase64String: yield encryptDataBase64(body)
+          });
+        } else {
+          return liveness.LivenessAPI.IdentityVerification.uploadFrameFile(body);
+        }
+      })));
+      const postData = {
         id,
         data: meta
-      });
+      };
+      if (shouldEncrypt) {
+        postData.data = atob(meta);
+        return liveness.LivenessAPI.IdentityVerification.uploadMeta({
+          id: id,
+          encryptedBase64String: yield encryptDataBase64(postData)
+        });
+      } else {
+        return liveness.LivenessAPI.IdentityVerification.uploadMeta(postData);
+      }
+      // return LivenessAPI.IdentityVerification.uploadMeta({
+      //   id,
+      //   data: meta,
+      // });
     });
   }
+
   getResult(id) {
     return __awaiter(this, void 0, void 0, function* () {
-      let result = yield liveness.LivenessAPI.IdentityVerification.getResult(id);
-      while (result.state === liveness.LivenessResultStatus.UPLOADING) {
-        yield util.waitTime(1000);
+      // while (result.state === LivenessResultStatus.UPLOADING) {
+      //   await waitTime(1000);
+      //   result = await LivenessAPI.IdentityVerification.getResult(id);
+      // }
+      // if (result.state === LivenessResultStatus.VALIDATING) {
+      //   return { ...result, isPass: true };
+      // }
+      const retryCount = 2;
+      const loop = retryCount + 1;
+      let result = {};
+      for (let i = loop; i > 0; i--) {
         result = yield liveness.LivenessAPI.IdentityVerification.getResult(id);
-      }
-      if (result.state === liveness.LivenessResultStatus.VALIDATING) {
-        return Object.assign(Object.assign({}, result), {
-          isPass: true
-        });
+        if (result.state === liveness.LivenessResultStatus.DONE) {
+          return result;
+        }
+        yield util.waitTime(2000);
       }
       return result;
     });
   }
 }
 
-function initFrameView(cardPoints, scanId, faceMode, scanView, cardType, cardTypeConfig, setBorderType, setCardBorderColor, setBorderSuccess) {
+function initFrameView(cardPoints, scanId, faceMode, scanView, cardType, cardTypeConfig, setBorderType, setCardBorderColor, setBorderSuccess, shouldEncrypt, encryptDataBase64) {
   return __awaiter(this, void 0, void 0, function* () {
     const scanAnimationContainer = document.querySelector('.scan');
     document.querySelector('#authme_frame_border');
@@ -27771,7 +27901,23 @@ function initFrameView(cardPoints, scanId, faceMode, scanView, cardType, cardTyp
     for (let i = 0; i < scanViewSetting.content.length; i++) {
       const contentSetting = scanViewSetting.content[i];
       if (contentSetting.type === 'svg') {
-        const imageData = yield idRecognition.initScanDocumentResourceBase64(scanId, contentSetting.content);
+        let imageData;
+        const postData = {
+          scanId: scanId,
+          ResourceId: contentSetting.content
+        };
+        if (shouldEncrypt) {
+          imageData = yield idRecognition.initScanDocumentResourceBase64({
+            id: scanId,
+            encryptedBase64String: yield encryptDataBase64(postData)
+          });
+        } else {
+          imageData = yield idRecognition.initScanDocumentResourceBase64(postData);
+        }
+        // const imageData = await initScanDocumentResourceBase64(
+        //   scanId,
+        //   contentSetting.content
+        // );
         frameImage(faceMode, i, imageData.data, contentSetting.color, contentSetting.opacity);
       }
       if (contentSetting.type === 'text') {
@@ -27816,6 +27962,7 @@ class MRZModule {
       let latestTField = null;
       const virtualCanvas = document.createElement('canvas');
       const docInfos = {};
+      let shouldEncrypt = false;
       const encryptImageBase64 = blob => __awaiter(this, void 0, void 0, function* () {
         const imageArrayBuffer = yield blobToArrayBuffer(blob);
         const uint8Array = new Uint8Array(imageArrayBuffer);
@@ -27830,17 +27977,25 @@ class MRZModule {
           reader.readAsArrayBuffer(blob);
         });
       });
+      const encryptDataBase64 = data => __awaiter(this, void 0, void 0, function* () {
+        const dataString = JSON.stringify(data);
+        const encoder = new TextEncoder();
+        const uint8Array = encoder.encode(dataString);
+        const resultEncrypt = yield this.mrzService.encryptBlob(uint8Array, pubKey);
+        return resultEncrypt;
+      });
       try {
         return yield rxjs.firstValueFrom(startOCR({
           ocrConfig: config,
           init: (width, height) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
+            var _a, _b, _c;
             frameWidth = width;
             frameHeight = height;
-            const resp = yield SendRequestWithRetry$1(() => idRecognition.init(config.type, config.country, config.needConfirm, config.cardTypes));
+            const resp = yield SendRequestWithRetry$1(() => idRecognition.initScan(config.type, config.country, config.needConfirm, config.cardTypes));
+            shouldEncrypt = (_a = resp.shouldEncrypt) !== null && _a !== void 0 ? _a : shouldEncrypt;
             pubKey = resp.parameters.pubKey;
             scanId = resp.scanId;
-            uploadFullFrame = (_b = (_a = resp.parameters.fraud) === null || _a === void 0 ? void 0 : _a.collectAllFrames) !== null && _b !== void 0 ? _b : config.uploadFullFrame;
+            uploadFullFrame = (_c = (_b = resp.parameters.fraud) === null || _b === void 0 ? void 0 : _b.collectAllFrames) !== null && _c !== void 0 ? _c : config.uploadFullFrame;
             if (resp.parameters.pubKey) {
               this.engine.setPublicKeyForJson(pubKey);
             }
@@ -27859,7 +28014,20 @@ class MRZModule {
               docInfos[type].ocrImg = null;
               docInfos[type].ocrOriginImg = null;
             } else {
-              const resp = yield SendRequestWithRetry$1(() => idRecognition.initScanDocument(scanId, cardType));
+              const resp = yield SendRequestWithRetry$1(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanId: scanId,
+                  cardType: cardType
+                };
+                if (shouldEncrypt) {
+                  return idRecognition.initScanDocument({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.initScanDocument(postData);
+                }
+              }));
               if (docInfos[type]) {
                 docInfos[type].docId = resp.scanDocumentId;
               } else {
@@ -27872,17 +28040,17 @@ class MRZModule {
                 };
               }
               if (resp.scanView) {
-                initFrameView(points, scanId, faceMode, resp.scanView, cardType, '', setBorderType, setCardBorderColor, setBorderSuccess);
+                initFrameView(points, scanId, faceMode, resp.scanView, cardType, '', setBorderType, setCardBorderColor, setBorderSuccess, shouldEncrypt, encryptDataBase64);
               }
             }
             return true;
           }),
           acceptTypes,
           recognition: data => __awaiter(this, void 0, void 0, function* () {
-            var _c;
+            var _d;
             const mrzResult = yield this.mrzService.recognition(data);
             if (this.canvas) {
-              const debugData = yield (_c = this.mrzService) === null || _c === void 0 ? void 0 : _c.getDebugImageData(data);
+              const debugData = yield (_d = this.mrzService) === null || _d === void 0 ? void 0 : _d.getDebugImageData(data);
               const ctx = this.canvas.getContext('2d');
               this.canvas.width = frameWidth;
               this.canvas.height = frameHeight;
@@ -27925,8 +28093,34 @@ class MRZModule {
               const image = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas);
               const requestImg = yield encryptImageBase64(image);
               // downloadImage(image, `${frameIndex}-${docInfos[type as EAuthMeCardClass].docId}-${new Date().getTime().toString()}.jpg`)
-              util.backgroundRequest(() => idRecognition.uploadFrameBase64(docInfos[idRecognition.EAuthMeCardClass.Passport].docId, requestImg, frameIndex++));
+              util.backgroundRequest(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docInfos[idRecognition.EAuthMeCardClass.Passport].docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Recognition,
+                  info: {
+                    report: undefined,
+                    index: frameIndex++
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(image);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docInfos[EAuthMeCardClass.Passport].docId,
+              //   requestImg,
+              //   frameIndex++
+              // )
+              );
             }
+
             const tField = latestTField;
             if (!tField) {
               return mrzResult;
@@ -27942,8 +28136,57 @@ class MRZModule {
               docInfos[option.type].docId = '';
               const requestImg = yield encryptImageBase64(docInfos[option.type].ocrOriginImg);
               const report = yield this.mrzService.getReport();
-              yield SendRequestWithRetry$1(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex++, idRecognition.ResourceImageType.Recognition, report));
-              yield SendRequestWithRetry$1(() => idRecognition.finishScanDocument(docId, latestTField !== null && latestTField !== void 0 ? latestTField : {}, docInfos[option.type].fraudResult));
+              yield SendRequestWithRetry$1(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Recognition,
+                  info: {
+                    report: report,
+                    index: frameIndex++
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(docInfos[option.type].ocrOriginImg);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docId,
+              //   requestImg,
+              //   frameIndex++,
+              //   ResourceImageType.Recognition,
+              //   report
+              // )
+              );
+
+              yield SendRequestWithRetry$1(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  details: latestTField !== null && latestTField !== void 0 ? latestTField : {},
+                  fraud: docInfos[option.type].fraudResult
+                };
+                if (shouldEncrypt) {
+                  return idRecognition.finishScanDocument({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.finishScanDocument(postData);
+                }
+              })
+              // finishScanDocument(
+              //   docId,
+              //   latestTField ?? {},
+              //   docInfos[option.type].fraudResult
+              // )
+              );
+
               return true;
             } else {
               return false;
@@ -27958,14 +28201,14 @@ class MRZModule {
             throw 'MRZ Fraud Not Supported.';
           }),
           setFrameSize: (width, height) => __awaiter(this, void 0, void 0, function* () {
-            var _d;
+            var _e;
             frameWidth = width;
             frameHeight = height;
-            yield (_d = this.mrzService) === null || _d === void 0 ? void 0 : _d.setFrameSize(width, height);
+            yield (_e = this.mrzService) === null || _e === void 0 ? void 0 : _e.setFrameSize(width, height);
           }),
           onSuccess: () => __awaiter(this, void 0, void 0, function* () {
-            var _e;
-            (_e = this.mrzService) === null || _e === void 0 ? void 0 : _e.destroy();
+            var _f;
+            (_f = this.mrzService) === null || _f === void 0 ? void 0 : _f.destroy();
             yield util.waitTime(1000);
             return {
               scanId: scanId,
@@ -27973,8 +28216,8 @@ class MRZModule {
             };
           }),
           onDestroy: () => __awaiter(this, void 0, void 0, function* () {
-            var _f;
-            yield (_f = this.mrzService) === null || _f === void 0 ? void 0 : _f.destroy();
+            var _g;
+            yield (_g = this.mrzService) === null || _g === void 0 ? void 0 : _g.destroy();
           }),
           getAntiFraudStageList: () => []
         }));
@@ -28005,6 +28248,25 @@ function unionMerge(a, b) {
   }
   return result;
 }
+// function blobToBase64(image: Blob): Promise<string> {
+//   return new Promise((resolve, reject) => {
+//     // Use FileReader to convert Blob to base64
+//     const reader = new FileReader();
+//     reader.onloadend = function () {
+//       if (reader.result) {
+//         // Strip off the data URL prefix to get just the base64-encoded bytes
+//         const base64String = (reader.result as string).split(',')[1];
+//         resolve(base64String);
+//       } else {
+//         reject(new Error('Failed to convert Blob to base64'));
+//       }
+//     };
+//     reader.onerror = function (error) {
+//       reject(error);
+//     };
+//     reader.readAsDataURL(image);
+//   });
+// }
 function SendRequestWithRetry(promiseFactory, options = {}) {
   return util.retryPromiseWithCondition(promiseFactory, e => __awaiter(this, void 0, void 0, function* () {
     var _a, _b, _c;
@@ -28182,6 +28444,11 @@ class OCRModule {
       let frameIndex = 0;
       let uploadFullFrame = false;
       let fraudTimeout = DEFAULT_ANTI_FRAUD_TIMEOUT;
+      let shouldEncrypt = false;
+      let frontImage = null;
+      let backImage = null;
+      let frontCropImage = null;
+      let backCropImage = null;
       const {
         getDebugLogsLength,
         modifyDeubgLog,
@@ -28214,6 +28481,14 @@ class OCRModule {
           reader.readAsArrayBuffer(blob);
         });
       });
+      const encryptDataBase64 = data => __awaiter(this, void 0, void 0, function* () {
+        const dataString = JSON.stringify(data);
+        const encoder = new TextEncoder();
+        const uint8Array = encoder.encode(dataString);
+        const resultEncrypt = yield this.ocrService.encryptBlob(uint8Array, pubKey);
+        return resultEncrypt;
+      });
+      util.Storage.setItem('encryptDataBase64', encryptDataBase64);
       try {
         const translateService = core.getTranslateInstance();
         const eventNameWrong$ = new rxjs.Subject();
@@ -28221,11 +28496,11 @@ class OCRModule {
           cardTypeConfigs: cardTypeConfigs,
           ocrConfig: config,
           init: (width, height) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d;
+            var _a, _b, _c, _d, _e;
             frameWidth = width;
             frameHeight = height;
             const resp = yield SendRequestWithRetry(() => {
-              return idRecognition.init(config.type, config.country, config.needConfirm, config.cardTypes);
+              return idRecognition.initScan(config.type, config.country, config.needConfirm, config.cardTypes);
             }, {
               onErrorHandler(e) {
                 var _a, _b, _c;
@@ -28251,11 +28526,15 @@ class OCRModule {
               }
             });
             scanId = resp.scanId;
+            shouldEncrypt = (_a = resp.shouldEncrypt) !== null && _a !== void 0 ? _a : shouldEncrypt;
+            util.Storage.setItem('shouldEncrypt', shouldEncrypt);
             pubKey = resp.parameters.pubKey;
-            uploadFullFrame = (_b = (_a = resp.parameters.fraud) === null || _a === void 0 ? void 0 : _a.collectAllFrames) !== null && _b !== void 0 ? _b : config.uploadFullFrame;
-            fraudTimeout = (_d = (_c = resp.parameters.fraud) === null || _c === void 0 ? void 0 : _c.totalTimeout) !== null && _d !== void 0 ? _d : DEFAULT_ANTI_FRAUD_TIMEOUT;
-            if (resp.parameters.pubKey) {
+            uploadFullFrame = (_c = (_b = resp.parameters.fraud) === null || _b === void 0 ? void 0 : _b.collectAllFrames) !== null && _c !== void 0 ? _c : config.uploadFullFrame;
+            fraudTimeout = (_e = (_d = resp.parameters.fraud) === null || _d === void 0 ? void 0 : _d.totalTimeout) !== null && _e !== void 0 ? _e : DEFAULT_ANTI_FRAUD_TIMEOUT;
+            if (!shouldEncrypt) {
               this.engine.setPublicKeyForJson(pubKey);
+            } else {
+              this.engine.setPublicKeyForJson('');
             }
             if (config.type === idRecognition.IdRecognitionCardType.IDCard && config.needAntiFraud) {
               yield this.antiFraudInstance.init();
@@ -28300,7 +28579,20 @@ class OCRModule {
               docInfos[cardType].ocrImg = null;
               docInfos[cardType].ocrOriginImg = null;
             } else {
-              const resp = yield SendRequestWithRetry(() => idRecognition.initScanDocument(scanId, cardType));
+              const resp = yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanId: scanId,
+                  cardType: cardType
+                };
+                if (shouldEncrypt) {
+                  return idRecognition.initScanDocument({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.initScanDocument(postData);
+                }
+              }));
               if (docInfos[cardType]) {
                 docInfos[cardType].docId = resp.scanDocumentId;
               } else {
@@ -28370,7 +28662,23 @@ class OCRModule {
               for (let i = 0; i < scanViewSetting.content.length; i++) {
                 const contentSetting = scanViewSetting.content[i];
                 if (contentSetting.type === 'svg') {
-                  const imageData = yield idRecognition.initScanDocumentResourceBase64(scanId, contentSetting.content);
+                  let imageData;
+                  const postData = {
+                    scanId: scanId,
+                    ResourceId: contentSetting.content
+                  };
+                  if (shouldEncrypt) {
+                    imageData = yield idRecognition.initScanDocumentResourceBase64({
+                      id: scanId,
+                      encryptedBase64String: yield encryptDataBase64(postData)
+                    });
+                  } else {
+                    imageData = yield idRecognition.initScanDocumentResourceBase64(postData);
+                  }
+                  // const imageData = await initScanDocumentResourceBase64(
+                  //   scanId,
+                  //   contentSetting.content
+                  // );
                   frameImage(faceMode, i, imageData.data, contentSetting.color, contentSetting.opacity);
                 }
                 if (contentSetting.type === 'text') {
@@ -28410,7 +28718,20 @@ class OCRModule {
               docInfos[cardType].ocrImg = null;
               docInfos[cardType].ocrOriginImg = null;
             } else {
-              const resp = yield SendRequestWithRetry(() => idRecognition.initScanDocument(scanId, cardType));
+              const resp = yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanId: scanId,
+                  cardType: cardType
+                };
+                if (shouldEncrypt) {
+                  return idRecognition.initScanDocument({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.initScanDocument(postData);
+                }
+              }));
               if (docInfos[cardType]) {
                 docInfos[cardType].docId = resp.scanDocumentId;
               } else {
@@ -28534,7 +28855,23 @@ class OCRModule {
               for (let i = 0; i < scanViewSetting.content.length; i++) {
                 const contentSetting = scanViewSetting.content[i];
                 if (contentSetting.type === 'svg') {
-                  const imageData = yield idRecognition.initScanDocumentResourceBase64(scanId, contentSetting.content);
+                  let imageData;
+                  const postData = {
+                    scanId: scanId,
+                    ResourceId: contentSetting.content
+                  };
+                  if (shouldEncrypt) {
+                    imageData = yield idRecognition.initScanDocumentResourceBase64({
+                      id: scanId,
+                      encryptedBase64String: yield encryptDataBase64(postData)
+                    });
+                  } else {
+                    imageData = yield idRecognition.initScanDocumentResourceBase64(postData);
+                  }
+                  // const imageData = await initScanDocumentResourceBase64(
+                  //   scanId,
+                  //   contentSetting.content
+                  // );
                   frameImage(faceMode, i, imageData.data, contentSetting.color, contentSetting.opacity);
                 }
                 if (contentSetting.type === 'text') {
@@ -28547,11 +28884,11 @@ class OCRModule {
             };
           }),
           onThicknessFrame: (data, _base64, cardType, type) => __awaiter(this, void 0, void 0, function* () {
-            var _e, _f;
+            var _f, _g;
             nextDebugRound(type);
             const antiFraudRecogitionResult = yield functionLogging(() => __awaiter(this, void 0, void 0, function* () {
-              var _g;
-              return yield (_g = this.antiFraudInstance) === null || _g === void 0 ? void 0 : _g.recognition(data);
+              var _h;
+              return yield (_h = this.antiFraudInstance) === null || _h === void 0 ? void 0 : _h.recognition(data);
             }), {
               runFunction: util.RUN_FUNCTION_NAME.ANTI_FARUD_RECOGNITION,
               isAntiFraud: true
@@ -28560,7 +28897,7 @@ class OCRModule {
               return antiFraudRecogitionResult;
             }
             if (this.canvas) {
-              const debugData = yield (_e = this.antiFraudInstance) === null || _e === void 0 ? void 0 : _e.getDebugImageData(data);
+              const debugData = yield (_f = this.antiFraudInstance) === null || _f === void 0 ? void 0 : _f.getDebugImageData(data);
               const ctx = this.canvas.getContext('2d');
               this.canvas.width = frameWidth;
               this.canvas.height = frameHeight;
@@ -28572,12 +28909,12 @@ class OCRModule {
             saveDebugImage({
               data,
               type,
-              getDebugImageData: (_f = this.antiFraudInstance) === null || _f === void 0 ? void 0 : _f.getDebugImageData.bind(this.antiFraudInstance),
+              getDebugImageData: (_g = this.antiFraudInstance) === null || _g === void 0 ? void 0 : _g.getDebugImageData.bind(this.antiFraudInstance),
               result,
               width: frameWidth,
               height: frameHeight
             });
-            const fraudOriginImg = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas);
+            const fraudOriginImg = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas, config.resultImageFormat);
             const thicknessResult = Object.assign(Object.assign({}, antiFraudRecogitionResult), {
               imageData: data
             });
@@ -28594,10 +28931,27 @@ class OCRModule {
                 isAntiFraud: true
               });
               frameIndex++;
-              util.backgroundRequest(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex, idRecognition.ResourceImageType.Recognition // upload fill frame 時先使用 recognition 當成一個過渡方案, 目前後端會對這個處理存成 original image, 後續會再調整
-              ));
+              util.backgroundRequest(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Recognition,
+                  info: {
+                    report: undefined,
+                    index: frameIndex
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(fraudOriginImg);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              }));
             }
-
             return thicknessResult;
           }),
           confirmThickness: (imageData, cardType) => __awaiter(this, void 0, void 0, function* () {
@@ -28605,8 +28959,53 @@ class OCRModule {
             const docId = docInfos[cardType].docId;
             const requestImg = yield encryptImageBase64(imageData);
             try {
-              yield SendRequestWithRetry(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex, idRecognition.ResourceImageType.Attach, undefined));
-              yield SendRequestWithRetry(() => idRecognition.finishScanDocument(docId, {}, null));
+              yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Attach,
+                  info: {
+                    report: undefined,
+                    index: frameIndex
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(imageData);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docId,
+              //   requestImg,
+              //   frameIndex,
+              //   ResourceImageType.Attach,
+              //   undefined
+              // )
+              );
+
+              yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  details: {},
+                  fraud: null
+                };
+                if (shouldEncrypt) {
+                  return idRecognition.finishScanDocument({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.finishScanDocument(postData);
+                }
+              })
+              // finishScanDocument(docId, {}, null)
+              );
+
               return true;
             } catch (error) {
               console.error('confirmThickness:', error);
@@ -28642,10 +29041,10 @@ class OCRModule {
               width: frameWidth,
               height: frameHeight
             });
-            const ocrOriginImg = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas);
+            const ocrOriginImg = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas, config.resultImageFormat);
             const eClass = cardType !== null && cardType !== void 0 ? cardType : '';
             if (result.eStatus === idRecognition.EAuthMeCardOCRStatus.Pass && result.imageData && !!docInfos[eClass].docId) {
-              const resultOcrImg = util.UintArrayToBlob(result.iWidth, result.iHeight, result === null || result === void 0 ? void 0 : result.imageData, virtualCanvas);
+              const resultOcrImg = util.UintArrayToBlob(result.iWidth, result.iHeight, result === null || result === void 0 ? void 0 : result.imageData, virtualCanvas, config.resultImageFormat);
               docInfos[eClass].ocrImg = resultOcrImg;
               docInfos[eClass].ocrOriginImg = ocrOriginImg;
               yield _service.stop();
@@ -28664,7 +29063,38 @@ class OCRModule {
               const requestImg = yield encryptImageBase64(image);
               // downloadImage(image, `${frameIndex}-${docInfos[type as EAuthMeCardClass].docId}-${new Date().getTime().toString()}.jpg`)
               frameIndex++;
-              util.backgroundRequest(() => idRecognition.uploadFrameBase64(docInfos[cardType !== null && cardType !== void 0 ? cardType : ''].docId, requestImg, frameIndex));
+              util.backgroundRequest(() => __awaiter(this, void 0, void 0, function* () {
+                console.log('recognition', docInfos[cardType !== null && cardType !== void 0 ? cardType : ''].docId);
+                if (docInfos[eClass].docId === '') {
+                  console.warn('didnt find docid, retry');
+                  return false;
+                }
+                const postData = {
+                  scanDocumentId: docInfos[cardType !== null && cardType !== void 0 ? cardType : ''].docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Recognition,
+                  info: {
+                    report: undefined,
+                    index: frameIndex
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(image);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docInfos[cardType ?? ''].docId,
+              //   requestImg,
+              //   frameIndex
+              // )
+              );
+
               pushNewDebugImage(ocrOriginImg, {
                 result: result,
                 status: 'recognition',
@@ -28689,45 +29119,131 @@ class OCRModule {
               this.ocrService.stop();
             }
             const docId = docInfos[option.cardType].docId;
-            if (docId) {
-              const needFraudOption = config.needAntiFraud && option.type === engine.EAuthMeCardClass.TWN_IDCard_Front;
-              let ocrOriginImg;
-              if (option.imageData) {
-                ocrOriginImg = option.imageData;
+            if (!docId) {
+              console.warn('didnt find docid , retry');
+              return false;
+            }
+            const ocrImg = option.imageData ? option.imageData : docInfos[option.cardType].ocrImg;
+            const needFraudOption = config.needAntiFraud && option.type === engine.EAuthMeCardClass.TWN_IDCard_Front;
+            let ocrOriginImg;
+            if (option.imageData) {
+              ocrOriginImg = option.imageData;
+            } else {
+              ocrOriginImg = docInfos[option.cardType].ocrOriginImg;
+            }
+            // const base64Image = await blobToBase64(ocrOriginImg);
+            // console.log('confirmImage', base64Image);
+            const requestImg = yield encryptImageBase64(ocrOriginImg);
+            const report = yield this.ocrService.getReport();
+            docInfos[option.cardType].docId = '';
+            modifyDeubgLog(getDebugLogsLength() - 1, {
+              report: report
+            });
+            frameIndex++;
+            yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+              const postData = {
+                scanDocumentId: docId,
+                image: requestImg,
+                type: idRecognition.ResourceImageType.Recognition,
+                info: {
+                  report: report,
+                  index: frameIndex
+                }
+              };
+              if (shouldEncrypt) {
+                postData.image = yield blobToBase64(ocrOriginImg);
+                return idRecognition.uploadFrameBase64({
+                  id: scanId,
+                  encryptedBase64String: yield encryptDataBase64(postData)
+                });
               } else {
-                ocrOriginImg = docInfos[option.cardType].ocrOriginImg;
+                return idRecognition.uploadFrameBase64(postData);
               }
-              // const base64Image = await blobToBase64(ocrOriginImg);
-              // console.log('confirmImage', base64Image);
-              const requestImg = yield encryptImageBase64(ocrOriginImg);
-              const report = yield this.ocrService.getReport();
-              docInfos[option.cardType].docId = '';
-              modifyDeubgLog(getDebugLogsLength() - 1, {
-                report: report
-              });
-              frameIndex++;
-              yield SendRequestWithRetry(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex, idRecognition.ResourceImageType.Recognition, report));
-              frameIndex = 0;
-              try {
-                const ocrImg = option.imageData ? option.imageData : docInfos[option.cardType].ocrImg;
-                const _requestImg = yield encryptImageBase64(ocrImg);
-                const resp = yield SendRequestWithRetry(() => idRecognition.recognitionEncrypt(docId, _requestImg, report, idRecognition.RecognitionFileType.FlatImage));
-                if (resp.retry) {
-                  yield util.asyncShowPopup(translateService.translate('sdk.verify.error.blurRetake.title'), translateService.translate('sdk.verify.error.blurRetake.content'), true);
-                  throw 'recognition failed';
+            })
+            // uploadFrameBase64(
+            //   docId,
+            //   requestImg,
+            //   frameIndex,
+            //   ResourceImageType.Recognition,
+            //   report
+            // )
+            );
+
+            frameIndex = 0;
+            try {
+              const _requestImg = yield encryptImageBase64(ocrImg);
+              const resp = yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: _requestImg,
+                  fileType: idRecognition.RecognitionFileType.FlatImage,
+                  info: {
+                    report: report
+                  }
+                };
+                let response;
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(ocrImg);
+                  response = yield idRecognition.recognizeBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  response = yield idRecognition.recognizeBase64(postData);
                 }
-                result = unionMerge(result, resp && resp.details || {});
-                yield SendRequestWithRetry(() => idRecognition.finishScanDocument(docId, resp.details, needFraudOption ? this.fraudResult : null));
-                delete docInfos[option.cardType];
-                return true;
-              } catch (error) {
-                console.log('confirmImage fail,retrying ');
-                console.error(error);
-                docInfos[option.cardType].docId = docId;
-                return false;
+                if (response === null || response === void 0 ? void 0 : response.detectCardResult) {
+                  if (option.cardType.toLocaleLowerCase().includes('front')) {
+                    frontImage = yield blobToImageBase64(ocrOriginImg);
+                    frontCropImage = yield blobToImageBase64(ocrImg);
+                  }
+                  if (option.cardType.toLocaleLowerCase().includes('back')) {
+                    backImage = yield blobToImageBase64(ocrOriginImg);
+                    backCropImage = yield blobToImageBase64(ocrImg);
+                  }
+                }
+                return response;
+              })
+              //   recognizeBase64(
+              //   docId,
+              //   requestImg,
+              //   report,
+              //   RecognitionFileType.FlatImage
+              // )
+              );
+
+              if (resp.retry) {
+                yield util.asyncShowPopup(translateService.translate('sdk.verify.error.blurRetake.title'), translateService.translate('sdk.verify.error.blurRetake.content'), true);
+                throw 'recognition failed';
               }
-            } else {
-              console.error('didnt find docid , retry ');
+              result = unionMerge(result, resp && resp.details || {});
+              yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  details: resp.details,
+                  fraud: needFraudOption ? this.fraudResult : null
+                };
+                if (shouldEncrypt) {
+                  return idRecognition.finishScanDocument({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.finishScanDocument(postData);
+                }
+              })
+              // finishScanDocument(
+              //   docId,
+              //   resp.details,
+              //   needFraudOption ? this.fraudResult : null
+              // )
+              );
+
+              delete docInfos[option.cardType];
+              return true;
+            } catch (error) {
+              console.log('confirmImage fail,retrying ');
+              console.error(error);
+              docInfos[option.cardType].docId = docId;
               return false;
             }
           }),
@@ -28748,7 +29264,35 @@ class OCRModule {
                 report: report
               });
               frameIndex++;
-              SendRequestWithRetry(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex, idRecognition.ResourceImageType.Recognition, report));
+              SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Recognition,
+                  info: {
+                    report: report,
+                    index: frameIndex
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(ocrOriginImg);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docId,
+              //   requestImg,
+              //   frameIndex,
+              //   ResourceImageType.Recognition,
+              //   report
+              // )
+              );
+
               frameIndex = 0;
               return true;
             } else {
@@ -28776,7 +29320,20 @@ class OCRModule {
               fraudOriginImg: null,
               fraudResult: false
             };
-            const resp = yield SendRequestWithRetry(() => idRecognition.initScanDocument(scanId, idRecognition.twoWayAuthmeCardClassMap.toServer(twnidCardFront)));
+            const resp = yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+              const postData = {
+                scanId: scanId,
+                cardType: idRecognition.twoWayAuthmeCardClassMap.toServer(twnidCardFront)
+              };
+              if (shouldEncrypt) {
+                return idRecognition.initScanDocument({
+                  id: scanId,
+                  encryptedBase64String: yield encryptDataBase64(postData)
+                });
+              } else {
+                return idRecognition.initScanDocument(postData);
+              }
+            }));
             if (docInfos[twnidCardFront]) {
               docInfos[twnidCardFront].docId = resp.scanDocumentId;
             } else {
@@ -28802,12 +29359,12 @@ class OCRModule {
             return true;
           }),
           onAntiFraudFrame: data => __awaiter(this, void 0, void 0, function* () {
-            var _h, _j;
+            var _j, _k;
             const type = engine.EAuthMeCardClass.TWN_IDCard_Front;
             nextDebugRound(type);
             const antiFraudRecogitionResult = yield functionLogging(() => __awaiter(this, void 0, void 0, function* () {
-              var _k;
-              return yield (_k = this.antiFraudInstance) === null || _k === void 0 ? void 0 : _k.recognition(data);
+              var _l;
+              return yield (_l = this.antiFraudInstance) === null || _l === void 0 ? void 0 : _l.recognition(data);
             }), {
               runFunction: util.RUN_FUNCTION_NAME.ANTI_FARUD_RECOGNITION,
               isAntiFraud: true
@@ -28816,7 +29373,7 @@ class OCRModule {
               return antiFraudRecogitionResult;
             }
             if (this.canvas) {
-              const debugData = yield (_h = this.antiFraudInstance) === null || _h === void 0 ? void 0 : _h.getDebugImageData(data);
+              const debugData = yield (_j = this.antiFraudInstance) === null || _j === void 0 ? void 0 : _j.getDebugImageData(data);
               const ctx = this.canvas.getContext('2d');
               this.canvas.width = frameWidth;
               this.canvas.height = frameHeight;
@@ -28828,12 +29385,12 @@ class OCRModule {
             saveDebugImage({
               data,
               type,
-              getDebugImageData: (_j = this.antiFraudInstance) === null || _j === void 0 ? void 0 : _j.getDebugImageData.bind(this.antiFraudInstance),
+              getDebugImageData: (_k = this.antiFraudInstance) === null || _k === void 0 ? void 0 : _k.getDebugImageData.bind(this.antiFraudInstance),
               result,
               width: frameWidth,
               height: frameHeight
             });
-            const fraudOriginImg = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas);
+            const fraudOriginImg = util.UintArrayToBlob(frameWidth, frameHeight, data, virtualCanvas, config.resultImageFormat);
             if (antiFraudRecogitionResult.eStatus === idRecognition.EAuthMeIDCardAntiFraudStatus.Pass || antiFraudRecogitionResult.eStatus === idRecognition.EAuthMeIDCardAntiFraudStatus.Failed) {
               docInfos[type].fraudOriginImg = fraudOriginImg;
               this.fraudResult = antiFraudRecogitionResult.eStatus === idRecognition.EAuthMeIDCardAntiFraudStatus.Pass;
@@ -28850,7 +29407,35 @@ class OCRModule {
                 isAntiFraud: true
               });
               frameIndex++;
-              yield SendRequestWithRetry(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex, idRecognition.ResourceImageType.Fraud, report));
+              yield SendRequestWithRetry(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Fraud,
+                  info: {
+                    report: report,
+                    index: frameIndex
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(ocrImg);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docId,
+              //   requestImg,
+              //   frameIndex,
+              //   ResourceImageType.Fraud,
+              //   report
+              // )
+              );
+
               frameIndex = 0;
               yield this.antiFraudInstance.destroy();
             } else if (uploadFullFrame) {
@@ -28864,49 +29449,86 @@ class OCRModule {
                 isAntiFraud: true
               });
               frameIndex++;
-              util.backgroundRequest(() => idRecognition.uploadFrameBase64(docId, requestImg, frameIndex, idRecognition.ResourceImageType.Fraud));
+              util.backgroundRequest(() => __awaiter(this, void 0, void 0, function* () {
+                const postData = {
+                  scanDocumentId: docId,
+                  image: requestImg,
+                  type: idRecognition.ResourceImageType.Fraud,
+                  info: {
+                    report: undefined,
+                    index: frameIndex
+                  }
+                };
+                if (shouldEncrypt) {
+                  postData.image = yield blobToBase64(fraudOriginImg);
+                  return idRecognition.uploadFrameBase64({
+                    id: scanId,
+                    encryptedBase64String: yield encryptDataBase64(postData)
+                  });
+                } else {
+                  return idRecognition.uploadFrameBase64(postData);
+                }
+              })
+              // uploadFrameBase64(
+              //   docId,
+              //   requestImg,
+              //   frameIndex,
+              //   ResourceImageType.Fraud
+              // )
+              );
             }
+
             return antiFraudRecogitionResult;
           }),
           getAntiFraudStageList: () => {
             return antiFraudStageList;
           },
           setFrameSize: (width, height, points) => __awaiter(this, void 0, void 0, function* () {
-            var _l, _m, _o, _p;
+            var _m, _o, _p, _q;
             frameWidth = width;
             frameHeight = height;
-            yield (_l = this.ocrService) === null || _l === void 0 ? void 0 : _l.setFrameSize(width, height);
-            yield (_m = this.antiFraudInstance) === null || _m === void 0 ? void 0 : _m.setFrameSize(width, height);
+            yield (_m = this.ocrService) === null || _m === void 0 ? void 0 : _m.setFrameSize(width, height);
+            yield (_o = this.antiFraudInstance) === null || _o === void 0 ? void 0 : _o.setFrameSize(width, height);
             if (config.type === idRecognition.IdRecognitionCardType.ResidentCard) {
               // workaround: resident card need MRZ, refactor later.
-              yield (_o = this.residentCardMrzService) === null || _o === void 0 ? void 0 : _o.setFrameSize(width, height);
+              yield (_p = this.residentCardMrzService) === null || _p === void 0 ? void 0 : _p.setFrameSize(width, height);
             }
             if (points) {
-              yield (_p = this.ocrService) === null || _p === void 0 ? void 0 : _p.setMaskPosition(points.map(([x, y]) => [Number(x.toFixed(2)), Number(y.toFixed(2))]));
+              yield (_q = this.ocrService) === null || _q === void 0 ? void 0 : _q.setMaskPosition(points.map(([x, y]) => [Number(x.toFixed(2)), Number(y.toFixed(2))]));
             }
           }),
           onSuccess: () => __awaiter(this, void 0, void 0, function* () {
-            var _q, _r, _s;
+            var _r, _s, _t;
             durationTime.end();
             const ocrIdcardResultFormat = util.Storage.getItem(util.STORAGE_KEY['OCR_IDCARD_RESULT_FORMAT']);
-            (_q = this.antiFraudInstance) === null || _q === void 0 ? void 0 : _q.destroy();
-            (_r = this.ocrService) === null || _r === void 0 ? void 0 : _r.destroy();
+            (_r = this.antiFraudInstance) === null || _r === void 0 ? void 0 : _r.destroy();
+            (_s = this.ocrService) === null || _s === void 0 ? void 0 : _s.destroy();
             // workaround: resident card need MRZ, refactor later.
-            (_s = this.residentCardMrzService) === null || _s === void 0 ? void 0 : _s.destroy();
+            (_t = this.residentCardMrzService) === null || _t === void 0 ? void 0 : _t.destroy();
             if (config.type === idRecognition.IdRecognitionCardType.IDCard && ocrIdcardResultFormat === 'splitDateAndAddress') {
               result = util.splitResult(result);
             }
             yield util.waitTime(1000);
+            // if (Object.keys(result).length === 0) {
+            //   frontCropImage = null;
+            //   backCropImage = null;
+            //   frontImage = null;
+            //   backImage = null;
+            // }
             return {
               scanId: scanId,
-              details: Object.assign({}, result)
+              details: Object.assign({}, result),
+              frontImage,
+              backImage,
+              frontCropImage,
+              backCropImage
             };
           }),
           onDestroy: () => __awaiter(this, void 0, void 0, function* () {
-            var _t, _u;
+            var _u, _v;
             durationTime.end();
-            yield (_t = this.ocrService) === null || _t === void 0 ? void 0 : _t.destroy();
-            yield (_u = this.antiFraudInstance) === null || _u === void 0 ? void 0 : _u.destroy();
+            yield (_u = this.ocrService) === null || _u === void 0 ? void 0 : _u.destroy();
+            yield (_v = this.antiFraudInstance) === null || _v === void 0 ? void 0 : _v.destroy();
           }),
           getCardMatchROI: () => __awaiter(this, void 0, void 0, function* () {
             return yield this.antiFraudInstance.getCardMatchROI();
@@ -28998,7 +29620,7 @@ function renderCardTypeAndCountryConfig(config) {
         <label class="country-select-label">${translate('sdk.home.selectCountry')}</label>
         <div class="country-select-dropdown">
           <div class="country-select-dropdown-frame">
-            <div class="country-select-dropdown-text">${translate(`sdk.home.selectCountry.${idRecognition.CountryCode.TWN}`)}</div>
+            <div class="country-select-dropdown-text">${translate(`sdk.home.selectCountry.${config.defaultCountry}`)}</div>
             <div class="country-select-dropdown-icon"></div>
           </div>
           <div class="dropdown-country-list"></div>
@@ -29185,6 +29807,7 @@ class AuthmeIdentityVerification extends engine.AuthmeFunctionModule {
         // 在尚未執行實際的 method 的時候，並不會佔用時間初始化。
         util.Storage.setItem(util.STORAGE_KEY.LOADING_LOTTIE, loadingLottie);
         util.Storage.setItem(util.STORAGE_KEY.OCR_IDCARD_RESULT_FORMAT, config.OCRIdcardResultFormat);
+        util.Storage.setItem('customParameters', config.customParameters);
         (_b = this.engine) !== null && _b !== void 0 ? _b : this.engine = new engine.MlEngine(engineConfig);
         yield this.engine.setConfig(engineConfig);
         (_c = this.ocrModule) !== null && _c !== void 0 ? _c : this.ocrModule = new OCRModule(this.engine, canvas);
@@ -29285,11 +29908,39 @@ class AuthmeIdentityVerification extends engine.AuthmeFunctionModule {
   confirmOCRResult(data) {
     return __awaiter(this, void 0, void 0, function* () {
       const ocrIdcardResultFormat = util.Storage.getItem(util.STORAGE_KEY['OCR_IDCARD_RESULT_FORMAT']);
+      const shouldEncrypt = util.Storage.getItem('shouldEncrypt');
+      const encryptDataBase64 = util.Storage.getItem('encryptDataBase64');
+      const tmpObj = {};
       if (ocrIdcardResultFormat === 'splitDateAndAddress') {
         data.details = util.combineResult(data.details);
       }
-      yield idRecognition.confirmScan(data.scanId, data.details);
-      return true;
+      const postData = {
+        scanId: util.Storage.getItem('scanId'),
+        details: util.Storage.getItem('confirmedData')
+      };
+      let res;
+      if (shouldEncrypt) {
+        res = yield idRecognition.confirmScan({
+          id: data.scanId,
+          encryptedBase64String: yield encryptDataBase64(postData)
+        });
+      } else {
+        res = yield idRecognition.confirmScan(postData);
+      }
+      for (let index = 0; index < res.confirmedFields.length; index++) {
+        const element = res.confirmedFields[index];
+        tmpObj[element.fieldName] = {
+          isModified: element.isModified,
+          value: element.value
+        };
+      }
+      // await confirmScan(data.scanId, data.details);
+      return {
+        isSuccess: true,
+        message: '',
+        data: util.Storage.getItem('data'),
+        modifiedData: tmpObj
+      };
     });
   }
   // 考慮未來棄用 auth method ，並將將 auth 的部分，
@@ -29328,11 +29979,67 @@ class AuthmeIdentityVerification extends engine.AuthmeFunctionModule {
       return (_a = this.tearDownPromise) !== null && _a !== void 0 ? _a : this.tearDownPromise = this._tearDown();
     });
   }
+  cleanAllModel() {
+    var _a;
+    return __awaiter(this, void 0, void 0, function* () {
+      engine.AuthmeEngineModuleBase.reset_MODEL_CACHE();
+      return (_a = this.tearDownPromise) !== null && _a !== void 0 ? _a : this.tearDownPromise = this._tearDown();
+    });
+  }
+  getCustomerState(arg) {
+    return __awaiter(this, void 0, void 0, function* () {
+      const paramsDefault = {
+        waitingTime: 3,
+        retryTimes: 2
+      };
+      if (arg === null || arg === void 0 ? void 0 : arg.retryTimes) {
+        if (typeof arg.retryTimes !== 'number') {
+          console.error('retryTimes should be a number');
+          return;
+        }
+        if (arg.retryTimes <= 0) {
+          console.error('retryTimes should be greater than 0');
+          return;
+        }
+      }
+      if (arg === null || arg === void 0 ? void 0 : arg.waitingTime) {
+        if (typeof arg.waitingTime !== 'number') {
+          console.error('waitingTime should be a number');
+          return;
+        }
+        if (arg.waitingTime <= 0) {
+          console.error('waitingTime should be greater than 0');
+          return;
+        }
+      }
+      const params = Object.assign(Object.assign({}, paramsDefault), arg);
+      params.retryTimes++;
+      let stop = false;
+      for (let i = 0; i < params.retryTimes; i++) {
+        if (!stop) {
+          const res = yield core.getCustomerState();
+          if (res.state === 'Approved') {
+            stop = true;
+            return res;
+          } else if (res.state === 'Rejected') {
+            stop = true;
+            return res;
+          } else {
+            yield new Promise(resolve => setTimeout(resolve, params.waitingTime * 1000));
+          }
+          if (i === params.retryTimes - 1) {
+            return res;
+          }
+        }
+      }
+      // return getCustomerState();
+    });
+  }
 }
 
 var name = "authme/sdk";
-var version$1 = "2.7.4";
-var date = "2024-12-04T02:44:31+0000";
+var version$1 = "2.8.1-patch.1";
+var date = "2025-06-12T13:55:46+0000";
 var packageInfo = {
 	name: name,
 	version: version$1,