fix(INJI-536):check status failed while downloading vc (#985)

* fix(INJI-536):check status failed while downloading vc Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-536):refactor the default switch case Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-536):fix error handling and avoid usage of VCmetadata Signed-off-by: Sri Kanth Kola <[email protected]> * fix(INJI-536):fix error handling and avoid usage of VCmetadata Signed-off-by: Sri Kanth Kola <[email protected]> --------- Signed-off-by: Sri Kanth Kola <[email protected]>
mosip · Nov 8, 2023 · 1ce89cb · 1ce89cb
1 parent 5a3ad48
commit 1ce89cb
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 38 deletions.
diff --git a/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts b/machines/VCItemMachine/ExistingMosipVCItem/ExistingMosipVCItemMachine.ts
@@ -64,8 +64,8 @@ const model = createModel(
     bindingTransactionId: '',
     revoked: false,
     downloadCounter: 0,
-    maxDownloadCount: 10,
-    downloadInterval: 5000,
+    maxDownloadCount: null as number,
+    downloadInterval: null as number,
     walletBindingResponse: null as WalletBindingResponse,
     walletBindingError: '',
     walletBindingSuccess: false,
@@ -84,6 +84,7 @@ const model = createModel(
       STORE_RESPONSE: (response: VC) => ({response}),
       POLL: () => ({}),
       DOWNLOAD_READY: () => ({}),
+      FAILED: () => ({}),
       GET_VC_RESPONSE: (vc: VC) => ({vc}),
       VERIFY: () => ({}),
       LOCK_VC: () => ({}),
@@ -184,7 +185,6 @@ export const ExistingMosipVCItemMachine =
                     log((_, event) => (event.data as Error).message),
                     'sendDownloadLimitExpire',
                   ],
-                  target: 'checkingStatus',
                 },
               },
             },
@@ -201,6 +201,12 @@ export const ExistingMosipVCItemMachine =
                 DOWNLOAD_READY: {
                   target: 'downloadingCredential',
                 },
+                FAILED: [
+                  {
+                    actions: ['incrementDownloadCounter'],
+                    target: 'verifyingDownloadLimitExpiry',
+                  },
+                ],
               },
             },
             downloadingCredential: {
@@ -217,6 +223,9 @@ export const ExistingMosipVCItemMachine =
                       'incrementDownloadCounter',
                     ],
                   },
+                  {
+                    target: 'verifyingDownloadLimitExpiry',
+                  },
                 ],
                 CREDENTIAL_DOWNLOADED: {
                   actions: ['setStoreVerifiableCredential', 'storeContext'],
@@ -1369,19 +1378,27 @@ export const ExistingMosipVCItemMachine =
 
           onReceive(async event => {
             if (event.type === 'POLL_STATUS') {
-              const response = await request(
-                API_URLS.credentialStatus.method,
-                API_URLS.credentialStatus.buildURL(
-                  context.vcMetadata.requestId,
-                ),
-              );
-              switch (response.response?.statusCode) {
-                case 'NEW':
-                  break;
-                case 'ISSUED':
-                case 'printing':
-                  callback(model.events.DOWNLOAD_READY());
-                  break;
+              try {
+                const response = await request(
+                  API_URLS.credentialStatus.method,
+                  API_URLS.credentialStatus.buildURL(
+                    context.vcMetadata.requestId,
+                  ),
+                );
+                switch (response.response?.statusCode) {
+                  case 'NEW':
+                    break;
+                  case 'ISSUED':
+                  case 'printing':
+                    callback(model.events.DOWNLOAD_READY());
+                    break;
+                  case 'FAILED':
+                  default:
+                    callback(model.events.FAILED());
+                    break;
+                }
+              } catch (error) {
+                callback(model.events.FAILED());
               }
             }
           });

diff --git a/machines/vc.ts b/machines/vc.ts
@@ -209,7 +209,10 @@ export const vcMachine =
                 'removeVcFromInProgressDownlods',
                 'setDownloadingFailedVcs',
               ],
-              target: 'downloadLimitExpired',
+              target: '#vc.ready.myVcs.refreshing',
+            },
+            DELETE_VC: {
+              target: 'deletingFailedVcs',
             },
           },
         },
