diff --git a/.dev/compose.backbone.env b/.dev/compose.backbone.env index 625afee7f..a8fbb3dd1 100644 --- a/.dev/compose.backbone.env +++ b/.dev/compose.backbone.env @@ -1 +1 @@ -BACKBONE_VERSION=5.4.0 +BACKBONE_VERSION=5.5.0 diff --git a/package-lock.json b/package-lock.json index 8979918a9..e93cc3df5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12332,7 +12332,7 @@ }, "packages/runtime": { "name": "@nmshd/runtime", - "version": "4.9.2", + "version": "4.10.0", "license": "MIT", "dependencies": { "@js-soft/docdb-querytranslator": "^1.1.4", @@ -12342,7 +12342,7 @@ "@nmshd/consumption": "3.11.0", "@nmshd/content": "2.10.0", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.7.1", + "@nmshd/transport": "2.7.2", "ajv": "^8.13.0", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", @@ -12392,7 +12392,7 @@ }, "packages/transport": { "name": "@nmshd/transport", - "version": "2.7.1", + "version": "2.7.2", "license": "MIT", "dependencies": { "@js-soft/docdb-access-abstractions": "1.0.4", diff --git a/packages/runtime/package.json b/packages/runtime/package.json index 965ac7e13..57bb8ebab 100644 --- a/packages/runtime/package.json +++ b/packages/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/runtime", - "version": "4.9.2", + "version": "4.10.0", "description": "The enmeshed client runtime.", "homepage": "https://enmeshed.eu", "repository": { @@ -59,7 +59,7 @@ "@nmshd/consumption": "3.11.0", "@nmshd/content": "2.10.0", "@nmshd/crypto": "2.0.6", - "@nmshd/transport": "2.7.1", + "@nmshd/transport": "2.7.2", "ajv": "^8.13.0", "ajv-errors": "^3.0.0", "ajv-formats": "^3.0.1", diff --git a/packages/runtime/src/types/transport/IdentityDeletionProcessDTO.ts b/packages/runtime/src/types/transport/IdentityDeletionProcessDTO.ts index 5ffa9c27a..2a076738c 100644 --- a/packages/runtime/src/types/transport/IdentityDeletionProcessDTO.ts +++ b/packages/runtime/src/types/transport/IdentityDeletionProcessDTO.ts @@ -5,11 +5,12 @@ export interface IdentityDeletionProcessDTO { status: IdentityDeletionProcessStatus; createdAt?: string; createdByDevice?: string; + approvalPeriodEndsAt?: string; + rejectedAt?: string; + rejectedByDevice?: string; approvedAt?: string; approvedByDevice?: string; gracePeriodEndsAt?: string; cancelledAt?: string; cancelledByDevice?: string; - rejectedAt?: string; - rejectedByDevice?: string; } diff --git a/packages/runtime/src/useCases/transport/identityDeletionProcesses/IdentityDeletionProcessMapper.ts b/packages/runtime/src/useCases/transport/identityDeletionProcesses/IdentityDeletionProcessMapper.ts index 123b4bce3..a0768f07d 100644 --- a/packages/runtime/src/useCases/transport/identityDeletionProcesses/IdentityDeletionProcessMapper.ts +++ b/packages/runtime/src/useCases/transport/identityDeletionProcesses/IdentityDeletionProcessMapper.ts @@ -12,14 +12,15 @@ export class IdentityDeletionProcessMapper { id: identityDeletionProcess.id.toString(), createdAt: identityDeletionProcess.cache.createdAt?.toString(), createdByDevice: identityDeletionProcess.cache.createdByDevice?.toString(), + approvalPeriodEndsAt: identityDeletionProcess.cache.approvalPeriodEndsAt?.toString(), + rejectedAt: identityDeletionProcess.cache.rejectedAt?.toString(), + rejectedByDevice: identityDeletionProcess.cache.rejectedByDevice?.toString(), approvedAt: identityDeletionProcess.cache.approvedAt?.toString(), approvedByDevice: identityDeletionProcess.cache.approvedByDevice?.toString(), gracePeriodEndsAt: identityDeletionProcess.cache.gracePeriodEndsAt?.toString(), status: identityDeletionProcess.cache.status, cancelledAt: identityDeletionProcess.cache.cancelledAt?.toString(), - cancelledByDevice: identityDeletionProcess.cache.cancelledByDevice?.toString(), - rejectedAt: identityDeletionProcess.cache.rejectedAt?.toString(), - rejectedByDevice: identityDeletionProcess.cache.rejectedByDevice?.toString() + cancelledByDevice: identityDeletionProcess.cache.cancelledByDevice?.toString() }; } diff --git a/packages/transport/package.json b/packages/transport/package.json index 456f90694..6f85e3807 100644 --- a/packages/transport/package.json +++ b/packages/transport/package.json @@ -1,6 +1,6 @@ { "name": "@nmshd/transport", - "version": "2.7.1", + "version": "2.7.2", "description": "The transport library handles backbone communication and content encryption.", "homepage": "https://enmeshed.eu", "repository": { diff --git a/packages/transport/src/modules/accounts/backbone/BackboneIdentityDeletionProcess.ts b/packages/transport/src/modules/accounts/backbone/BackboneIdentityDeletionProcess.ts index bad99e705..092b703bf 100644 --- a/packages/transport/src/modules/accounts/backbone/BackboneIdentityDeletionProcess.ts +++ b/packages/transport/src/modules/accounts/backbone/BackboneIdentityDeletionProcess.ts @@ -5,6 +5,7 @@ export interface BackboneIdentityDeletionProcess { status: IdentityDeletionProcessStatus; createdAt?: string; createdByDevice?: string; + approvalPeriodEndsAt?: string; rejectedAt?: string; rejectedByDevice?: string; approvedAt?: string; diff --git a/packages/transport/src/modules/accounts/data/CachedIdentityDeletionProcess.ts b/packages/transport/src/modules/accounts/data/CachedIdentityDeletionProcess.ts index dba78623a..fed3700bc 100644 --- a/packages/transport/src/modules/accounts/data/CachedIdentityDeletionProcess.ts +++ b/packages/transport/src/modules/accounts/data/CachedIdentityDeletionProcess.ts @@ -6,6 +6,7 @@ export interface CachedIdentityDeletionProcessJSON { status: IdentityDeletionProcessStatus; createdAt?: string; createdByDevice?: string; + approvalPeriodEndsAt?: string; rejectedAt?: string; rejectedByDevice?: string; approvedAt?: string; @@ -19,6 +20,7 @@ export interface ICachedIdentityDeletionProcess { status: IdentityDeletionProcessStatus; createdAt?: CoreDate; createdByDevice?: CoreId; + approvalPeriodEndsAt?: CoreDate; rejectedAt?: CoreDate; rejectedByDevice?: CoreId; approvedAt?: CoreDate; @@ -44,31 +46,35 @@ export class CachedIdentityDeletionProcess extends CoreSerializable implements I @validate({ nullable: true }) @serialize() - public approvedAt?: CoreDate; + public approvalPeriodEndsAt?: CoreDate; @validate({ nullable: true }) @serialize() - public approvedByDevice?: CoreId; + public rejectedAt?: CoreDate; @validate({ nullable: true }) @serialize() - public gracePeriodEndsAt?: CoreDate; + public rejectedByDevice?: CoreId; @validate({ nullable: true }) @serialize() - public cancelledAt?: CoreDate; + public approvedAt?: CoreDate; @validate({ nullable: true }) @serialize() - public cancelledByDevice?: CoreId; + public approvedByDevice?: CoreId; @validate({ nullable: true }) @serialize() - public rejectedAt?: CoreDate; + public gracePeriodEndsAt?: CoreDate; @validate({ nullable: true }) @serialize() - public rejectedByDevice?: CoreId; + public cancelledAt?: CoreDate; + + @validate({ nullable: true }) + @serialize() + public cancelledByDevice?: CoreId; public static from(value: ICachedIdentityDeletionProcess | CachedIdentityDeletionProcessJSON): CachedIdentityDeletionProcess { return this.fromAny(value); diff --git a/packages/transport/src/modules/accounts/data/IdentityDeletionProcessStatus.ts b/packages/transport/src/modules/accounts/data/IdentityDeletionProcessStatus.ts index 3b5d68ed1..90f508cf4 100644 --- a/packages/transport/src/modules/accounts/data/IdentityDeletionProcessStatus.ts +++ b/packages/transport/src/modules/accounts/data/IdentityDeletionProcessStatus.ts @@ -2,6 +2,5 @@ export enum IdentityDeletionProcessStatus { WaitingForApproval = "WaitingForApproval", Rejected = "Rejected", Approved = "Approved", - Deleting = "Deleting", Cancelled = "Cancelled" }