@procivis/one-react-native-components 0.2.54 → 0.3.27

package/src/utils/hooks/core/history.ts

@@ -1,13 +1,9 @@
-import { HistoryEntityTypeEnum, HistoryListItem, HistoryListQuery, ItemList } from '@procivis/react-native-one-core';
+import { HistoryListQuery } from '@procivis/react-native-one-core';
 import { useInfiniteQuery } from 'react-query';
 
 import { getQueryKeyFromHistoryListQueryParams } from '../../parsers/query';
 import { useONECore } from './core-context';
 
-export type HistoryListItemWithDid = HistoryListItem & {
-  did?: string;
-};
-
 const PAGE_SIZE = 20;
 export const HISTORY_LIST_QUERY_KEY = 'history-list';
 
@@ -24,58 +20,7 @@ export const useHistory = (queryParams?: Partial<HistoryListQuery>) => {
         ...queryParams,
       });
 
-      const credentialIds = Array.from(
-        new Set(
-          historyPage.values
-            .filter((historyItem) => historyItem.entityType === HistoryEntityTypeEnum.CREDENTIAL)
-            .map((historyItem) => historyItem.entityId!),
-        ),
-      );
-      const proofIds = Array.from(
-        new Set(
-          historyPage.values
-            .filter((historyItem) => historyItem.entityType === HistoryEntityTypeEnum.PROOF)
-            .map((historyItem) => historyItem.entityId!),
-        ),
-      );
-
-      const credentials = await core.getCredentials({
-        ids: credentialIds,
-        organisationId,
-        page: 0,
-        pageSize: credentialIds.length,
-      });
-      const credentialDidsMap: Record<string, string> = Object.assign(
-        {},
-        ...credentials.values.map((credential) => ({
-          [credential.id]: credential.issuerDid,
-        })),
-      );
-
-      const proofs = await Promise.all(proofIds.map((id) => core.getProof(id)));
-      const proofDidsMap: Record<string, string> = Object.assign(
-        {},
-        ...proofs.map((proof) => ({
-          [proof.id]: proof.verifierDid?.did,
-        })),
-      );
-
-      const result: ItemList<HistoryListItemWithDid> = {
-        totalItems: historyPage.totalItems,
-        totalPages: historyPage.totalPages,
-        values: historyPage.values.map((item) => {
-          const did =
-            item.entityType === HistoryEntityTypeEnum.CREDENTIAL
-              ? credentialDidsMap[item.entityId!]
-              : proofDidsMap[item.entityId!];
-          return {
-            ...item,
-            did,
-          };
-        }),
-      };
-
-      return result;
+      return historyPage;
     },
     {
       getNextPageParam: (lastPage, allPages) => (allPages.length < lastPage.totalPages ? allPages.length : undefined),

package/src/utils/hooks/core/identifiers.ts

@@ -0,0 +1,18 @@
+import { useQuery } from "react-query";
+
+import { useONECore } from "./core-context";
+
+export const IDENTIFIER_DETAIL_QUERY_KEY = 'identifier-detail';
+
+export const useIdentifierDetails = (identifierId: string | undefined) => {
+  const { core } = useONECore();
+
+  return useQuery(
+    [IDENTIFIER_DETAIL_QUERY_KEY, identifierId],
+    () => (identifierId ? core.getIdentifier(identifierId) : undefined),
+    {
+      enabled: Boolean(identifierId),
+      keepPreviousData: true,
+    },
+  );
+}

package/src/utils/hooks/core/index.ts

@@ -1,4 +1,5 @@
 export * from './backup';
+export * from './cache';
 export * from './core-config';
 export * from './core-context';
 export * from './core-init';
@@ -6,7 +7,8 @@ export * from './credential-schemas';
 export * from './credentials';
 export * from './dids';
 export * from './history';
+export * from './identifiers';
 export * from './proof-schemas';
 export * from './proofs';
 export * from './query';
-export * from './trust-entity';
+export * from './trust-entity';

package/src/utils/hooks/core/proof-schemas.ts

@@ -111,7 +111,7 @@ export const useProofSchemaDelete = () => {
     onSuccess: async (_, proofSchemaId) => {
       await queryClient.invalidateQueries(PROOF_SCHEMA_LIST_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
-      await queryClient.invalidateQueries([PROOF_SCHEMA_DETAIL_QUERY_KEY, proofSchemaId]);
+      await queryClient.removeQueries([PROOF_SCHEMA_DETAIL_QUERY_KEY, proofSchemaId]);
     },
   });
 };

