Merge branch 'main' into feature/enhance-references

nmshd · Sep 24, 2024 · 55ee0bb · 55ee0bb
2 parents 2b79db8 + e66bd24
commit 55ee0bb
Show file tree

Hide file tree

Showing 26 changed files with 64 additions and 665 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,13 +30,13 @@
         "@js-soft/eslint-config-ts": "^1.6.9",
         "@js-soft/license-check": "^1.0.9",
         "@types/jest": "^29.5.13",
-        "@types/node": "^22.5.5",
+        "@types/node": "^22.6.0",
         "enhanced-publish": "^1.1.3",
         "eslint": "^8.57.1",
         "jest": "^29.7.0",
         "jest-expect-message": "^1.1.3",
         "madge": "^8.0.0",
-        "npm-check-updates": "^17.1.1",
+        "npm-check-updates": "^17.1.3",
         "prettier": "^3.3.3",
         "ts-jest": "^29.2.5",
         "ts-node": "^10.9.2",

diff --git a/packages/app-runtime/package.json b/packages/app-runtime/package.json
@@ -57,7 +57,7 @@
     },
     "devDependencies": {
         "@js-soft/web-logger": "^1.0.4",
-        "@types/lodash": "^4.17.7",
+        "@types/lodash": "^4.17.9",
         "@types/lokijs": "^1.5.14",
         "@types/luxon": "^3.4.2"
     },

diff --git a/packages/app-runtime/src/AppStringProcessor.ts b/packages/app-runtime/src/AppStringProcessor.ts
@@ -63,9 +63,7 @@ export class AppStringProcessor {
             return UserfriendlyResult.fail(error);
         }
 
-        const tokenResult = await this.runtime.anonymousServices.tokens.loadPeerTokenByTruncatedReference({
-            reference: truncatedReference
-        });
+        const tokenResult = await this.runtime.anonymousServices.tokens.loadPeerToken({ reference: truncatedReference });
         if (tokenResult.isError) {
             return UserfriendlyResult.fail(UserfriendlyApplicationError.fromError(tokenResult.error));
         }

diff --git a/packages/consumption/package.json b/packages/consumption/package.json
@@ -74,7 +74,7 @@
         "@js-soft/docdb-access-mongo": "1.1.9",
         "@js-soft/node-logger": "1.2.0",
         "@nmshd/crypto": "2.0.6",
