@procivis/one-react-native-components 0.3.106 → 0.3.115

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

@@ -1,11 +1,11 @@
 import {
-  ClaimBindingDto,
-  ClaimValueBindingDto,
-  Config,
-  CredentialQueryFailureHintResponseBindingDto,
-  PresentationDefinitionV2ClaimBindingDto,
-  PresentationDefinitionV2ClaimValueBindingDto,
-  PresentationDefinitionV2CredentialDetailBindingDto,
+  Claim,
+  ClaimValue,
+  CoreConfig,
+  CredentialQueryFailureHint,
+  PresentationDefinitionV2Claim,
+  PresentationDefinitionV2ClaimValue,
+  PresentationDefinitionV2Credential,
 } from '@procivis/react-native-one-core';
 import React from 'react';
 
@@ -27,7 +27,7 @@ import {
 } from '.';
 import { ShareCredentialCardLabels, validityCheckedCardFromCredential } from './credential-sharing';
 
-const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValueBindingDto): ClaimValueBindingDto => {
+const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValue): ClaimValue => {
   if (value.type_ !== 'NESTED') {
     return value;
   }
@@ -37,7 +37,7 @@ const v2ClaimValueToClaimValue = (value: PresentationDefinitionV2ClaimValueBindi
   };
 };
 