package/src/utils/hooks/core/proofs.ts

@@ -9,7 +9,7 @@ import {
   ProofStateEnum,
   ShareProofRequest,
 } from '@procivis/react-native-one-core';
-import { useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useMutation, useQuery, useQueryClient } from 'react-query';
 
 import { getQueryKeyFromProofListQueryParams } from '../../parsers/query';
@@ -38,10 +38,14 @@ export const useProofDetail = (proofId: string | undefined) => {
 export const useProofState = (proofId: string | undefined, isPolling: boolean) => {
   const { core } = useONECore();
 
-  return useQuery([PROOF_STATE_QUERY_KEY, proofId], () => core.getProof(proofId!).then((proof) => proof.state), {
-    enabled: Boolean(proofId),
-    refetchInterval: isPolling ? 1000 : false,
-  });
+  return useQuery(
+    [PROOF_STATE_QUERY_KEY, proofId],
+    () => (proofId ? core.getProof(proofId).then((proof) => proof.state) : undefined),
+    {
+      enabled: Boolean(proofId),
+      refetchInterval: isPolling ? 1000 : false,
+    },
+  );
 };
 
 type ProofUrlHookParams = { proofId: string; request?: ShareProofRequest };
@@ -71,13 +75,15 @@ export const useProofAccept = () => {
       interactionId,
       credentials,
       didId,
+      identifierId,
       keyId,
     }: {
       credentials: Record<string, PresentationSubmitCredentialRequest>;
-      didId: string;
+      didId?: string;
+      identifierId?: string;
       interactionId: string;
       keyId?: string;
-    }) => core.holderSubmitProof(interactionId, credentials, didId, keyId),
+    }) => core.holderSubmitProof(interactionId, credentials, didId, identifierId, keyId),
     {
       onError: async () => {
         await queryClient.invalidateQueries(PROOF_DETAIL_QUERY_KEY);
@@ -111,30 +117,36 @@ export const useProofReject = () => {
   );
 };
 
-export enum ExchangeProtocol {
+export enum IssuanceProtocol {
+  OPENID4VCI_DRAFT13 = 'OPENID4VCI_DRAFT13',
+}
+
+export enum VerificationProtocol {
   ISO_MDL = 'ISO_MDL',
-  OPENID4VC = 'OPENID4VC',
-  PROCIVIS = 'PROCIVIS_TEMPORARY',
+  OPENID4VP_DRAFT20 = 'OPENID4VP_DRAFT20',
+  OPENID4VP_DRAFT25 = 'OPENID4VP_DRAFT25',
+  OPENID4VP_PROXIMITY_DRAFT00 = 'OPENID4VP_PROXIMITY_DRAFT00',
+  SCAN_TO_VERIFY = 'SCAN_TO_VERIFY',
 }
 
 export const useProposeProof = () => {
   const queryClient = useQueryClient();
   const { core, organisationId } = useONECore();
 
-  return useMutation(async (exchange: ExchangeProtocol) => core.proposeProof(exchange, organisationId), {
+  return useMutation(async (exchange: VerificationProtocol) => core.proposeProof(exchange, organisationId), {
     onSuccess: async () => {
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
     },
   });
 };
 
-export const useProofRetract = () => {
+export const useProofDelete = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
   return useMutation(
     async (proofId: string) => {
-      return core.retractProof(proofId).catch((e) => {
+      return core.deleteProof(proofId).catch((e) => {
         if (e instanceof OneError && e.code === OneErrorCode.OperationNotSupported) {
           return;
         }
@@ -207,7 +219,11 @@ const getDidFilterForProofSchema = (proofSchema: ProofSchema, config: Config): P
   return { keyAlgorithms, keyStorages };
 };
 
-export const useProofCreateOrReuse = (proofSchemaId: string, transport: Transport[] | undefined, enabled: boolean) => {
+export const useProofForSchemaIdWithTransport = (
+  proofSchemaId: string,
+  transport: Transport[] | undefined,
+  enabled: boolean,
+) => {
   const { data: proofSchema } = useProofSchemaDetail(proofSchemaId, enabled);
   const { data: config } = useCoreConfig();
 
@@ -218,51 +234,86 @@ export const useProofCreateOrReuse = (proofSchemaId: string, transport: Transpor
 
   const { data: dids } = useDids(didFilter);
   const { mutateAsync: createProof } = useProofCreate();
-  const { data: proofs } = useProofs({
-    page: 0,
-    pageSize: 100,
-    proofSchemaIds: [proofSchemaId],
-    proofStates: [ProofStateEnum.CREATED, ProofStateEnum.PENDING],
-  });
+  const { mutateAsync: deleteProof } = useProofDelete();
+
+  const [deleting, setDeleting] = useState(false);
+  const [proofId, setProofIdState] = useState<string | undefined>(undefined);
+  const proofIdRef = useRef<string>();
+
+  const { data: proofState } = useProofState(deleting ? undefined : proofId, enabled);
 
-  const [proofId, setProofId] = useState<string | undefined>(undefined);
+  const setProofId = useCallback((id: string | undefined) => {
+    proofIdRef.current = id;
+    setProofIdState(id);
+  }, []);
 
   useEffect(() => {
-    if (!dids || !didFilter || !dids.values.length || !proofs || !transport || transport.length === 0) {
+    if (!proofIdRef.current) {
       return;
     }
-
-    const transportFilter = transport.length === 2 ? '' : transport[0];
-    const filteredProofs = proofs.values.filter(
-      (p) => p.exchange === ExchangeProtocol.OPENID4VC && p.transport === transportFilter,
-    );
-    const proof =
-      filteredProofs.length > 0
-        ? filteredProofs.find((p) => p.state === ProofStateEnum.PENDING) ?? filteredProofs[0]
-        : undefined;
-
-    const reusableProof = proof?.id;
-
-    if (!enabled) {
-      if (!reusableProof) {
+    setDeleting(true);
+    deleteProof(proofIdRef.current)
+      .then(() => {
         setProofId(undefined);
-      }
+        setDeleting(false);
+      })
+      .catch(() => {});
+  }, [proofIdRef, deleteProof, proofSchemaId, transport, setProofId]);
+
+  useEffect(() => {
+    if (enabled) {
       return;
     }
+    if (proofState !== ProofStateEnum.CREATED && proofState !== ProofStateEnum.PENDING) {
+      setProofId(undefined);
+    }
+  }, [enabled, proofState, setProofId]);
 
-    if (reusableProof) {
-      setProofId(reusableProof);
-    } else {
-      createProof({
-        exchange: ExchangeProtocol.OPENID4VC,
-        proofSchemaId,
-        transport,
-        verifierDidId: dids.values[0].id,
-      }).catch(() => {});
+  useEffect(() => {
+    if (
+      deleting ||
+      !enabled ||
+      proofId ||
+      !dids ||
+      !didFilter ||
+      !dids.values.length ||
+      !transport ||
+      transport.length === 0
+    ) {
+      return;
     }
-  }, [proofSchemaId, proofs, dids, didFilter, createProof, enabled, transport]);
 
-  return proofId;
+    createProof({
+      exchange: VerificationProtocol.OPENID4VP_PROXIMITY_DRAFT00,
+      proofSchemaId,
+      transport,
+      verifierDidId: dids.values[0].id,
+    })
+      .then((id) => {
+        setProofId(id);
+      })
+      .catch(() => {});
+  }, [proofSchemaId, dids, didFilter, createProof, enabled, transport, proofId, setProofId, deleting]);
+
+  return deleting ? undefined : proofId;
+};
+
+export const useCleanupUnusedProofs = () => {
+  const { mutateAsync: deleteProof } = useProofDelete();
+  const { data: proofs } = useProofs({
+    page: 0,
+    pageSize: 100,
+    proofStates: [ProofStateEnum.CREATED, ProofStateEnum.PENDING],
+  });
+  const [cleaned, setCleaned] = useState(false);
+
+  useEffect(() => {
+    if (cleaned || !proofs) {
+      return;
+    }
+    setCleaned(true);
+    proofs.values.forEach((proof) => deleteProof(proof.id));
+  }, [cleaned, deleteProof, proofs]);
 };
 
 export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, enabled: boolean) => {
@@ -306,10 +357,19 @@ export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, ena
   return sharedProof;
 };
 
-export const useRetainProofCheck = () => {
+export const useRetainProofCheck = (proofId?: string) => {
+  const queryClient = useQueryClient();
+
   const { core } = useONECore();
 
-  return useMutation(async () => core.runTask('RETAIN_PROOF_CHECK'));
+  return useMutation(async () => core.runTask('RETAIN_PROOF_CHECK'), {
+    onSuccess: async () => {
+      if (proofId) {
+        await queryClient.removeQueries([PROOF_DETAIL_QUERY_KEY, proofId]);
+        await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
+      }
+    },
+  });
 };
 
 export const useDeleteProofData = (proofId: string) => {
@@ -319,7 +379,7 @@ export const useDeleteProofData = (proofId: string) => {
 
   return useMutation(async () => core.deleteProofClaims(proofId), {
     onSuccess: async () => {
-      await queryClient.invalidateQueries([PROOF_DETAIL_QUERY_KEY, proofId]);
+      await queryClient.removeQueries([PROOF_DETAIL_QUERY_KEY, proofId]);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
     },
   });

package/src/utils/hooks/core/trust-entity.ts

@@ -13,9 +13,10 @@ import { useHTTPClient } from '../http/client';
 import { useONECore } from './core-context';
 import { OneErrorCode } from './error-code';
 import { HISTORY_LIST_QUERY_KEY } from './history';
+import { useIdentifierDetails } from './identifiers';
 
-const TRUST_ENTITY_DETAIL_QUERY_KEY = 'trust-entity-detail';
-const REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY = 'remote-trust-entity-detail';
+export const TRUST_ENTITY_DETAIL_QUERY_KEY = 'trust-entity-detail';
+export const REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY = 'remote-trust-entity-detail';
 
 export const useCreateTrustAnchor = (publisherReference: string) => {
   const httpClient = useHTTPClient();
@@ -39,7 +40,7 @@ export const useCreateTrustAnchor = (publisherReference: string) => {
           isPublisher: false,
           name: trustAnchor.name,
           publisherReference,
-          type: 'SIMPLE_TRUST_LIST',
+          type: TrustManagementEnum.SimpleTrustList,
         })
         .catch((err) => {
           reportException(err, 'Failed to create trust anchor');
@@ -50,22 +51,25 @@ export const useCreateTrustAnchor = (publisherReference: string) => {
   );
 };
 
-export const useTrustEntity = (didId: string | undefined) => {
+// NOTE: As per ONE-5672, only handles DID Identifier details
+export const useTrustEntity = (identifierId: string | undefined) => {
   const { core } = useONECore();
 
+  const { data: identifierDetail } = useIdentifierDetails(identifierId);
+
   return useQuery(
-    [TRUST_ENTITY_DETAIL_QUERY_KEY, didId],
+    [TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
     () =>
-      didId
-        ? core.getTrustEntityByDid(didId).catch((e) => {
-            if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
-              return null;
-            }
-            throw e;
-          })
+      identifierDetail?.did
+        ? core.getTrustEntityByDid(identifierDetail.did.id).catch((e) => {
+          if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
+            return null;
+          }
+          throw e;
+        })
         : undefined,
     {
-      enabled: Boolean(didId),
+      enabled: Boolean(identifierDetail?.did),
       keepPreviousData: true,
     },
   );
@@ -107,3 +111,7 @@ export const useUpdateRemoteTrustEntity = () => {
     },
   });
 };
+
+export enum TrustManagementEnum {
+  SimpleTrustList = 'SIMPLE_TRUST_LIST',
+}

package/src/utils/hooks/navigation/open-settings.ts

@@ -1,6 +1,5 @@
 import { useCallback } from 'react';
 import { Linking, Platform } from 'react-native';
-import { openSettings } from 'react-native-bluetooth-state-manager';
 
 export const useOpenSettings = () => {
   const openBleSettings = useCallback(() => {
@@ -26,9 +25,9 @@ export const useOpenSettings = () => {
       Linking.sendIntent('android.settings.WIFI_SETTINGS').catch(() => {});
     }
   }, []);
-
+  
   const openAppPermissionSettings = useCallback(() => {
-    openSettings().catch(() => {});
+    Linking.openSettings().catch(() => {});
   }, []);
 
   return {

package/src/utils/hooks/revocation/credential-status.ts

@@ -10,11 +10,12 @@ import { useCredentialRevocationCheck, useCredentials } from '../core/credential
  *
  * Navigates to the result page if some credential states were updated
  * @param {string[]} credentialIds if specified only those credentials get checked, otherwise all potentially eligible credentials
+ * @param {boolean} forceRefresh revocation check forces cache refresh
  */
-export const useCredentialStatusCheck = (credentialIds?: string[]) => {
+export const useCredentialStatusCheck = (credentialIds?: string[], forceRefresh = false) => {
   const isFocused = useIsFocused();
   const checkDone = useRef(false);
-  const { mutateAsync: check } = useCredentialRevocationCheck();
+  const { mutateAsync: check } = useCredentialRevocationCheck(forceRefresh);
   const { data: credentials } = useCredentials({
     ids: credentialIds,
     status: [CredentialStateEnum.ACCEPTED, CredentialStateEnum.SUSPENDED],

package/src/utils/index.ts

@@ -3,9 +3,12 @@ import { concatTestID } from './testID';
 
 export { concatTestID, ContrastingStatusBar };
 
+export * from './array';
 export * from './backup';
 export * from './color';
 export * from './date';
+export * from './filtering';
+export * from './history';
 export * from './hooks';
 export * from './navigation';
 export * from './parsers';

package/src/utils/navigation.ts

@@ -29,8 +29,10 @@ export const useBlockOSBackNavigation = (block: boolean = true, onAndroidBack?:
       const handler = () => {
         return onAndroidBack?.() ?? true;
       };
-      BackHandler.addEventListener('hardwareBackPress', handler);
-      return () => BackHandler.removeEventListener('hardwareBackPress', handler);
+      const subscription = BackHandler.addEventListener('hardwareBackPress', handler);
+      return () => {
+        subscription.remove();
+      };
     }
     return undefined;
   }, [block, isFocused, onAndroidBack]);

package/src/utils/parsers/credential-sharing.tsx

@@ -40,13 +40,13 @@ export const validityCheckedCardFromCredential = (
 ): Omit<CredentialCardProps, 'onHeaderPress' | 'style' | 'testID'> => {
   let credentialHeaderDetail:
     | Pick<
-        CredentialHeaderProps,
-        | 'credentialDetailPrimary'
-        | 'credentialDetailSecondary'
-        | 'credentialDetailErrorColor'
-        | 'credentialDetailTestID'
-        | 'statusIcon'
-      >
+      CredentialHeaderProps,
+      | 'credentialDetailPrimary'
+      | 'credentialDetailSecondary'
+      | 'credentialDetailErrorColor'
+      | 'credentialDetailTestID'
+      | 'statusIcon'
+    >
     | undefined;
   if (invalidLVVC) {
     credentialHeaderDetail = {
@@ -236,31 +236,31 @@ export const shareCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
     config,
   );
   const notice: CredentialCardNotice | undefined =
     selectiveDisclosureSupported === false
       ? {
-          text: labels.selectiveDisclosureNotice,
-          noticeIcon: CredentialNoticeWarningIcon,
-        }
+        text: labels.selectiveDisclosureNotice,
+        noticeIcon: CredentialNoticeWarningIcon,
+      }
       : undefined;
   const cardTestId = concatTestID(testID, 'card');
   const card = credential
     ? validityCheckedCardFromCredential(
-        credential,
-        invalidLVVC,
-        expanded,
-        multipleCredentialsAvailable,
-        config,
-        notice,
-        cardTestId,
-        labels,
-      )
+      credential,
+      invalidLVVC,
+      expanded,
+      multipleCredentialsAvailable,
+      config,
+      notice,
+      cardTestId,
+      labels,
+    )
     : missingCredentialCardFromRequest(request, notice, cardTestId, labels);
   const validityState = getValidityState(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
   );
   const displayedAttributes = getDisplayedAttributes(
     request,
@@ -320,16 +320,16 @@ export const selectCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, issuerDid: credential.issuerDid?.id, issuer: credential.issuer?.id } : undefined,
     config,
   );
   const rightAccessory = <Selector status={selected ? SelectorStatus.SelectedRadio : SelectorStatus.Empty} />;
   const notice: CredentialCardNotice | undefined =
     selectiveDisclosureSupported === false
       ? {
-          text: labels.selectiveDisclosureNotice,
-          noticeIcon: CredentialNoticeWarningIcon,
-        }
+        text: labels.selectiveDisclosureNotice,
+        noticeIcon: CredentialNoticeWarningIcon,
+      }
       : undefined;
   const { header, ...cardProps } = getCredentialCardPropsFromCredential(
     credential,

package/src/utils/parsers/credential.ts

@@ -207,7 +207,7 @@ const detailsCardAttributeValueFromClaim = (claim: Claim, config: Config, testID
 
   if (claim.array) {
     return {
-      values: claim.value.map((arrayValue, index) => {
+      values: (claim.value || []).map((arrayValue, index) => {
         return detailsCardAttributeFromClaim(
           {
             ...arrayValue,
@@ -231,6 +231,10 @@ const detailsCardAttributeValueFromClaim = (claim: Claim, config: Config, testID
         };
       }
       case DataTypeEnum.Date: {
+        if (!claim.value) {
+          // Don't try to parse empty values (which will return "Invalid Date")
+          return { testID: testID, value: String(claim.value) };
+        }
         const date = claim.value as string;
         return {
           testID: testID,

package/src/utils/parsers/index.ts

@@ -2,3 +2,4 @@ export * from './credential';
 export * from './credential-images';
 export * from './credential-sharing';
 export * from './query';
+export * from './universal-links';

package/src/utils/parsers/query.tsx

@@ -26,11 +26,12 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
     entityTypes,
     createdDateFrom,
     createdDateTo,
-    didId,
+    identifierId,
     credentialId,
     credentialSchemaId,
     searchText,
     searchType,
+    proofSchemaId,
   } = queryParams;
   return [
     entityId,
@@ -38,11 +39,12 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
     entityTypes,
     createdDateFrom,
     createdDateTo,
-    didId,
+    identifierId,
     credentialId,
     credentialSchemaId,
     searchText,
     searchType,
+    proofSchemaId,
   ];
 };