Merge branch 'main' into release/v5

nmshd · Aug 14, 2024 · 3181bbc · 3181bbc
2 parents 5bb627a + e23409a
commit 3181bbc
Show file tree

Hide file tree

Showing 9 changed files with 1,272 additions and 2,404 deletions.
diff --git a/.ci/runChecks.sh b/.ci/runChecks.sh
@@ -11,4 +11,4 @@ npm run lint:prettier
 
 # auditing
 npx license-check --ignoreRegex @nmshd/connector
-npx better-npm-audit audit --exclude 1093639,1096302,1098582
+npx better-npm-audit audit --exclude 1093639,1096302
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -5,6 +5,10 @@ on:
   push:
     branches: [main]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref_name }}
+  cancel-in-progress: true
+
 jobs:
   run-checks:
     runs-on: ubuntu-latest

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
         "@nmshd/runtime": "5.0.0-alpha.9",
         "agentkeepalive": "4.5.0",
         "amqplib": "^0.10.4",
-        "axios": "^1.7.3",
+        "axios": "^1.7.4",
         "compression": "1.7.4",
         "cors": "2.8.5",
         "eventsource": "^2.0.2",
@@ -125,7 +125,7 @@
         "@types/lodash": "^4.17.7",
         "@types/luxon": "^3.4.2",
         "@types/nconf": "^0.10.7",
-        "@types/node": "^22.2.0",
+        "@types/node": "^22.3.0",
         "@types/on-headers": "^1.0.3",
         "@types/swagger-ui-express": "^4.1.6",
         "@types/yamljs": "^0.2.34",

diff --git a/packages/sdk/package.json b/packages/sdk/package.json
@@ -30,7 +30,7 @@
         "build:schemas:watch": "npx nodemon -e ts -w 'src/types' --exec 'npm run build:schemas'"
     },
     "dependencies": {
-        "axios": "^1.7.3",
+        "axios": "^1.7.4",
         "form-data": "^4.0.0",
         "qs": "^6.13.0"
     },

diff --git a/packages/sdk/src/types/attributes/ConnectorAttribute.ts b/packages/sdk/src/types/attributes/ConnectorAttribute.ts
@@ -1,5 +1,6 @@
 export interface ConnectorAttribute {
     id: string;
+    parentId?: string;
     createdAt: string;
     content: ConnectorIdentityAttribute | ConnectorRelationshipAttribute;
     succeeds?: string;
@@ -12,7 +13,9 @@ export enum ConnectorAttributeDeletionStatus {
     ToBeDeleted = "ToBeDeleted",
     ToBeDeletedByPeer = "ToBeDeletedByPeer",
     DeletedByPeer = "DeletedByPeer",
-    DeletedByOwner = "DeletedByOwner"
+    DeletedByOwner = "DeletedByOwner",
+    DeletionRequestSent = "DeletionRequestSent",
+    DeletionRequestRejected = "DeletionRequestRejected"
 }
 
 export interface ConnectorAttributeDeletionInfo {

diff --git a/packages/sdk/src/types/attributes/requests/GetOwnRepositoryAttributesRequest.ts b/packages/sdk/src/types/attributes/requests/GetOwnRepositoryAttributesRequest.ts
@@ -5,7 +5,4 @@ export interface GetOwnRepositoryAttributesRequest {
     "content.validFrom"?: string | string[];
     "content.validTo"?: string | string[];
     "content.value.@type"?: string | string[];
-    deletionInfo?: string | string[];
-    "deletionInfo.deletionStatus"?: string | string[];
-    "deletionInfo.deletionDate"?: string | string[];
 }
diff --git a/packages/sdk/src/types/attributes/requests/GetOwnSharedIdentityAttributesRequest.ts b/packages/sdk/src/types/attributes/requests/GetOwnSharedIdentityAttributesRequest.ts
@@ -14,6 +14,9 @@ export interface GetOwnSharedIdentityAttributesRequest {
     "query.shareInfo.requestReference"?: string | string[];
     "query.shareInfo.notificationReference"?: string | string[];
     "query.shareInfo.sourceAttribute"?: string | string[];
+    "query.deletionInfo"?: string | string[];
+    "query.deletionInfo.deletionStatus"?: string | string[];
+    "query.deletionInfo.deletionDate"?: string | string[];
     hideTechnical?: boolean;
     onlyLatestVersions?: boolean;
 }
diff --git a/packages/sdk/src/types/attributes/requests/GetPeerSharedIdentityAttributesRequest.ts b/packages/sdk/src/types/attributes/requests/GetPeerSharedIdentityAttributesRequest.ts
@@ -13,6 +13,9 @@ export interface GetPeerSharedIdentityAttributesRequest {
     "query.shareInfo"?: string | string[];
     "query.shareInfo.requestReference"?: string | string[];
     "query.shareInfo.notificationReference"?: string | string[];
+    "query.deletionInfo"?: string | string[];
+    "query.deletionInfo.deletionStatus"?: string | string[];
+    "query.deletionInfo.deletionDate"?: string | string[];
     hideTechnical?: boolean;
     onlyLatestVersions?: boolean;
 }