@procivis/one-react-native-components 0.3.22 → 0.3.47

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

@@ -1,7 +1,7 @@
 import {
   Config,
   CreateProofRequest,
-  DidListQuery,
+  IdentifierListQuery,
   OneError,
   PresentationSubmitCredentialRequest,
   ProofListQuery,
@@ -16,9 +16,9 @@ import { getQueryKeyFromProofListQueryParams } from '../../parsers/query';
 import { Transport } from '../connectivity/connectivity';
 import { useCoreConfig } from './core-config';
 import { useONECore } from './core-context';
-import { useDids } from './dids';
 import { OneErrorCode } from './error-code';
 import { HISTORY_LIST_QUERY_KEY } from './history';
+import { useIdentifiers } from './identifiers';
 import { useProofSchemaDetail } from './proof-schemas';
 
 const PAGE_SIZE = 10;
@@ -75,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);
@@ -196,7 +198,7 @@ export const useProofCreate = () => {
   });
 };
 
-const getDidFilterForProofSchema = (proofSchema: ProofSchema, config: Config): Partial<DidListQuery> => {
+const getIdentifierFilterForProofSchema = (proofSchema: ProofSchema, config: Config): Partial<IdentifierListQuery> => {
   const requestedFormats = proofSchema.proofInputSchemas.map((schema) => schema.credentialSchema.format);
   const requestedFormatsCapabilities = requestedFormats
     .map((format) => config.format[format]?.capabilities)
@@ -225,12 +227,12 @@ export const useProofForSchemaIdWithTransport = (
   const { data: proofSchema } = useProofSchemaDetail(proofSchemaId, enabled);
   const { data: config } = useCoreConfig();
 
-  const didFilter = useMemo(
-    () => (proofSchema && config ? getDidFilterForProofSchema(proofSchema, config) : undefined),
+  const identifierFilter = useMemo(
+    () => (proofSchema && config ? getIdentifierFilterForProofSchema(proofSchema, config) : undefined),
     [config, proofSchema],
   );
 
-  const { data: dids } = useDids(didFilter);
+  const { data: identifiers } = useIdentifiers(identifierFilter);
   const { mutateAsync: createProof } = useProofCreate();
   const { mutateAsync: deleteProof } = useProofDelete();
 
@@ -262,19 +264,28 @@ export const useProofForSchemaIdWithTransport = (
     if (enabled) {
       return;
     }
+
     if (proofState !== ProofStateEnum.CREATED && proofState !== ProofStateEnum.PENDING) {
       setProofId(undefined);
+    } else {
+      setDeleting(true);
+      deleteProof(proofIdRef.current || '')
+        .then(() => {
+          setProofId(undefined);
+          setDeleting(false);
+        })
+        .catch(() => {});
     }
-  }, [enabled, proofState, setProofId]);
+  }, [deleteProof, enabled, proofId, proofState, setProofId]);
 
   useEffect(() => {
     if (
       deleting ||
       !enabled ||
       proofId ||
-      !dids ||
-      !didFilter ||
-      !dids.values.length ||
+      !identifiers ||
+      !identifierFilter ||
+      !identifiers.values.length ||
       !transport ||
       transport.length === 0
     ) {
@@ -282,16 +293,16 @@ export const useProofForSchemaIdWithTransport = (
     }
 
     createProof({
-      exchange: VerificationProtocol.OPENID4VP_PROXIMITY_DRAFT00,
+      protocol: VerificationProtocol.OPENID4VP_PROXIMITY_DRAFT00,
       proofSchemaId,
       transport,
-      verifierDidId: dids.values[0].id,
+      verifierIdentifierId: identifiers.values[0].id,
     })
       .then((id) => {
         setProofId(id);
       })
       .catch(() => {});
-  }, [proofSchemaId, dids, didFilter, createProof, enabled, transport, proofId, setProofId, deleting]);
+  }, [proofSchemaId, identifiers, identifierFilter, createProof, enabled, transport, proofId, setProofId, deleting]);
 
   return deleting ? undefined : proofId;
 };