-        "@types/lodash": "^4.17.7"
+        "@types/lodash": "^4.17.9"
     },
     "publishConfig": {
         "access": "public",

diff --git a/packages/runtime/package.json b/packages/runtime/package.json
@@ -86,7 +86,7 @@
         "@js-soft/docdb-access-mongo": "1.1.9",
         "@js-soft/node-logger": "1.2.0",
         "@types/json-stringify-safe": "^5.0.3",
-        "@types/lodash": "^4.17.7",
+        "@types/lodash": "^4.17.9",
         "@types/luxon": "^3.4.2",
         "@types/qrcode": "^1.5.5",
         "ts-json-schema-generator": "2.3.0"

diff --git a/packages/runtime/src/dataViews/transport/FileDVO.ts b/packages/runtime/src/dataViews/transport/FileDVO.ts
@@ -12,6 +12,5 @@ export interface FileDVO extends DataViewObject {
     mimetype: string;
     isOwn: boolean;
     title: string;
-    secretKey: string;
     truncatedReference: string;
 }
diff --git a/packages/runtime/src/extensibility/facades/anonymous/AnonymousTokensFacade.ts b/packages/runtime/src/extensibility/facades/anonymous/AnonymousTokensFacade.ts
@@ -1,24 +1,12 @@
 import { ApplicationError, Result } from "@js-soft/ts-utils";
 import { Inject } from "typescript-ioc";
 import { TokenDTO } from "../../../types";
-import {
-    LoadPeerTokenAnonymousByIdAndKeyRequest,
-    LoadPeerTokenAnonymousByIdAndKeyUseCase,
-    LoadPeerTokenAnonymousByTruncatedReferenceRequest,
-    LoadPeerTokenAnonymousByTruncatedReferenceUseCase
-} from "../../../useCases";
+import { LoadPeerTokenAnonymousRequest, LoadPeerTokenAnonymousUseCase } from "../../../useCases";
 
 export class AnonymousTokensFacade {
-    public constructor(
-        @Inject private readonly loadPeerTokenByTruncatedReferenceUseCase: LoadPeerTokenAnonymousByTruncatedReferenceUseCase,
-        @Inject private readonly loadPeerTokenByIdAndKeyUseCase: LoadPeerTokenAnonymousByIdAndKeyUseCase
-    ) {}
+    public constructor(@Inject private readonly loadPeerTokenUseCase: LoadPeerTokenAnonymousUseCase) {}
 
-    public async loadPeerTokenByTruncatedReference(request: LoadPeerTokenAnonymousByTruncatedReferenceRequest): Promise<Result<TokenDTO, ApplicationError>> {
-        return await this.loadPeerTokenByTruncatedReferenceUseCase.execute(request);
-    }
-
-    public async loadPeerTokenByIdAndKey(request: LoadPeerTokenAnonymousByIdAndKeyRequest): Promise<Result<TokenDTO, ApplicationError>> {
-        return await this.loadPeerTokenByIdAndKeyUseCase.execute(request);
+    public async loadPeerToken(request: LoadPeerTokenAnonymousRequest): Promise<Result<TokenDTO, ApplicationError>> {
+        return await this.loadPeerTokenUseCase.execute(request);
     }
 }
diff --git a/packages/runtime/src/types/transport/FileDTO.ts b/packages/runtime/src/types/transport/FileDTO.ts
@@ -9,7 +9,6 @@ export interface FileDTO {
     mimetype: string;
     isOwn: boolean;
     title: string;
-    secretKey: string;
     description?: string;
     truncatedReference: string;
 }
diff --git a/packages/runtime/src/types/transport/RelationshipTemplateDTO.ts b/packages/runtime/src/types/transport/RelationshipTemplateDTO.ts
@@ -11,6 +11,5 @@ export interface RelationshipTemplateDTO {
     content: RelationshipTemplateContentDerivation;
     expiresAt?: string;
     maxNumberOfAllocations?: number;
-    secretKey: string;
     truncatedReference: string;
 }
diff --git a/packages/runtime/src/types/transport/TokenDTO.ts b/packages/runtime/src/types/transport/TokenDTO.ts
@@ -5,7 +5,6 @@ export interface TokenDTO {
     content: any;
     createdAt: string;
     expiresAt: string;
-    secretKey: string;
     truncatedReference: string;
     isEphemeral: boolean;
 }
diff --git a/...PeerTokenAnonymousByTruncatedReference.ts → ...nonymous/tokens/LoadPeerTokenAnonymous.ts b/...PeerTokenAnonymousByTruncatedReference.ts → ...nonymous/tokens/LoadPeerTokenAnonymous.ts
@@ -5,25 +5,25 @@ import { TokenDTO } from "../../../types";
 import { SchemaRepository, SchemaValidator, TokenReferenceString, UseCase } from "../../common";
 import { TokenMapper } from "../../transport/tokens/TokenMapper";
 
-export interface LoadPeerTokenAnonymousByTruncatedReferenceRequest {
+export interface LoadPeerTokenAnonymousRequest {
     reference: TokenReferenceString;
 }
 
-class Validator extends SchemaValidator<LoadPeerTokenAnonymousByTruncatedReferenceRequest> {
+class Validator extends SchemaValidator<LoadPeerTokenAnonymousRequest> {
     public constructor(@Inject schemaRepository: SchemaRepository) {
-        super(schemaRepository.getSchema("LoadPeerTokenAnonymousByTruncatedReferenceRequest"));
+        super(schemaRepository.getSchema("LoadPeerTokenAnonymousRequest"));
     }
 }
 
-export class LoadPeerTokenAnonymousByTruncatedReferenceUseCase extends UseCase<LoadPeerTokenAnonymousByTruncatedReferenceRequest, TokenDTO> {
+export class LoadPeerTokenAnonymousUseCase extends UseCase<LoadPeerTokenAnonymousRequest, TokenDTO> {
     public constructor(
         @Inject private readonly anonymousTokenController: AnonymousTokenController,
         @Inject validator: Validator
     ) {
         super(validator);
     }
 
-    protected async executeInternal(request: LoadPeerTokenAnonymousByTruncatedReferenceRequest): Promise<Result<TokenDTO>> {
+    protected async executeInternal(request: LoadPeerTokenAnonymousRequest): Promise<Result<TokenDTO>> {
         const createdToken = await this.anonymousTokenController.loadPeerTokenByTruncated(request.reference);
         return Result.ok(TokenMapper.toTokenDTO(createdToken, true));
     }

diff --git a/packages/runtime/src/useCases/anonymous/tokens/LoadPeerTokenAnonymousByIdAndKey.ts b/packages/runtime/src/useCases/anonymous/tokens/LoadPeerTokenAnonymousByIdAndKey.ts
diff --git a/packages/runtime/src/useCases/anonymous/tokens/index.ts b/packages/runtime/src/useCases/anonymous/tokens/index.ts
@@ -1,2 +1 @@
-export * from "./LoadPeerTokenAnonymousByIdAndKey";
-export * from "./LoadPeerTokenAnonymousByTruncatedReference";
+export * from "./LoadPeerTokenAnonymous";