-const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2ClaimBindingDto): ClaimBindingDto => {
+const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2Claim): Claim => {
   return {
     schema: claim.schema,
     path: claim.path,
@@ -46,7 +46,7 @@ const v2PresentationClaimToClaim = (claim: PresentationDefinitionV2ClaimBindingD
 };
 
 const getAttributeSelectorStatus = (
-  claim: PresentationDefinitionV2ClaimBindingDto,
+  claim: PresentationDefinitionV2Claim,
   selected: boolean,
   force: boolean,
 ): SelectorStatus | undefined => {
@@ -66,11 +66,11 @@ const getAttributeSelectorStatus = (
 };
 
 export const shareCredentialCardAttributeFromV2Claim = (
-  claim: PresentationDefinitionV2ClaimBindingDto,
+  claim: PresentationDefinitionV2Claim,
   selection: string[] | undefined,
   parentShared: boolean,
   parentUserSelected: boolean,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   nested?: boolean,
   listValue?: boolean,
@@ -133,7 +133,7 @@ export const shareCredentialCardAttributeFromV2Claim = (
 };
 
 export const missingCredentialCardFromFailureHint = (
-  failureHint: CredentialQueryFailureHintResponseBindingDto | undefined,
+  failureHint: CredentialQueryFailureHint | undefined,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -154,12 +154,12 @@ export const missingCredentialCardFromFailureHint = (
 };
 
 export const shareCredentialCardFromV2PresentationCredential = (
-  credential: PresentationDefinitionV2CredentialDetailBindingDto | undefined,
-  failureHint: CredentialQueryFailureHintResponseBindingDto | undefined,
+  credential: PresentationDefinitionV2Credential | undefined,
+  failureHint: CredentialQueryFailureHint | undefined,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
   selectedFields: string[] | undefined,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -200,10 +200,10 @@ export const shareCredentialCardFromV2PresentationCredential = (
 };
 
 export const selectCredentialCardFromV2Credential = (
-  credential: PresentationDefinitionV2CredentialDetailBindingDto,
+  credential: PresentationDefinitionV2Credential,
   selected: boolean,
   multiple: boolean,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -247,15 +247,13 @@ export const selectCredentialCardFromV2Credential = (
   };
 };
 
-export const getV2CredentialClaimAllSubpaths = (claim: PresentationDefinitionV2ClaimBindingDto): string[] => {
+export const getV2CredentialClaimAllSubpaths = (claim: PresentationDefinitionV2Claim): string[] => {
   if (claim.value.type_ !== 'NESTED') {
     return [claim.path];
   }
   return [claim.path, ...claim.value.value.flatMap(getV2CredentialClaimAllSubpaths)];
 };
 
-export const getV2CredentialAvailablePaths = (
-  credential: PresentationDefinitionV2CredentialDetailBindingDto,
-): string[] => {
+export const getV2CredentialAvailablePaths = (credential: PresentationDefinitionV2Credential): string[] => {
   return credential.claims.flatMap(getV2CredentialClaimAllSubpaths);
 };

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

@@ -1,9 +1,9 @@
 import {
-  ClaimBindingDto,
-  Config,
-  CredentialDetailBindingDto,
-  PresentationDefinitionFieldBindingDto,
-  PresentationDefinitionRequestedCredentialBindingDto,
+  Claim,
+  CoreConfig,
+  CredentialDetail,
+  PresentationDefinitionField,
+  PresentationDefinitionRequestedCredential,
 } from '@procivis/react-native-one-core';
 import React from 'react';
 
@@ -29,10 +29,10 @@ import {
 } from './credential';
 
 export const validityCheckedCardFromCredential = (
-  credential: CredentialDetailBindingDto,
+  credential: CredentialDetail,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
-  config: Config,
+  config: CoreConfig,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -66,7 +66,7 @@ export const validityCheckedCardFromCredential = (
 };
 
 export const missingCredentialCardFromRequest = (
-  request: PresentationDefinitionRequestedCredentialBindingDto,
+  request: PresentationDefinitionRequestedCredential,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: ShareCredentialCardLabels,
@@ -88,17 +88,17 @@ export const missingCredentialCardFromRequest = (
 
 interface DisplayedAttribute {
   claim?: FlatClaim;
-  field?: PresentationDefinitionFieldBindingDto;
+  field?: PresentationDefinitionField;
   id: string;
   selected?: boolean;
   status: SelectorStatus;
 }
 
 const getAttributeSelectorStatus = (
-  field: PresentationDefinitionFieldBindingDto,
+  field: PresentationDefinitionField,
   validityState: ValidityState,
-  credential?: CredentialDetailBindingDto,
-  claim?: ClaimBindingDto,
+  credential?: CredentialDetail,
+  claim?: Claim,
   selected?: boolean,
 ): SelectorStatus => {
   if (!credential || validityState !== ValidityState.Valid) {
@@ -117,12 +117,12 @@ const getAttributeSelectorStatus = (
   return selected ? SelectorStatus.SelectedCheckmark : SelectorStatus.Empty;
 };
 
-type FlatClaim = ClaimBindingDto & {
+type FlatClaim = Claim & {
   isArrayElement?: boolean;
 };
 
 // Returns a spread list of all claims with their full JSON path as key, including all intermediate objects
-const spreadClaims = (claims: ClaimBindingDto[]): FlatClaim[] => {
+const spreadClaims = (claims: Claim[]): FlatClaim[] => {
   return claims.reduce((acc, claim) => {
     const result = [claim];
     if (claim.value.type_ === 'NESTED') {
@@ -137,9 +137,9 @@ const spreadClaims = (claims: ClaimBindingDto[]): FlatClaim[] => {
 };
 
 const getDisplayedAttributes = (
-  request: PresentationDefinitionRequestedCredentialBindingDto,
+  request: PresentationDefinitionRequestedCredential,
   validityState: ValidityState,
-  credential?: CredentialDetailBindingDto,
+  credential?: CredentialDetail,
   selectiveDisclosureSupported?: boolean,
   selectedFields?: string[],
 ): DisplayedAttribute[] => {
@@ -172,8 +172,8 @@ const getDisplayedAttributes = (
 };
 
 const getFullyNestedFields = (
-  fields: PresentationDefinitionRequestedCredentialBindingDto['fields'],
-  credentialId: CredentialDetailBindingDto['id'],
+  fields: PresentationDefinitionRequestedCredential['fields'],
+  credentialId: CredentialDetail['id'],
 ) => {
   const allKeys = fields.filter((field) => credentialId in field.keyMap).map((field) => field.keyMap[credentialId]);
 
@@ -185,11 +185,11 @@ const getFullyNestedFields = (
 
 export const shareCredentialCardAttributeFromClaim = (
   id: string,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
   claim?: FlatClaim,
-  field?: PresentationDefinitionFieldBindingDto,
+  field?: PresentationDefinitionField,
 ): CredentialAttribute => {
   if (claim) {
     return {
@@ -250,12 +250,12 @@ export type ShareCredentialCardLabels = CardLabels & {
 };
 
 export const shareCredentialCardFromCredential = (
-  credential: CredentialDetailBindingDto | undefined,
+  credential: CredentialDetail | undefined,
   expanded: boolean,
   multipleCredentialsAvailable: boolean,
-  request: PresentationDefinitionRequestedCredentialBindingDto,
+  request: PresentationDefinitionRequestedCredential,
   selectedFields: string[] | undefined,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -316,11 +316,11 @@ export const shareCredentialCardFromCredential = (
 
 export const selectCredentialCardAttributeFromClaim = (
   id: string,
-  config: Config,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
   claim?: FlatClaim,
-  field?: PresentationDefinitionFieldBindingDto,
+  field?: PresentationDefinitionField,
 ): CredentialAttribute => {
   const attribute = shareCredentialCardAttributeFromClaim(id, config, testID, labels, claim, field);
   if (!claim) {
@@ -333,10 +333,10 @@ export const selectCredentialCardAttributeFromClaim = (
 };
 
 export const selectCredentialCardFromCredential = (
-  credential: CredentialDetailBindingDto,
+  credential: CredentialDetail,
   selected: boolean,
-  request: PresentationDefinitionRequestedCredentialBindingDto,
-  config: Config,
+  request: PresentationDefinitionRequestedCredential,
+  config: CoreConfig,
   testID: string,
   labels: ShareCredentialCardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {

package/src/utils/parsers/credential.ts

@@ -1,12 +1,12 @@
 import {
-  ClaimBindingDto,
-  Config,
-  CredentialDetailBindingDto,
-  CredentialListItemBindingDto,
-  CredentialSchemaBindingDto,
-  CredentialStateBindingEnum,
-  DataTypeEnum,
-  FormatFeatureEnum,
+  Claim,
+  CoreConfig,
+  CredentialDetail,
+  CredentialListItem,
+  CredentialSchemaListItem,
+  CredentialState,
+  DataType,
+  FormatFeature,
 } from '@procivis/react-native-one-core';
 import { FC } from 'react';
 import { SvgProps } from 'react-native-svg';
@@ -30,27 +30,27 @@ export enum ValidityState {
   Valid = 'valid',
 }
 
-export const getValidityState = (credential: CredentialListItemBindingDto | undefined) => {
-  if (credential?.state === CredentialStateBindingEnum.REVOKED) {
+export const getValidityState = (credential: CredentialListItem | undefined) => {
+  if (credential?.state === CredentialState.REVOKED) {
     return ValidityState.Revoked;
   }
-  if (credential?.state === CredentialStateBindingEnum.SUSPENDED) {
+  if (credential?.state === CredentialState.SUSPENDED) {
     return ValidityState.Suspended;
   }
   return ValidityState.Valid;
 };
 
 export const supportsSelectiveDisclosure = (
-  credential: CredentialListItemBindingDto | undefined,
-  config: Config | undefined,
+  credential: CredentialListItem | undefined,
+  config: CoreConfig | undefined,
 ) => {
   const formatConfig = credential && config?.format[credential.schema.format];
   return formatConfig
-    ? Boolean(formatConfig.capabilities?.features?.includes(FormatFeatureEnum.SelectiveDisclosure))
+    ? Boolean(formatConfig.capabilities?.features?.includes(FormatFeature.SelectiveDisclosure))
     : undefined;
 };
 
-export const findClaimByPath = (path: string | undefined, claims: ClaimBindingDto[]): ClaimBindingDto | undefined => {
+export const findClaimByPath = (path: string | undefined, claims: Claim[]): Claim | undefined => {
   if (!path) {
     return undefined;
   }
@@ -68,12 +68,12 @@ export const findClaimByPath = (path: string | undefined, claims: ClaimBindingDt
   return undefined;
 };
 
-const formatCredentialDetail = (claim: ClaimBindingDto, config: Config, testID: string): string => {
+const formatCredentialDetail = (claim: Claim, config: CoreConfig, testID: string): string => {
   const attributeValue = detailsCardAttributeValueFromClaim(claim, config, testID);
   return attributeValue.value ?? '';
 };
 
-export const hasMsoValidityIssues = (credential: CredentialDetailBindingDto): boolean => {
+export const hasMsoValidityIssues = (credential: CredentialDetail): boolean => {
   const mdocMsoValidityIssue = Boolean(
     credential.mdocMsoValidity?.nextUpdate && new Date(credential.mdocMsoValidity.nextUpdate) < new Date(),
   );
@@ -89,9 +89,9 @@ export type CardHeaderLabels = {
 };
 
 const credentialDetailFromCredential = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[] = [],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[] = [],
+  config: CoreConfig,
   testID: string,
   labels: CardHeaderLabels,
 ): {
@@ -104,7 +104,7 @@ const credentialDetailFromCredential = (
   const { layoutProperties } = credential.schema;
 
   switch (credential.state) {
-    case CredentialStateBindingEnum.SUSPENDED:
+    case CredentialState.SUSPENDED:
       return {
         credentialDetailPrimary: credential.suspendEndDate
           ? labels.suspendedUntil(formatDateTimeLocalized(new Date(credential.suspendEndDate))!)
@@ -112,7 +112,7 @@ const credentialDetailFromCredential = (
         credentialDetailTestID: concatTestID(testID, 'suspended'),
         statusIcon: CredentialWarningIcon,
       };
-    case CredentialStateBindingEnum.REVOKED:
+    case CredentialState.REVOKED:
       return {
         credentialDetailPrimary: labels.revoked,
         credentialDetailErrorColor: true,
@@ -153,9 +153,9 @@ const credentialDetailFromCredential = (
 };
 
 export const cardHeaderFromCredential = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[] = [],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[] = [],
+  config: CoreConfig,
   testID: string,
   labels: CardHeaderLabels,
 ): Omit<CredentialHeaderProps, 'style'> => {
@@ -193,9 +193,9 @@ export type CardLabels = CardHeaderLabels & {
 };
 
 export const getCredentialCardPropsFromCredential = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[] = [],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[] = [],
+  config: CoreConfig,
   notice: CredentialCardNotice | undefined,
   testID: string,
   labels: CardLabels,
@@ -224,8 +224,8 @@ export const getCredentialCardPropsFromCredential = (
 };
 
 export const detailsCardAttributeFromClaim = (
-  claim: ClaimBindingDto,
-  config: Config,
+  claim: Claim,
+  config: CoreConfig,
   testID: string,
 ): CredentialAttribute => {
   const value = detailsCardAttributeValueFromClaim(claim, config, testID);
@@ -238,21 +238,21 @@ export const detailsCardAttributeFromClaim = (
 };
 
 const detailsCardAttributeValueFromClaim = (
-  claim: ClaimBindingDto,
-  config: Config,
+  claim: Claim,
+  config: CoreConfig,
   testID: string,
 ): CredentialAttributeValue => {
   const typeConfig = config?.datatype[claim.schema.datatype];
 
   if (claim.schema.array) {
     return {
-      values: ((claim.value.value as ClaimBindingDto[]) || []).map((arrayValue, index) => {
+      values: ((claim.value.value as Claim[]) || []).map((arrayValue, index) => {
         return detailsCardAttributeFromClaim(arrayValue, config, concatTestID(testID, index.toString()));
       }),
     };
   } else {
     switch (typeConfig?.type) {
-      case DataTypeEnum.Object: {
+      case DataType.Object: {
         if (claim.value.type_ !== 'NESTED') {
           return { attributes: [] };
         }
@@ -262,7 +262,7 @@ const detailsCardAttributeValueFromClaim = (
           ),
         };
       }
-      case DataTypeEnum.Date: {
+      case DataType.Date: {
         if (!claim.value.value) {
           // Don't try to parse empty values (which will return "Invalid Date")
           return { testID: testID, value: String(claim.value.value) };
@@ -273,8 +273,8 @@ const detailsCardAttributeValueFromClaim = (
           value: formatDateLocalized(new Date(date)) ?? date,
         };
       }
-      case DataTypeEnum.Picture: // fallback
-      case DataTypeEnum.SwiyuPicture: {
+      case DataType.Picture: // fallback
+      case DataType.SwiyuPicture: {
         if (typeConfig.params?.showAs === 'IMAGE') {
           return { image: { uri: claim.value.value as string }, testID: testID };
         } else {
@@ -292,8 +292,8 @@ export type CredentialDetailsCardPropsWithoutWidth = Omit<CredentialDetailsCardP
 };
 
 export const detailsCardFromCredential = (
-  credential: CredentialDetailBindingDto,
-  config: Config,
+  credential: CredentialDetail,
+  config: CoreConfig,
   testID: string,
   labels: CardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -301,9 +301,9 @@ export const detailsCardFromCredential = (
 };
 
 export const detailsCardFromCredentialWithClaims = (
-  credential: CredentialDetailBindingDto,
-  claims: ClaimBindingDto[],
-  config: Config,
+  credential: CredentialDetail,
+  claims: Claim[],
+  config: CoreConfig,
   testID: string,
   labels: CardLabels,
 ): CredentialDetailsCardPropsWithoutWidth => {
@@ -402,7 +402,7 @@ function parseBase64Image(image: string | undefined) {
   return image ? '__BASE64IMAGE__' : '';
 }
 
-export function getCredentialSchemaWithoutImages<T extends CredentialSchemaBindingDto>(credentialSchema: T): T {
+export function getCredentialSchemaWithoutImages<T extends CredentialSchemaListItem>(credentialSchema: T): T {
   return {
     ...credentialSchema,
     layoutProperties: {

package/src/utils/parsers/query.ts

@@ -1,11 +1,11 @@
 import {
-  CredentialListQueryBindingDto,
-  CredentialSchemaListQueryBindingDto,
-  DidListQueryBindingDto,
-  HistoryListQueryBindingDto,
-  IdentifierListQueryBindingDto,
-  ListProofSchemasFiltersBindingDto,
-  ProofListQueryBindingDto,
+  CredentialListQuery,
+  CredentialSchemaListQuery,
+  DidListQuery,
+  HistoryListQuery,
+  IdentifierListQuery,
+  ProofListQuery,
+  ProofSchemaListQuery,
 } 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<CredentialListQueryBindingDto> = {}) => {
+export const getQueryKeyFromCredentialListQueryParams = (queryParams: Partial<CredentialListQuery> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -50,10 +50,12 @@ export const getQueryKeyFromCredentialListQueryParams = (queryParams: Partial<Cr
   ]);
 };
 
-export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<HistoryListQueryBindingDto> = {}) => {
+export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<HistoryListQuery> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
+    'sort',
+    'sortDirection',
     'organisationId',
     'entityIds',
     'actions',
@@ -63,6 +65,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<Histo
     'identifierId',
     'credentialId',
     'credentialSchemaId',
+    'proofId',
     'proofSchemaId',
     'search',
     'users',
@@ -70,7 +73,7 @@ export const getQueryKeyFromHistoryListQueryParams = (queryParams: Partial<Histo
 };
 
 export const getQueryKeyFromCredentialSchemaListQueryParams = (
-  queryParams: Partial<CredentialSchemaListQueryBindingDto> = {},
+  queryParams: Partial<CredentialSchemaListQuery> = {},
 ) => {
   return getQueryKey(queryParams, [
     'page',
@@ -91,9 +94,7 @@ export const getQueryKeyFromCredentialSchemaListQueryParams = (
   ]);
 };
 
-export const getQueryKeyFromProofSchemaListQueryParams = (
-  queryParams: Partial<ListProofSchemasFiltersBindingDto> = {},
-) => {
+export const getQueryKeyFromProofSchemaListQueryParams = (queryParams: Partial<ProofSchemaListQuery> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -111,7 +112,7 @@ export const getQueryKeyFromProofSchemaListQueryParams = (
   ]);
 };
 
-export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofListQueryBindingDto> = {}) => {
+export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofListQuery> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -136,7 +137,7 @@ export const getQueryKeyFromProofListQueryParams = (queryParams: Partial<ProofLi
   ]);
 };
 
-export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQueryBindingDto> = {}) => {
+export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQuery> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
@@ -156,11 +157,12 @@ export const getQueryKeyFromDidListQueryParams = (queryParams: Partial<DidListQu
   ]);
 };
 
-export const getQueryKeyFromIdentifierListQueryParams = (queryParams: Partial<IdentifierListQueryBindingDto> = {}) => {
+export const getQueryKeyFromIdentifierListQueryParams = (queryParams: Partial<IdentifierListQuery> = {}) => {
   return getQueryKey(queryParams, [
     'page',
     'pageSize',
     'organisationId',
+    'ids',
     'sort',
     'sortDirection',
     'name',
@@ -172,6 +174,10 @@ export const getQueryKeyFromIdentifierListQueryParams = (queryParams: Partial<Id
     'keyAlgorithms',
     'keyRoles',
     'keyStorages',
+    'certificateRoles',
+    'certificateRolesMatchMode',
+    'trustIssuanceSchemaId',
+    'trustVerificationSchemaId',
     'createdDateAfter',
     'createdDateBefore',
     'lastModifiedAfter',