@nmshd/runtime 2.0.0-beta.3 → 2.0.0-beta.30

package/dist/useCases/transport/tokens/GetToken.d.ts

@@ -1,16 +1,16 @@
 import { Result } from "@js-soft/ts-utils";
 import { TokenController } from "@nmshd/transport";
 import { TokenDTO } from "../../../types";
-import { RuntimeValidator, UseCase } from "../../common";
+import { SchemaRepository, SchemaValidator, TokenIdString, UseCase } from "../../common";
 export interface GetTokenRequest {
-    id: string;
+    id: TokenIdString;
 }
-declare class GetTokenRequestValidator extends RuntimeValidator<GetTokenRequest> {
-    constructor();
+declare class Validator extends SchemaValidator<GetTokenRequest> {
+    constructor(schemaRepository: SchemaRepository);
 }
 export declare class GetTokenUseCase extends UseCase<GetTokenRequest, TokenDTO> {
     private readonly tokenController;
-    constructor(tokenController: TokenController, validator: GetTokenRequestValidator);
+    constructor(tokenController: TokenController, validator: Validator);
     protected executeInternal(request: GetTokenRequest): Promise<Result<TokenDTO>>;
 }
 export {};

package/dist/useCases/transport/tokens/GetToken.js

@@ -18,12 +18,15 @@ const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
 const common_1 = require("../../common");
 const TokenMapper_1 = require("./TokenMapper");
-class GetTokenRequestValidator extends common_1.RuntimeValidator {
-    constructor() {
-        super();
-        this.validateIfString((x) => x.id).fulfills(common_1.IdValidator.required(transport_1.BackboneIds.token));
+let Validator = class Validator extends common_1.SchemaValidator {
+    constructor(schemaRepository) {
+        super(schemaRepository.getSchema("GetTokenRequest"));
     }
-}
+};
+Validator = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
+], Validator);
 let GetTokenUseCase = class GetTokenUseCase extends common_1.UseCase {
     constructor(tokenController, validator) {
         super(validator);
@@ -40,7 +43,7 @@ let GetTokenUseCase = class GetTokenUseCase extends common_1.UseCase {
 GetTokenUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [transport_1.TokenController, GetTokenRequestValidator])
+    __metadata("design:paramtypes", [transport_1.TokenController, Validator])
 ], GetTokenUseCase);
 exports.GetTokenUseCase = GetTokenUseCase;
 //# sourceMappingURL=GetToken.js.map

package/dist/useCases/transport/tokens/GetToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetToken.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/GetToken.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,gDAAwE;AACxE,mDAAwC;AAExC,yCAAqF;AACrF,+CAA4C;AAM5C,MAAM,wBAAyB,SAAQ,yBAAiC;IACpE;QACI,KAAK,EAAE,CAAC;QAER,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,oBAAW,CAAC,QAAQ,CAAC,uBAAW,CAAC,KAAK,CAAC,CAAC,CAAC;IACzF,CAAC;CACJ;AAED,IAAa,eAAe,GAA5B,MAAa,eAAgB,SAAQ,gBAAkC;IACnE,YAA4C,eAAgC,EAAU,SAAmC;QACrH,KAAK,CAAC,SAAS,CAAC,CAAC;QADuB,oBAAe,GAAf,eAAe,CAAiB;IAE5E,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAwB;QACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,iBAAM,CAAC,IAAI,CAAC,sBAAa,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;SACrE;QAED,OAAO,iBAAM,CAAC,EAAE,CAAC,yBAAW,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAbY,eAAe;IACJ,WAAA,uBAAM,CAAA;IAAqD,WAAA,uBAAM,CAAA;qCAAxB,2BAAe,EAAqB,wBAAwB;GADhH,eAAe,CAa3B;AAbY,0CAAe"}
+{"version":3,"file":"GetToken.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/GetToken.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAA2C;AAC3C,gDAA2D;AAC3D,mDAAwC;AAExC,yCAAwG;AACxG,+CAA4C;AAM5C,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,wBAAgC;IACpD,YAA2B,gBAAkC;QACzD,KAAK,CAAC,gBAAgB,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACzD,CAAC;CACJ,CAAA;AAJK,SAAS;IACS,WAAA,uBAAM,CAAA;qCAAmB,yBAAgB;GAD3D,SAAS,CAId;AAEM,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,gBAAkC;IACnE,YAA4C,eAAgC,EAAU,SAAoB;QACtG,KAAK,CAAC,SAAS,CAAC,CAAC;QADuB,oBAAe,GAAf,eAAe,CAAiB;IAE5E,CAAC;IAES,KAAK,CAAC,eAAe,CAAC,OAAwB;QACpD,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,kBAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC3E,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,iBAAM,CAAC,IAAI,CAAC,sBAAa,CAAC,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC;SACrE;QAED,OAAO,iBAAM,CAAC,EAAE,CAAC,yBAAW,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC3D,CAAC;CACJ,CAAA;AAbY,eAAe;IACJ,WAAA,uBAAM,CAAA;IAAqD,WAAA,uBAAM,CAAA;qCAAxB,2BAAe,EAAqB,SAAS;GADjG,eAAe,CAa3B;AAbY,0CAAe"}

