Remove object loading by id and key (#269)

* refactor: update sdk

* fix: update test

* refactor: update openapi

* chore: bump runtime

* fix: update test

* chore: PR comments

---------

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>

package.json

@@ -84,7 +84,7 @@
         "@js-soft/docdb-access-mongo": "1.1.9",
         "@js-soft/node-logger": "1.2.0",
         "@js-soft/ts-utils": "^2.3.3",
-        "@nmshd/runtime": "5.5.0",
+        "@nmshd/runtime": "6.0.0",
         "agentkeepalive": "4.5.0",
         "amqplib": "^0.10.4",
         "axios": "^1.7.7",
@@ -113,8 +113,8 @@
         "@js-soft/eslint-config-ts": "1.6.9",
         "@js-soft/license-check": "1.0.9",
         "@nmshd/connector-sdk": "*",
-        "@nmshd/content": "5.5.0",
-        "@nmshd/core-types": "5.5.0",
+        "@nmshd/content": "6.0.0",
+        "@nmshd/core-types": "6.0.0",
         "@types/amqplib": "^0.10.5",
         "@types/compression": "^1.7.5",
         "@types/cors": "^2.8.17",

packages/sdk/package.json

@@ -30,7 +30,7 @@
         "build:schemas:watch": "npx nodemon -e ts -w 'src/types' --exec 'npm run build:schemas'"
     },
     "dependencies": {
-        "@nmshd/content": "5.5.0",
+        "@nmshd/content": "6.0.0",
         "axios": "^1.7.7",
         "form-data": "^4.0.0",
         "qs": "^6.13.0"

packages/sdk/src/endpoints/FilesEndpoint.ts

@@ -9,8 +9,6 @@ import {
     GetOwnFilesRequest,
     GetPeerFilesRequest,
     LoadPeerFileRequest,
-    TokenReference,
-    TruncatedFileReference,
     UploadOwnFileRequest
 } from "../types";
 import { Endpoint } from "./Endpoint";
@@ -38,8 +36,6 @@ export class FilesEndpoint extends Endpoint {
         return await this.get("/api/v2/Files/Own", request);
     }
 
-    public async loadPeerFile(request: TruncatedFileReference): Promise<ConnectorHttpResponse<ConnectorFile>>;
-    public async loadPeerFile(request: TokenReference): Promise<ConnectorHttpResponse<ConnectorFile>>;
     public async loadPeerFile(request: LoadPeerFileRequest): Promise<ConnectorHttpResponse<ConnectorFile>> {
         return await this.post("/api/v2/Files/Peer", request);
     }

packages/sdk/src/endpoints/RelationshipTemplatesEndpoint.ts

@@ -10,9 +10,7 @@ import {
     GetOwnTemplatesRequest as GetOwnRelationshipTemplatesRequest,
     GetPeerRelationshipTemplatesRequest,
     GetRelationshipTemplatesRequest,
-    LoadPeerRelationshipTemplateRequest,
-    RelationshipTemplateReference,
-    TruncatedRelationshipTemplateReference
+    LoadPeerRelationshipTemplateRequest
 } from "../types";
 import { Endpoint } from "./Endpoint";
 
@@ -56,8 +54,6 @@ export class RelationshipTemplatesEndpoint extends Endpoint {
         return await this.get("/api/v2/RelationshipTemplates/Peer", request);
     }
 
-    public async loadPeerRelationshipTemplate(request: TruncatedRelationshipTemplateReference): Promise<ConnectorHttpResponse<ConnectorRelationshipTemplate>>;
-    public async loadPeerRelationshipTemplate(request: RelationshipTemplateReference): Promise<ConnectorHttpResponse<ConnectorRelationshipTemplate>>;
     public async loadPeerRelationshipTemplate(request: LoadPeerRelationshipTemplateRequest): Promise<ConnectorHttpResponse<ConnectorRelationshipTemplate>> {
         return await this.post("/api/v2/RelationshipTemplates/Peer", request);
     }

packages/sdk/src/endpoints/TokensEndpoint.ts

@@ -1,15 +1,5 @@
 import { AxiosInstance } from "axios";
-import {
-    ConnectorHttpResponse,
-    ConnectorToken,
-    ConnectorTokens,
-    CreateOwnTokenRequest,
-    GetOwnTokensRequest,
-    GetPeerTokensRequest,
-    LoadPeerTokenByReferenceRequest,
-    LoadPeerTokenByTruncatedReferenceRequest,
-    LoadPeerTokenRequest
-} from "../types";
+import { ConnectorHttpResponse, ConnectorToken, ConnectorTokens, CreateOwnTokenRequest, GetOwnTokensRequest, GetPeerTokensRequest, LoadPeerTokenRequest } from "../types";
 import { Endpoint } from "./Endpoint";
 
 export class TokensEndpoint extends Endpoint {
@@ -37,8 +27,6 @@ export class TokensEndpoint extends Endpoint {
         return await this.get("/api/v2/Tokens/Peer", request);
     }
 
-    public async loadPeerToken(request: LoadPeerTokenByReferenceRequest): Promise<ConnectorHttpResponse<ConnectorToken>>;
-    public async loadPeerToken(request: LoadPeerTokenByTruncatedReferenceRequest): Promise<ConnectorHttpResponse<ConnectorToken>>;
     public async loadPeerToken(request: LoadPeerTokenRequest): Promise<ConnectorHttpResponse<ConnectorToken>> {
         return await this.post("/api/v2/Tokens/Peer", request);
     }

packages/sdk/src/types/files/ConnectorFile.ts

@@ -10,6 +10,5 @@ export interface ConnectorFile {
     isOwn: boolean;
     title: string;
     description?: string;
-    secretKey: string;
     truncatedReference: string;
 }

packages/sdk/src/types/files/index.ts

@@ -1,11 +1,9 @@
 export * from "./ConnectorFile";
 export * from "./ConnectorFiles";
-export * from "./FileReference";
 export * from "./requests/CreateTokenForFileRequest";
 export * from "./requests/CreateTokenQrCodeForFileRequest";
 export * from "./requests/GetAllFilesRequest";
 export * from "./requests/GetOwnFilesRequest";
 export * from "./requests/GetPeerFilesRequest";
 export * from "./requests/LoadPeerFileRequest";
 export * from "./requests/UploadOwnFileRequest";
-export * from "./TruncatedFileReference";

packages/sdk/src/types/files/requests/LoadPeerFileRequest.ts

@@ -1,4 +1,7 @@
-import { FileReference } from "../FileReference";
-import { TruncatedFileReference } from "../TruncatedFileReference";
-
-export type LoadPeerFileRequest = TruncatedFileReference | FileReference;
+export interface LoadPeerFileRequest {
+    /**
+     * starting with 'VE9L' for a truncated reference to a token containing a FileReference or
+     * starting with 'RklM' for a direct truncated FileReference
+     */
+    reference: string;
+}

packages/sdk/src/types/relationshipTemplates/ConnectorRelationshipTemplate.ts

@@ -9,6 +9,5 @@ export interface ConnectorRelationshipTemplate {
     createdAt: string;
     content: RelationshipTemplateContentJSON | ArbitraryRelationshipTemplateContentJSON;
     expiresAt?: string;
-    secretKey: string;
     truncatedReference: string;
 }

packages/sdk/src/types/relationshipTemplates/index.ts

@@ -1,11 +1,9 @@
 export * from "./ConnectorRelationshipTemplate";
 export * from "./ConnectorRelationshipTemplates";
-export * from "./RelationshipTemplateReference";
 export * from "./requests/CreateOwnRelationshipTemplateRequest";
 export * from "./requests/CreateTokenForOwnRelationshipTemplateRequest";
 export * from "./requests/CreateTokenQrCodeForOwnRelationshipTemplateRequest";
 export * from "./requests/GetOwnRelationshipTemplatesRequest";
 export * from "./requests/GetPeerRelationshipTemplatesRequest";
 export * from "./requests/GetRelationshipTemplatesRequest";
 export * from "./requests/LoadPeerRelationshipTemplateRequest";
-export * from "./TruncatedRelationshipTemplateReference";

packages/sdk/src/types/relationshipTemplates/requests/LoadPeerRelationshipTemplateRequest.ts

@@ -1,4 +1,7 @@
-import { RelationshipTemplateReference } from "../RelationshipTemplateReference";
-import { TruncatedRelationshipTemplateReference } from "../TruncatedRelationshipTemplateReference";
-
-export type LoadPeerRelationshipTemplateRequest = TruncatedRelationshipTemplateReference | RelationshipTemplateReference;
+export interface LoadPeerRelationshipTemplateRequest {
+    /**
+     * starting with 'VE9L' for a truncated reference to a token containing a RelationshipTemplateReference or
+     * starting with 'UkxU' for a direct truncated RelationshipTemplateReference
+     */
+    reference: string;
+}

packages/sdk/src/types/tokens/ConnectorToken.ts

@@ -5,7 +5,6 @@ export interface ConnectorToken {
     content: unknown;
     createdAt: string;
     expiresAt: string;
-    secretKey: string;
     truncatedReference: string;
     isEphemeral: boolean;
 }

packages/sdk/src/types/tokens/index.ts

@@ -4,5 +4,3 @@ export * from "./requests/CreateOwnTokenRequest";
 export * from "./requests/GetOwnTokensRequest";
 export * from "./requests/GetPeerTokensRequest";
 export * from "./requests/LoadPeerTokenRequest";
-export * from "./TokenReference";
-export * from "./TokenReferenceTruncated";

packages/sdk/src/types/tokens/requests/LoadPeerTokenRequest.ts

@@ -1,12 +1,4 @@
-export interface LoadPeerTokenByTruncatedReferenceRequest {
+export interface LoadPeerTokenRequest {
     reference: string;
     ephemeral?: boolean;
 }
-
-export interface LoadPeerTokenByReferenceRequest {
-    id: string;
-    secretKey: string;
-    ephemeral?: boolean;
-}
-
-export type LoadPeerTokenRequest = LoadPeerTokenByReferenceRequest | LoadPeerTokenByTruncatedReferenceRequest;