@@ -221,13 +224,6 @@ export const vcMachine =
             },
           },
         },
-        downloadLimitExpired: {
-          on: {
-            DELETE_VC: {
-              target: 'deletingFailedVcs',
-            },
-          },
-        },
         deletingFailedVcs: {
           entry: 'removeDownloadFailedVcsFromStorage',
           on: {
@@ -283,8 +279,8 @@ export const vcMachine =
 
         setDownloadingFailedVcs: model.assign({
           downloadingFailedVcs: (context, event) => [
-            event.vcMetadata,
             ...context.downloadingFailedVcs,
+            event.vcMetadata,
           ],
         }),
 
@@ -526,10 +522,6 @@ export function selectIsTampered(state: State) {
   return state.matches('tamperedVCs');
 }
 
-export function selectIsDownloadLimitExpired(state: State) {
-  return state.matches('downloadLimitExpired');
-}
-
 export function selectDownloadingFailedVcs(state: State) {
   return state.context.downloadingFailedVcs;
 }
diff --git a/screens/Home/MyVcsTab.tsx b/screens/Home/MyVcsTab.tsx
@@ -22,6 +22,7 @@ import {
 import {TelemetryConstants} from '../../shared/telemetry/TelemetryConstants';
 
 import {Error} from '../../components/ui/Error';
+import {useIsFocused} from '@react-navigation/native';
 
 const pinIconProps = {iconName: 'pushpin', iconType: 'antdesign'};
 
@@ -80,11 +81,17 @@ export const MyVcsTab: React.FC<HomeScreenTabProps> = props => {
 
   let failedVCsList = [];
   controller.downloadFailedVcs.forEach(vc => {
-    failedVCsList.push(`${vc.idType}:${vc.id}\n`);
+    failedVCsList.push(`\n${vc.idType}:${vc.id}`);
   });
   const downloadFailedVcsErrorMessage = `${t(
     'errors.downloadLimitExpires.message',
-  )}\n${failedVCsList}`;
+  )}${failedVCsList}`;
+
+  const isDownloadFailedVcs =
+    useIsFocused() &&
+    controller.downloadFailedVcs.length >= 1 &&
+    !controller.AddVcModalService &&
+    !controller.GetVcModalService;
 
   return (
     <React.Fragment>
@@ -213,7 +220,7 @@ export const MyVcsTab: React.FC<HomeScreenTabProps> = props => {
       />
 
       <MessageOverlay
-        isVisible={controller.isDownloadLimitExpires}
+        isVisible={isDownloadFailedVcs}
         title={t('errors.downloadLimitExpires.title')}
         message={downloadFailedVcsErrorMessage}
         onButtonPress={controller.DELETE_VC}

diff --git a/screens/Home/MyVcsTabController.ts b/screens/Home/MyVcsTabController.ts
@@ -9,7 +9,6 @@ import {
   selectAreAllVcsDownloaded,
   selectInProgressVcDownloads,
   selectIsTampered,
-  selectIsDownloadLimitExpired,
   selectDownloadingFailedVcs,
 } from '../../machines/vc';
 import {
@@ -63,11 +62,6 @@ export function useMyVcsTab(props: HomeScreenTabProps) {
 
     isTampered: useSelector(vcService, selectIsTampered),
 
-    isDownloadLimitExpires: useSelector(
-      vcService,
-      selectIsDownloadLimitExpired,
-    ),
-
     downloadFailedVcs: useSelector(vcService, selectDownloadingFailedVcs),
 
     SET_STORE_VC_ITEM_STATUS: () =>