Chore/bump sdk (#35)

* chore: bump sdk * fix: allow accepting a DeleteAttributeRequestItem * chore: version bump * chore: allow 4.x connectors * fix: import
nmshd · Jul 17, 2024 · 4cdcd3e · 4cdcd3e
1 parent 9dd1433
commit 4cdcd3e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 22 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nmshd/connector-tui",
-  "version": "1.2.3",
+  "version": "1.2.4",
   "repository": "github:nmshd/connector-tui",
   "license": "MIT",
   "author": "j&s-soft GmbH",
@@ -28,7 +28,7 @@
     "watch": "node --watch --loader ts-node/esm src/index.ts"
   },
   "dependencies": {
-    "@nmshd/connector-sdk": "^4.5.0",
+    "@nmshd/connector-sdk": "^4.6.1",
     "chalk": "^5.3.0",
     "dotenv": "^16.4.5",
     "luxon": "^3.4.4",
@@ -40,12 +40,12 @@
     "@js-soft/eslint-config-ts": "^1.6.9",
     "@js-soft/license-check": "^1.0.9",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^20.14.10",
+    "@types/node": "^20.14.11",
     "@types/prompts": "^2.4.9",
     "@types/qrcode-terminal": "^0.12.2",
     "@types/yargs": "^17.0.32",
     "eslint": "^8.57.0",
-    "prettier": "^3.3.2",
+    "prettier": "^3.3.3",
     "ts-node": "^10.9.2",
     "typescript": "^5.5.3"
   },

diff --git a/src/ConnectorTUI.ts b/src/ConnectorTUI.ts
@@ -44,7 +44,7 @@ export class ConnectorTUI extends ConnectorTUIBaseWithMixins {
     // allow connector in debugging mode to be used
     if (connectorVersionInfo.version === "{{version}}") return connectorVersionInfo
 
-    if (!connectorVersionInfo.version.startsWith("3.")) {
+    if (!(connectorVersionInfo.version.startsWith("3.") || connectorVersionInfo.version.startsWith("4."))) {
       console.log(`This TUI is made for Enmeshed V2 connectors (starting with version 3.0.0 of the connector). Current version: ${connectorVersionInfo.version}`)
 
       return

diff --git a/src/mixins/AddAcceptPendingRequests.ts b/src/mixins/AddAcceptPendingRequests.ts
@@ -1,4 +1,5 @@
 import { ConnectorRequestStatus, DecideRequestItem, DecideRequestItemGroup } from "@nmshd/connector-sdk"
+import { DateTime } from "luxon"
 import prompts from "prompts"
 import { ConnectorTUIBaseConstructor } from "../ConnectorTUIBase.js"
 
@@ -36,22 +37,34 @@ export function AddAcceptPendingRequests<TBase extends ConnectorTUIBaseConstruct
             for (const _itemOfGroup of item.items) {
               if (_itemOfGroup["@type"] === "FreeTextRequestItem") {
                 acceptItems.push({ accept: true, freeText: "freeText" } as DecideRequestItem)
+              } else if (_itemOfGroup["@type"] === "DeleteAttributeRequestItem") {
+                acceptItems.push({ accept: true, deletionDate: DateTime.utc().plus({ seconds: 5 }).toISO() } as DecideRequestItem)
               } else {
                 acceptItems.push({ accept: true })
               }
             }
             items.push({ items: acceptItems })
           } else if (item["@type"] === "FreeTextRequestItem") {
             items.push({ accept: true, freeText: "freeText" } as DecideRequestItem)
+          } else if (item["@type"] === "DeleteAttributeRequestItem") {
+            items.push({ accept: true, deletionDate: DateTime.utc().plus({ seconds: 5 }).toISO() } as DecideRequestItem)
           } else {
             items.push({ accept: true })
           }
         }
+
         const canAcceptResult = await this.connectorClient.incomingRequests.canAccept(request.id, { items: items })
         if (canAcceptResult.isError) {
           console.log(canAcceptResult.error)
           return
         }
+
+        if (!canAcceptResult.result.isSuccess) {
+          console.log("Cannot accept request")
+          console.log(canAcceptResult.result)
+          return
+        }
+
         const acceptResult = await this.connectorClient.incomingRequests.accept(request.id, { items: items })
         if (acceptResult.isError) {
           console.log(acceptResult.error)

diff --git a/src/mixins/AddSendRequestByMessage.ts b/src/mixins/AddSendRequestByMessage.ts
@@ -1,9 +1,9 @@
 import {
   AuthenticationRequestItem,
   ConnectorRequestContentItemGroup,
+  ConnectorRequestItemDerivation,
   ConsentRequestItem,
   CreateAttributeRequestItem,
-  CreateOutgoingRequestRequestContentItemDerivations,
   ProposeAttributeRequestItem,
   ReadAttributeRequestItem,
   RegisterAttributeListenerRequestItem,
@@ -24,7 +24,7 @@ export function AddSendRequestByMessage<TBase extends ConnectorTUIBaseConstructo
 
       const peer = recipient.peer
 
-      const requestItems: (CreateOutgoingRequestRequestContentItemDerivations | ConnectorRequestContentItemGroup)[] = []
+      const requestItems: (ConnectorRequestItemDerivation | ConnectorRequestContentItemGroup)[] = []
 
       // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition,no-constant-condition
       while (true) {