@@ -321,6 +332,7 @@ export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, ena
   const [sharedProof, setSharedProof] = useState<{
     bleAdapterDisabled: boolean;
     url?: string;
+    error?: unknown;
   }>();
 
   // reset when proofId changes or the proof was retracted
@@ -342,12 +354,13 @@ export const useShareProof = (proofUrlProps: ProofUrlHookParams | undefined, ena
           url,
         });
       })
-      .catch((err: unknown) => {
-        // TODO emit error with specific error code from core.
-        if (err instanceof OneError && err.cause?.includes('BLE adapter not enabled')) {
+      .catch((error: unknown) => {
+        if (error instanceof OneError && error.cause?.includes('BLE adapter not enabled')) {
           setSharedProof({
             bleAdapterDisabled: true,
           });
+        } else {
+          setSharedProof({ error, bleAdapterDisabled: false });
         }
       });
   }, [enabled, proofUrlProps, shareProof, sharedProof]);

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

@@ -13,6 +13,7 @@ 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';
 
 export const TRUST_ENTITY_DETAIL_QUERY_KEY = 'trust-entity-detail';
 export const REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY = 'remote-trust-entity-detail';
@@ -50,35 +51,45 @@ export const useCreateTrustAnchor = (publisherReference: string) => {
   );
 };
 
