@procivis/one-react-native-components 0.3.94 → 0.3.99

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

@@ -1,9 +1,9 @@
 import {
-  Claim,
+  ClaimBindingDto,
   Config,
-  CredentialDetail,
-  PresentationDefinitionField,
-  PresentationDefinitionRequestedCredential,
+  CredentialDetailBindingDto,
+  PresentationDefinitionFieldBindingDto,
+  PresentationDefinitionRequestedCredentialBindingDto,
 } from '@procivis/react-native-one-core';
 import React from 'react';
 
@@ -29,7 +29,7 @@ import {
 } from './credential';
 
 export const validityCheckedCardFromCredential = (
-  credential: CredentialDetail,
+  credential: CredentialDetailBindingDto,
   invalidLVVC: boolean,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
@@ -73,7 +73,7 @@ export const validityCheckedCardFromCredential = (
 };
 
 export const missingCredentialCardFromRequest = (
-  request: PresentationDefinitionRequestedCredential,
+  request: PresentationDefinitionRequestedCredentialBindingDto,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -95,17 +95,17 @@ export const missingCredentialCardFromRequest = (
 
 interface DisplayedAttribute {
   claim?: FlatClaim;
-  field?: PresentationDefinitionField;
+  field?: PresentationDefinitionFieldBindingDto;
   id: string;
   selected?: boolean;
   status: SelectorStatus;
 }
 
 const getAttributeSelectorStatus = (
-  field: PresentationDefinitionField,
+  field: PresentationDefinitionFieldBindingDto,
   validityState: ValidityState,
-  credential?: CredentialDetail,
-  claim?: Claim,
+  credential?: CredentialDetailBindingDto,
+  claim?: ClaimBindingDto,
   selected?: boolean,
 ): SelectorStatus => {
   if (!credential || validityState !== ValidityState.Valid) {
@@ -124,28 +124,18 @@ const getAttributeSelectorStatus = (
   return selected ? SelectorStatus.SelectedCheckmark : SelectorStatus.Empty;
 };
 
-type ClaimWithOptionalPath = Claim & {
-  path?: string;
-};
-
-type FlatClaim = Claim & {
-  path: string;
+type FlatClaim = ClaimBindingDto & {
   isArrayElement?: boolean;
 };
 
 // Returns a spread list of all claims with their full JSON path as key, including all intermediate objects
-const spreadClaims = (claims: ClaimWithOptionalPath[]): FlatClaim[] => {
-  const claimsWithPath: FlatClaim[] = claims.map((c) => ({
-    ...c,
-    path: c.path ?? c.key,
-  }));
-  return claimsWithPath.reduce((acc, claim) => {
+const spreadClaims = (claims: ClaimBindingDto[]): FlatClaim[] => {
+  return claims.reduce((acc, claim) => {
     const result = [claim];
-    if (Array.isArray(claim.value)) {
-      const nestedClaimsWithPath: FlatClaim[] = claim.value.map((c, i) => ({
+    if (claim.value.type_ === 'NESTED') {
+      const nestedClaimsWithPath: FlatClaim[] = claim.value.value.map((c) => ({
         ...c,
-        path: claim.array ? `${c.key}/${i}` : c.key,
-        isArrayElement: claim.array,
+        isArrayElement: claim.schema.array && claim.path.split('/').pop() !== claim.schema.key,
       }));
       result.push(...spreadClaims(nestedClaimsWithPath));
     }
@@ -154,9 +144,9 @@ const spreadClaims = (claims: ClaimWithOptionalPath[]): FlatClaim[] => {
 };
 
 const getDisplayedAttributes = (
-  request: PresentationDefinitionRequestedCredential,
+  request: PresentationDefinitionRequestedCredentialBindingDto,
   validityState: ValidityState,
-  credential?: CredentialDetail,
+  credential?: CredentialDetailBindingDto,
   selectiveDisclosureSupported?: boolean,
   selectedFields?: string[],
 ): DisplayedAttribute[] => {
@@ -189,8 +179,8 @@ const getDisplayedAttributes = (
 };
 
 const getFullyNestedFields = (
-  fields: PresentationDefinitionRequestedCredential['fields'],
-  credentialId: CredentialDetail['id'],
+  fields: PresentationDefinitionRequestedCredentialBindingDto['fields'],
+  credentialId: CredentialDetailBindingDto['id'],
 ) => {
   const allKeys = fields.filter((field) => credentialId in field.keyMap).map((field) => field.keyMap[credentialId]);
 
@@ -206,7 +196,7 @@ export const shareCredentialCardAttributeFromClaim = (
   testID: string,
   labels: ShareCredentialCardLabels,
   claim?: FlatClaim,
-  field?: PresentationDefinitionField,
+  field?: PresentationDefinitionFieldBindingDto,
 ): CredentialAttribute => {
   if (claim) {
     return {
@@ -267,11 +257,11 @@ export type ShareCredentialCardLabels = CardLabels & {
 };
 
 export const shareCredentialCardFromCredential = (
-  credential: CredentialDetail | undefined,
+  credential: CredentialDetailBindingDto | undefined,
   invalidLVVC: boolean,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
-  request: PresentationDefinitionRequestedCredential,
+  request: PresentationDefinitionRequestedCredentialBindingDto,
   selectedFields: string[] | undefined,
   config: Config,
   testID: string,
@@ -339,7 +329,7 @@ export const selectCredentialCardAttributeFromClaim = (
   testID: string,
   labels: ShareCredentialCardLabels,
   claim?: FlatClaim,
-  field?: PresentationDefinitionField,
+  field?: PresentationDefinitionFieldBindingDto,
 ): CredentialAttribute => {
   const attribute = shareCredentialCardAttributeFromClaim(id, config, testID, labels, claim, field);
   if (!claim) {
@@ -352,9 +342,9 @@ export const selectCredentialCardAttributeFromClaim = (
 };
 
 export const selectCredentialCardFromCredential = (
-  credential: CredentialDetail,
+  credential: CredentialDetailBindingDto,
   selected: boolean,
-  request: PresentationDefinitionRequestedCredential,
+  request: PresentationDefinitionRequestedCredentialBindingDto,
   config: Config,
   testID: string,
   labels: ShareCredentialCardLabels,

package/src/utils/parsers/credential.ts

@@ -1,10 +1,10 @@
 import {
-  Claim,
+  ClaimBindingDto,
   Config,
-  CredentialDetail,
-  CredentialListItem,
-  CredentialSchema,
-  CredentialStateEnum,
+  CredentialDetailBindingDto,
+  CredentialListItemBindingDto,
+  CredentialSchemaDetailBindingDto,
+  CredentialStateBindingEnum,
   DataTypeEnum,
   FormatFeatureEnum,
 } from '@procivis/react-native-one-core';
@@ -30,50 +30,52 @@ export enum ValidityState {
   Valid = 'valid',
 }
 
-export const getValidityState = (credential: CredentialListItem | undefined) => {
-  if (credential?.state === CredentialStateEnum.REVOKED) {
+export const getValidityState = (credential: CredentialListItemBindingDto | undefined) => {
+  if (credential?.state === CredentialStateBindingEnum.REVOKED) {
     return ValidityState.Revoked;
   }
-  if (credential?.state === CredentialStateEnum.SUSPENDED) {
+  if (credential?.state === CredentialStateBindingEnum.SUSPENDED) {
     return ValidityState.Suspended;
   }
   return ValidityState.Valid;
 };
 
-export const supportsSelectiveDisclosure = (credential: CredentialListItem | undefined, config: Config | undefined) => {
+export const supportsSelectiveDisclosure = (
+  credential: CredentialListItemBindingDto | undefined,
+  config: Config | undefined,
+) => {
   const formatConfig = credential && config?.format[credential.schema.format];
   return formatConfig
     ? Boolean(formatConfig.capabilities?.features?.includes(FormatFeatureEnum.SelectiveDisclosure))
     : undefined;
 };
 
-const findClaimByPathParts = (path: string[], claims?: Claim[]): Claim | undefined => {
-  if (!claims?.length) {
+export const findClaimByPath = (path: string | undefined, claims: ClaimBindingDto[]): ClaimBindingDto | undefined => {
+  if (!path) {
     return undefined;
   }
-  const [first, second, ...rest] = path;
-  const claim = claims.find((c) => c.key === first);
-  if (claim === undefined || second === undefined || claim.dataType !== DataTypeEnum.Object) {
-    return claim;
+
+  const exactClaim = claims.find((claim) => claim.path === path);
+  if (exactClaim) {
+    return exactClaim;
   }
 
-  return findClaimByPathParts([`${first}/${second}`, ...rest], claim.value as Claim[]);
-};
+  const parentClaim = claims.find((claim) => path.startsWith(`${claim.path}/`));
+  if (parentClaim && parentClaim.value.type_ === 'NESTED') {
+    return findClaimByPath(path, parentClaim.value.value);
+  }
 
-export const findClaimByPath = (path: string | undefined, claims: Claim[] | undefined) =>
-  path ? findClaimByPathParts(path.split('/'), claims) : undefined;
+  return undefined;
+};
 
-const formatCredentialDetail = (claim: Claim, config: Config, testID: string): string => {
+const formatCredentialDetail = (claim: ClaimBindingDto, config: Config, testID: string): string => {
   const attributeValue = detailsCardAttributeValueFromClaim(claim, config, testID);
   return attributeValue.value ?? '';
 };
 
-export const hasMsoValidityIssues = (credential: CredentialDetail): boolean => {
-  const mdocMsoValidity: { nextUpdate: string } | undefined =
-    'mdocMsoValidity' in credential ? (credential.mdocMsoValidity as { nextUpdate: string }) : undefined;
-
+export const hasMsoValidityIssues = (credential: CredentialDetailBindingDto): boolean => {
   const mdocMsoValidityIssue = Boolean(
-    mdocMsoValidity?.nextUpdate && new Date(mdocMsoValidity.nextUpdate) < new Date(),
+    credential.mdocMsoValidity?.nextUpdate && new Date(credential.mdocMsoValidity.nextUpdate) < new Date(),
   );
 
   return mdocMsoValidityIssue;
@@ -87,8 +89,8 @@ export type CardHeaderLabels = {
 };
 
 const credentialDetailFromCredential = (
-  credential: CredentialDetail,
-  claims: Claim[] = [],
+  credential: CredentialDetailBindingDto,
+  claims: ClaimBindingDto[] = [],
   config: Config,
   testID: string,
   labels: CardHeaderLabels,
@@ -102,7 +104,7 @@ const credentialDetailFromCredential = (
   const { layoutProperties } = credential.schema;
 
   switch (credential.state) {
-    case CredentialStateEnum.SUSPENDED:
+    case CredentialStateBindingEnum.SUSPENDED:
       return {
         credentialDetailPrimary: credential.suspendEndDate
           ? labels.suspendedUntil(formatDateTimeLocalized(new Date(credential.suspendEndDate))!)
@@ -110,7 +112,7 @@ const credentialDetailFromCredential = (
         credentialDetailTestID: concatTestID(testID, 'suspended'),
         statusIcon: CredentialWarningIcon,
       };
-    case CredentialStateEnum.REVOKED:
+    case CredentialStateBindingEnum.REVOKED:
       return {
         credentialDetailPrimary: labels.revoked,
         credentialDetailErrorColor: true,
@@ -151,8 +153,8 @@ const credentialDetailFromCredential = (
 };
 
 export const cardHeaderFromCredential = (
-  credential: CredentialDetail,
-  claims: Claim[] = [],
+  credential: CredentialDetailBindingDto,
+  claims: ClaimBindingDto[] = [],
   config: Config,
   testID: string,
   labels: CardHeaderLabels,
@@ -191,8 +193,8 @@ export type CardLabels = CardHeaderLabels & {
 };
 
 export const getCredentialCardPropsFromCredential = (
-  credential: CredentialDetail,
-  claims: Claim[] = [],
+  credential: CredentialDetailBindingDto,
+  claims: ClaimBindingDto[] = [],
   config: Config,
   notice: CredentialCardNotice | undefined,
   testID: string,
@@ -221,50 +223,51 @@ export const getCredentialCardPropsFromCredential = (
   return result;
 };
 
-export const detailsCardAttributeFromClaim = (claim: Claim, config: Config, testID: string): CredentialAttribute => {
+export const detailsCardAttributeFromClaim = (
+  claim: ClaimBindingDto,
+  config: Config,
+  testID: string,
+): CredentialAttribute => {
   const value = detailsCardAttributeValueFromClaim(claim, config, testID);
   return {
-    id: claim.id,
-    name: claim.key.split('/').pop(),
-    path: claim.key,
+    id: claim.path,
+    name: claim.path.split('/').pop(),
+    path: claim.path,
     ...value,
   };
 };
 
-const detailsCardAttributeValueFromClaim = (claim: Claim, config: Config, testID: string): CredentialAttributeValue => {
-  const typeConfig = config?.datatype[claim.dataType];
+const detailsCardAttributeValueFromClaim = (
+  claim: ClaimBindingDto,
+  config: Config,
+  testID: string,
+): CredentialAttributeValue => {
+  const typeConfig = config?.datatype[claim.schema.datatype];
 
-  if (claim.array) {
+  if (claim.schema.array) {
     return {
-      values: (claim.value || []).map((arrayValue, index) => {
-        return detailsCardAttributeFromClaim(
-          {
-            ...arrayValue,
-            id: `${arrayValue.id}/${index}`,
-          },
-          config,
-          concatTestID(testID, index.toString()),
-        );
+      values: ((claim.value.value as ClaimBindingDto[]) || []).map((arrayValue, index) => {
+        return detailsCardAttributeFromClaim(arrayValue, config, concatTestID(testID, index.toString()));
       }),
     };
   } else {
     switch (typeConfig?.type) {
       case DataTypeEnum.Object: {
-        if (!Array.isArray(claim.value)) {
+        if (claim.value.type_ !== 'NESTED') {
           return { attributes: [] };
         }
         return {
-          attributes: (claim.value as Claim[]).map((nestedClaim, index) =>
+          attributes: claim.value.value.map((nestedClaim, index) =>
             detailsCardAttributeFromClaim(nestedClaim, config, concatTestID(testID, index.toString())),
           ),
         };
       }
       case DataTypeEnum.Date: {
-        if (!claim.value) {
+        if (!claim.value.value) {
           // Don't try to parse empty values (which will return "Invalid Date")
-          return { testID: testID, value: String(claim.value) };
+          return { testID: testID, value: String(claim.value.value) };
         }
-        const date = claim.value as string;
+        const date = claim.value.value as string;
         return {
           testID: testID,
           value: formatDateLocalized(new Date(date)) ?? date,
@@ -273,13 +276,13 @@ const detailsCardAttributeValueFromClaim = (claim: Claim, config: Config, testID
       case DataTypeEnum.Picture: // fallback
       case DataTypeEnum.SwiyuPicture: {
         if (typeConfig.params?.showAs === 'IMAGE') {
-          return { image: { uri: claim.value as string }, testID: testID };
+          return { image: { uri: claim.value.value as string }, testID: testID };
         } else {
-          return { testID: testID, value: claim.value as string };
+          return { testID: testID, value: claim.value.value as string };
         }
       }
       default:
-        return { testID: testID, value: String(claim.value) };
+        return { testID: testID, value: String(claim.value.value) };
     }
   }
 };
@@ -289,7 +292,7 @@ export type CredentialDetailsCardPropsWithoutWidth = Omit<CredentialDetailsCardP
 };
 
 export const detailsCardFromCredential = (
-  credential: CredentialDetail,
+  credential: CredentialDetailBindingDto,
   config: Config,
   testID: string,
   labels: CardLabels,
@@ -298,8 +301,8 @@ export const detailsCardFromCredential = (
 };
 
 export const detailsCardFromCredentialWithClaims = (
-  credential: CredentialDetail,
-  claims: Claim[],
+  credential: CredentialDetailBindingDto,
+  claims: ClaimBindingDto[],
   config: Config,
   testID: string,
   labels: CardLabels,
@@ -399,7 +402,7 @@ function parseBase64Image(image: string | undefined) {
   return image ? '__BASE64IMAGE__' : '';
 }
 
-export function getCredentialSchemaWithoutImages(credentialSchema: CredentialSchema) {
+export function getCredentialSchemaWithoutImages(credentialSchema: CredentialSchemaDetailBindingDto) {
   return {
     ...credentialSchema,
     layoutProperties: {

package/src/utils/parsers/query.ts

@@ -1,11 +1,11 @@
 import {
-  CredentialListQuery,
-  CredentialSchemaListQuery,
-  DidListQuery,
-  HistoryListQuery,
-  IdentifierListQuery,
-  ProofListQuery,
-  ProofSchemaListQuery,
+  CredentialListQueryBindingDto,
+  CredentialSchemaListQueryBindingDto,
+  DidListQueryBindingDto,
+  HistoryListQueryBindingDto,
+  IdentifierListQueryBindingDto,
+  ListProofSchemasFiltersBindingDto,
+  ProofListQueryBindingDto,
 } from '@procivis/react-native-one-core';
 
 type QueryKey<ListQuery, ParamList> = ParamList extends ReadonlyArray<keyof ListQuery> // all params are inside the ListQuery
@@ -22,7 +22,7 @@ function getQueryKey<ListQuery extends {}, ParamList extends ReadonlyArray<keyof
   return params.map((param) => queryParams[param]) as QueryKey<ListQuery, ParamList>;
 }
 
-export const getQueryKeyFromCredentialListQueryParams = (queryParams: Partial<CredentialListQuery> = {}) => {
+export const getQueryKeyFromCredentialListQueryParams = (queryParams: Partial<CredentialListQueryBindingDto> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -50,7 +50,7 @@ export const getQueryKeyFromCredentialListQueryParams = (queryParams: Partial<Cr
   ]);
 };
 
-export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<HistoryListQuery> = {}) => {
+export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<HistoryListQueryBindingDto> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -70,7 +70,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<Histo
 };
 
 export const getQueryKeyFromCredentialSchemaListQueryParams = (
-  queryParams: Partial<CredentialSchemaListQuery> = {},
+  queryParams: Partial<CredentialSchemaListQueryBindingDto> = {},
 ) => {
   return getQueryKey(queryParams, [
     'page',
@@ -91,7 +91,9 @@ export const getQueryKeyFromCredentialSchemaListQueryParams = (
   ]);
 };
 
-export const getQueryKeyFromProofSchemaListQueryParams = (queryParams: Partial<ProofSchemaListQuery> = {}) => {
+export const getQueryKeyFromProofSchemaListQueryParams = (
+  queryParams: Partial<ListProofSchemasFiltersBindingDto> = {},
+) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -109,7 +111,7 @@ export const getQueryKeyFromProofSchemaListQueryParams = (queryParams: Partial<P
   ]);
 };
 
-export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofListQuery> = {}) => {
+export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofListQueryBindingDto> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -134,7 +136,7 @@ export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofLi
   ]);
 };
 
-export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQuery> = {}) => {
+export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQueryBindingDto> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -154,7 +156,7 @@ export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQu
   ]);
 };
 
-export const getQueryKeyFromIdentifierListQueryParams = (queryParams: Partial<IdentifierListQuery> = {}) => {
+export const getQueryKeyFromIdentifierListQueryParams = (queryParams: Partial<IdentifierListQueryBindingDto> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',

package/src/utils/url.ts

@@ -58,4 +58,4 @@ export const shareUrl = async (url: string, title?: string) => {
   } else {
     await Share.open({ url, failOnCancel: false });
   }
-};
+};