package/dist/useCases/transport/tokens/GetTokens.d.ts

@@ -1,7 +1,7 @@
 import { Result } from "@js-soft/ts-utils";
 import { TokenController } from "@nmshd/transport";
 import { TokenDTO } from "../../../types";
-import { OwnerRestriction, RuntimeValidator, UseCase } from "../../common";
+import { OwnerRestriction, SchemaRepository, SchemaValidator, UseCase } from "../../common";
 export interface GetTokensQuery {
     createdAt?: string | string[];
     createdBy?: string | string[];
@@ -12,9 +12,13 @@ export interface GetTokensRequest {
     query?: GetTokensQuery;
     ownerRestriction?: OwnerRestriction;
 }
+declare class Validator extends SchemaValidator<GetTokensRequest> {
+    constructor(schemaRepository: SchemaRepository);
+}
 export declare class GetTokensUseCase extends UseCase<GetTokensRequest, TokenDTO[]> {
     private readonly tokenController;
     private static readonly queryTranslator;
-    constructor(tokenController: TokenController, validator: RuntimeValidator);
+    constructor(tokenController: TokenController, validator: Validator);
     protected executeInternal(request: GetTokensRequest): Promise<Result<TokenDTO[]>>;
 }
+export {};

package/dist/useCases/transport/tokens/GetTokens.js

@@ -20,6 +20,15 @@ const ts_simple_nameof_1 = require("ts-simple-nameof");
 const typescript_ioc_1 = require("typescript-ioc");
 const common_1 = require("../../common");
 const TokenMapper_1 = require("./TokenMapper");
+let Validator = class Validator extends common_1.SchemaValidator {
+    constructor(schemaRepository) {
+        super(schemaRepository.getSchema("GetTokensRequest"));
+    }
+};
+Validator = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
+], Validator);
 let GetTokensUseCase = class GetTokensUseCase extends common_1.UseCase {
     constructor(tokenController, validator) {
         super(validator);
@@ -51,7 +60,7 @@ GetTokensUseCase.queryTranslator = new docdb_querytranslator_1.QueryTranslator({
 GetTokensUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [transport_1.TokenController, common_1.RuntimeValidator])
+    __metadata("design:paramtypes", [transport_1.TokenController, Validator])
 ], GetTokensUseCase);
 exports.GetTokensUseCase = GetTokensUseCase;
 //# sourceMappingURL=GetTokens.js.map

package/dist/useCases/transport/tokens/GetTokens.js.map

@@ -1 +1 @@
-{"version":3,"file":"GetTokens.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/GetTokens.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"GetTokens.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/GetTokens.ts"],"names":[],"mappings":"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"}

package/dist/useCases/transport/tokens/LoadPeerToken.d.ts

@@ -1,22 +1,33 @@
 import { Result } from "@js-soft/ts-utils";
 import { AccountController, TokenController } from "@nmshd/transport";
 import { TokenDTO } from "../../../types";
-import { RuntimeValidator, UseCase } from "../../common";
-export interface LoadPeerTokenRequest {
-    id?: string;
-    secretKey?: string;
-    reference?: string;
+import { SchemaRepository, SchemaValidator, TokenIdString, TokenReferenceString, UseCase, ValidationResult } from "../../common";
+/**
+ * @errorMessage token reference invalid
+ */
+export interface LoadPeerTokenViaReferenceRequest {
+    reference: TokenReferenceString;
     ephemeral: boolean;
 }
-declare class LoadPeerTokenRequestValidator extends RuntimeValidator<LoadPeerTokenRequest> {
-    constructor();
-    private setupRulesForCreateTokenFromReferenceRequest;
-    private setupRulesForCreateTokenFromIdAndKeyRequest;
+export interface LoadPeerTokenViaSecretRequest {
+    id: TokenIdString;
+    /**
+     * @minLength 10
+     */
+    secretKey: string;
+    ephemeral: boolean;
+}
+export declare type LoadPeerTokenRequest = LoadPeerTokenViaReferenceRequest | LoadPeerTokenViaSecretRequest;
+declare class Validator extends SchemaValidator<LoadPeerTokenRequest> {
+    private readonly loadViaSecretSchema;
+    private readonly loadViaReferenceSchema;
+    constructor(schemaRepository: SchemaRepository);
+    validate(input: LoadPeerTokenRequest): ValidationResult;
 }
 export declare class LoadPeerTokenUseCase extends UseCase<LoadPeerTokenRequest, TokenDTO> {
     private readonly tokenController;
     private readonly accountController;
-    constructor(tokenController: TokenController, accountController: AccountController, validator: LoadPeerTokenRequestValidator);
+    constructor(tokenController: TokenController, accountController: AccountController, validator: Validator);
     protected executeInternal(request: LoadPeerTokenRequest): Promise<Result<TokenDTO>>;
 }
 export {};

package/dist/useCases/transport/tokens/LoadPeerToken.js

@@ -19,37 +19,40 @@ const transport_1 = require("@nmshd/transport");
 const typescript_ioc_1 = require("typescript-ioc");
 const common_1 = require("../../common");
 const TokenMapper_1 = require("./TokenMapper");
-class LoadPeerTokenRequestValidator extends common_1.RuntimeValidator {
-    constructor() {
-        super();
-        this.validateIf((x) => x)
-            .fulfills((x) => isCreateTokenFromIdAndKeyRequest(x) || isCreateTokenFromReferenceRequest(x))
-            .withFailureCode(common_1.RuntimeErrors.general.invalidPayload().code)
-            .withFailureMessage(common_1.RuntimeErrors.general.invalidPayload().message);
-        this.setupRulesForCreateTokenFromReferenceRequest();
-        this.setupRulesForCreateTokenFromIdAndKeyRequest();
-        this.validateIfAny((x) => x.ephemeral).isNotNull();
-    }
-    setupRulesForCreateTokenFromReferenceRequest() {
-        this.validateIfString((x) => x.reference)
-            .isNotNull()
-            .when(isCreateTokenFromReferenceRequest);
-    }
-    setupRulesForCreateTokenFromIdAndKeyRequest() {
-        this.validateIfString((x) => x.id)
-            .fulfills(common_1.IdValidator.required(transport_1.BackboneIds.token))
-            .when(isCreateTokenFromIdAndKeyRequest);
-        this.validateIfString((x) => x.secretKey)
-            .isNotNull()
-            .when(isCreateTokenFromIdAndKeyRequest);
-    }
+function isLoadPeerTokenViaSecret(request) {
+    return "id" in request && "secretKey" in request;
 }
-function isCreateTokenFromReferenceRequest(request) {
-    return !!request.reference;
-}
-function isCreateTokenFromIdAndKeyRequest(request) {
-    return !!request.id && !!request.secretKey;
+function isLoadPeerTokenViaReference(request) {
+    return "reference" in request;
 }
+let Validator = class Validator extends common_1.SchemaValidator {
+    constructor(schemaRepository) {
+        super(schemaRepository.getSchema("LoadPeerTokenRequest"));
+        this.loadViaSecretSchema = schemaRepository.getSchema("LoadPeerTokenViaSecretRequest");
+        this.loadViaReferenceSchema = schemaRepository.getSchema("LoadPeerTokenViaReferenceRequest");
+    }
+    validate(input) {
+        if (this.schema.validate(input).isValid)
+            return new common_1.ValidationResult();
+        // any-of in combination with missing properties is a bit weird
+        // when { reference: null | undefined } is passed, it ignores reference
+        // and treats it like a LoadPeerTokenViaSecret.
+        // That's why we validate with the specific schema afterwards
+        if (isLoadPeerTokenViaReference(input)) {
+            return this.convertValidationResult(this.loadViaReferenceSchema.validate(input));
+        }
+        else if (isLoadPeerTokenViaSecret(input)) {
+            return this.convertValidationResult(this.loadViaSecretSchema.validate(input));
+        }
+        const result = new common_1.ValidationResult();
+        result.addFailure(new common_1.ValidationFailure(common_1.RuntimeErrors.general.invalidPayload()));
+        return result;
+    }
+};
+Validator = __decorate([
+    __param(0, typescript_ioc_1.Inject),
+    __metadata("design:paramtypes", [common_1.SchemaRepository])
+], Validator);
 let LoadPeerTokenUseCase = class LoadPeerTokenUseCase extends common_1.UseCase {
     constructor(tokenController, accountController, validator) {
         super(validator);
@@ -58,15 +61,15 @@ let LoadPeerTokenUseCase = class LoadPeerTokenUseCase extends common_1.UseCase {
     }
     async executeInternal(request) {
         let createdToken;
-        if (request.id && request.secretKey) {
+        if (isLoadPeerTokenViaSecret(request)) {
             const key = crypto_1.CryptoSecretKey.fromBase64(request.secretKey);
             createdToken = await this.tokenController.loadPeerToken(transport_1.CoreId.from(request.id), key, request.ephemeral);
         }
-        else if (request.reference) {
+        else if (isLoadPeerTokenViaReference(request)) {
             createdToken = await this.tokenController.loadPeerTokenByTruncated(request.reference, request.ephemeral);
         }
         else {
-            return ts_utils_1.Result.fail(common_1.RuntimeErrors.general.invalidPayload());
+            throw new Error("Invalid request format.");
         }
         if (!request.ephemeral) {
             await this.accountController.syncDatawallet();
@@ -78,9 +81,7 @@ LoadPeerTokenUseCase = __decorate([
     __param(0, typescript_ioc_1.Inject),
     __param(1, typescript_ioc_1.Inject),
     __param(2, typescript_ioc_1.Inject),
-    __metadata("design:paramtypes", [transport_1.TokenController,
-        transport_1.AccountController,
-        LoadPeerTokenRequestValidator])
+    __metadata("design:paramtypes", [transport_1.TokenController, transport_1.AccountController, Validator])
 ], LoadPeerTokenUseCase);
 exports.LoadPeerTokenUseCase = LoadPeerTokenUseCase;
 //# sourceMappingURL=LoadPeerToken.js.map

package/dist/useCases/transport/tokens/LoadPeerToken.js.map

@@ -1 +1 @@
-{"version":3,"file":"LoadPeerToken.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/LoadPeerToken.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"LoadPeerToken.js","sourceRoot":"","sources":["../../../../src/useCases/transport/tokens/LoadPeerToken.ts"],"names":[],"mappings":"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"}