-export const useTrustEntity = (didId: string | undefined) => {
+export const useTrustEntity = (identifierId: string | undefined) => {
   const { core } = useONECore();
 
+  const { data: identifierDetail } = useIdentifierDetails(identifierId);
+
   return useQuery(
-    [TRUST_ENTITY_DETAIL_QUERY_KEY, didId],
-    () =>
-      didId
-        ? core.getTrustEntityByDid(didId).catch((e) => {
-            if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
-              return null;
-            }
-            throw e;
-          })
+    [TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
+    () => identifierId && identifierDetail
+        ? core.resolveTrustEntityByIdentifier({
+          identifiers: [{
+            certificateId: identifierDetail.type === 'CERTIFICATE' ? identifierDetail.certificates?.[0]?.id : undefined,
+            id: identifierId,
+          }],
+        }).then((result) => {
+          return result[identifierId];
+        }).catch((e) => {
+          if (e instanceof OneError && e.code === OneErrorCode.NoTrustEntityFound) {
+            return null;
+          }
+          throw e;
+        })
         : undefined,
     {
-      enabled: Boolean(didId),
+      enabled: Boolean(identifierDetail),
       keepPreviousData: true,
     },
   );
 };
 
-export const useRemoteTrustEntity = (did: string | undefined) => {
+export const useRemoteTrustEntity = (identifierId: string | undefined) => {
   const { core } = useONECore();
 
+  const { data: identifierDetail } = useIdentifierDetails(identifierId);
+
   return useQuery(
-    [REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY, did],
-    () => (did ? core.getRemoteTrustEntity(did) : undefined),
+    [REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY, identifierId],
+    () => (identifierDetail?.did ? core.getRemoteTrustEntity(identifierDetail.did.id) : undefined),
     {
-      enabled: Boolean(did),
+      enabled: Boolean(identifierDetail?.did),
       keepPreviousData: true,
     },
   );
@@ -88,7 +99,21 @@ export const useCreateRemoteTrustEntity = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (request: CreateRemoteTrustEntityRequest) => core.createRemoteTrustEntity(request), {
+  return useMutation(async (request: Omit<CreateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string, didId?: string }) => {
+    const { identifierId, didId } = request
+
+    let entityDidId = didId;
+
+    if (identifierId) {
+      const identifierDetail = await core.getIdentifier(identifierId);
+      entityDidId = identifierDetail?.did?.id;
+    }
+
+    return core.createRemoteTrustEntity({
+      ...request,
+      didId: entityDidId!,
+    })
+  }, {
     onSuccess: async () => {
       await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);
@@ -100,7 +125,20 @@ export const useUpdateRemoteTrustEntity = () => {
   const queryClient = useQueryClient();
   const { core } = useONECore();
 
-  return useMutation(async (request: UpdateRemoteTrustEntityRequest) => core.updateRemoteTrustEntity(request), {
+  return useMutation(async (request: Omit<UpdateRemoteTrustEntityRequest, 'didId'> & { identifierId?: string, didId?: string }) => {
+    const { identifierId, didId } = request
+
+    let entityDidId = didId;
+    if (identifierId) {
+      const identifierDetail = await core.getIdentifier(identifierId);
+      entityDidId = identifierDetail?.did?.id;
+    }
+
+    return core.updateRemoteTrustEntity({
+      ...request,
+      didId: entityDidId!,
+    })
+  }, {
     onSuccess: async () => {
       await queryClient.invalidateQueries(REMOTE_TRUST_ENTITY_DETAIL_QUERY_KEY);
       await queryClient.invalidateQueries(HISTORY_LIST_QUERY_KEY);

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 = {
@@ -143,22 +143,16 @@ const getDisplayedAttributes = (
   selectiveDisclosureSupported?: boolean,
   selectedFields?: string[],
 ): DisplayedAttribute[] => {
-  if (credential && selectiveDisclosureSupported === false) {
-    return credential.claims.map((claim) => ({
-      claim,
-      id: claim.id,
-      status: SelectorStatus.Required,
-    }));
-  }
+  const claims = credential ? spreadClaims(credential.claims) : undefined;
 
   return request.fields.map((field) => {
     const selected = !field.required && selectedFields?.includes(field.id);
     const claim =
-      credential &&
-      spreadClaims(credential.claims).find(({ key }) => {
+      credential ?
+      claims?.find(({ key }) => {
         return key === field.keyMap[credential.id];
-      });
-    const status = getAttributeSelectorStatus(field, validityState, credential, claim, selected);
+      }) : undefined;
+    const status = selectiveDisclosureSupported === false ? SelectorStatus.Required : getAttributeSelectorStatus(field, validityState, credential, claim, selected);
     return { claim, field, id: field.id, selected, status };
   });
 };
@@ -236,31 +230,31 @@ export const shareCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, 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, issuer: credential.issuer?.id } : undefined,
   );
   const displayedAttributes = getDisplayedAttributes(
     request,
@@ -320,16 +314,16 @@ export const selectCredentialCardFromCredential = (
   labels: ShareCredentialCardLabels,
 ): Omit<CredentialDetailsCardProps, 'expanded'> => {
   const selectiveDisclosureSupported = supportsSelectiveDisclosure(
-    credential ? { ...credential, issuerDid: credential.issuerDid?.did } : undefined,
+    credential ? { ...credential, 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

@@ -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/query.tsx

@@ -3,6 +3,7 @@ import {
   CredentialSchemaListQuery,
   DidListQuery,
   HistoryListQuery,
+  IdentifierListQuery,
   ProofListQuery,
   ProofSchemaListQuery,
 } from '@procivis/react-native-one-core';
@@ -22,11 +23,11 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
 
   const {
     entityId,
-    action,
+    actions,
     entityTypes,
     createdDateFrom,
     createdDateTo,
-    didId,
+    identifierId,
     credentialId,
     credentialSchemaId,
     searchText,
@@ -35,11 +36,11 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams?: Partial<Hist
   } = queryParams;
   return [
     entityId,
-    action,
+    actions,
     entityTypes,
     createdDateFrom,
     createdDateTo,
-    didId,
+    identifierId,
     credentialId,
     credentialSchemaId,
     searchText,
@@ -80,3 +81,12 @@ export const getQueryKeyFromDidListQueryParams = (queryParams?: Partial<DidListQ
   const { name, did, type, deactivated, keyAlgorithms, keyRoles } = queryParams;
   return [name, did, type, deactivated, keyAlgorithms, keyRoles];
 };
+
+export const getQueryKeyFromIdentifierListQueryParams = (queryParams?: Partial<IdentifierListQuery>) => {
+  if (!queryParams) {
+    return [];
+  }
+
+  const { isRemote, didMethods, state, keyStorages, keyAlgorithms, exact, keyRoles, types, name } = queryParams;
+  return [name, types, state, isRemote, didMethods, keyStorages, keyAlgorithms, exact, keyRoles];
+};