@digitaldefiance/node-express-suite 2.1.23 → 2.1.25

package/README.md

@@ -1083,7 +1083,12 @@ The following v1.x patterns still work in v2.0:
 
 ## ChangeLog
 
-### Version 2.1.23
+### Version 2.1.25
+
+- Upgrade underlying libraries
+- Improve test coverage
+
+### Version 2.1.24
 
 - Provide mocks/fixtures for use in testing
 - Provide concrete/runnable ApplicationConcrete class

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitaldefiance/node-express-suite",
-  "version": "2.1.23",
+  "version": "2.1.25",
   "description": "Generic express application and routing library with decorator support",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -11,6 +11,7 @@
     "test": "npx nx test digitaldefiance-node-express-suite",
     "test:stream": "npx nx test --outputStyle=stream digitaldefiance-node-express-suite",
     "test:logged": "npx nx test --outputStyle=stream digitaldefiance-node-express-suite 2>&1 | ansifilter -o test.log",
+    "test:coverage": "npx jest --coverage --testPathPattern=digitaldefiance-node-express-suite --coverageReporters=text",
     "lint": "npx nx lint digitaldefiance-node-express-suite",
     "lint:fix": "npx nx lint digitaldefiance-node-express-suite --fix",
     "prettier:check": "prettier --check 'src/**/*.{ts,tsx}' 'tests/**/*.{ts,tsx}'",
@@ -21,10 +22,10 @@
     "publish:public": "npm publish --access public"
   },
   "dependencies": {
-    "@digitaldefiance/ecies-lib": "2.1.16",
-    "@digitaldefiance/i18n-lib": "2.1.16",
-    "@digitaldefiance/node-ecies-lib": "2.1.16",
-    "@digitaldefiance/suite-core-lib": "2.1.22",
+    "@digitaldefiance/ecies-lib": "2.1.25",
+    "@digitaldefiance/i18n-lib": "2.1.25",
+    "@digitaldefiance/node-ecies-lib": "2.1.25",
+    "@digitaldefiance/suite-core-lib": "2.1.25",
     "@subspace/reed-solomon-erasure.wasm": "^0.2.5",
     "argon2": "^0.40.1",
     "cors": "^2.8.5",

package/src/__tests__/fixtures/index.d.ts

@@ -1,3 +1,2 @@
-export * from './mock-backend-member';
 export * from './model-mocks.mock';
 //# sourceMappingURL=index.d.ts.map

package/src/__tests__/fixtures/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/digitaldefiance-node-express-suite/src/__tests__/fixtures/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../packages/digitaldefiance-node-express-suite/src/__tests__/fixtures/index.ts"],"names":[],"mappings":"AAAA,cAAc,oBAAoB,CAAC"}

package/src/__tests__/fixtures/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./mock-backend-member"), exports);
 tslib_1.__exportStar(require("./model-mocks.mock"), exports);
 //# sourceMappingURL=index.js.map

package/src/__tests__/fixtures/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/digitaldefiance-node-express-suite/src/__tests__/fixtures/index.ts"],"names":[],"mappings":";;;AAAA,gEAAsC;AACtC,6DAAmC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../packages/digitaldefiance-node-express-suite/src/__tests__/fixtures/index.ts"],"names":[],"mappings":";;;AAAA,6DAAmC"}

package/src/interfaces/csp-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"csp-config.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/interfaces/csp-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkB,MAAM,kBAAkB,CAAC;AAEjE,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,aAAa,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,GAAI,KAAK,GAAG,KAAG,GAAG,IAAI,UAO7C,CAAA"}
+{"version":3,"file":"csp-config.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/interfaces/csp-config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAkB,MAAM,kBAAkB,CAAC;AAEjE,MAAM,WAAW,UAAU;IACzB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,GAAG,EAAE,aAAa,CAAC;CACpB;AAED,eAAO,MAAM,WAAW,GAAI,KAAK,GAAG,KAAG,GAAG,IAAI,UAQ7C,CAAA"}

package/src/interfaces/csp-config.js

@@ -3,9 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCSPConfig = void 0;
 const csp_definition_1 = require("./csp-definition");
 const isCSPConfig = (obj) => {
-    return (obj &&
+    return (!!obj &&
         typeof obj === 'object' &&
         'corsWhitelist' in obj &&
+        'csp' in obj &&
         (0, csp_definition_1.isSimpleCSPDef)(obj.csp));
 };
 exports.isCSPConfig = isCSPConfig;

package/src/interfaces/csp-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"csp-config.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/interfaces/csp-config.ts"],"names":[],"mappings":";;;AAAA,qDAAiE;AAO1D,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAqB,EAAE;IACzD,OAAO,CACL,GAAG;QACH,OAAO,GAAG,KAAK,QAAQ;QACvB,eAAe,IAAI,GAAG;QACtB,IAAA,+BAAc,EAAC,GAAG,CAAC,GAAG,CAAC,CACxB,CAAC;AACJ,CAAC,CAAA;AAPY,QAAA,WAAW,eAOvB"}
+{"version":3,"file":"csp-config.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/interfaces/csp-config.ts"],"names":[],"mappings":";;;AAAA,qDAAiE;AAO1D,MAAM,WAAW,GAAG,CAAC,GAAQ,EAAqB,EAAE;IACzD,OAAO,CACL,CAAC,CAAC,GAAG;QACL,OAAO,GAAG,KAAK,QAAQ;QACvB,eAAe,IAAI,GAAG;QACtB,KAAK,IAAI,GAAG;QACZ,IAAA,+BAAc,EAAC,GAAG,CAAC,GAAG,CAAC,CACxB,CAAC;AACJ,CAAC,CAAA;AARY,QAAA,WAAW,eAQvB"}

package/src/interfaces/flexible-csp.js

@@ -4,11 +4,11 @@ exports.isFlexibleCSP = void 0;
 const middlewares_1 = require("../middlewares");
 const csp_definition_1 = require("./csp-definition");
 const isFlexibleCSP = (obj) => {
-    return (obj &&
+    return (!!obj &&
         typeof obj === 'object' &&
         'corsWhitelist' in obj &&
         'csp' in obj &&
-        (0, csp_definition_1.isSimpleCSPDef)(obj.csp) || (0, middlewares_1.isHelmetOptions)(obj.csp));
+        ((0, csp_definition_1.isSimpleCSPDef)(obj.csp) || (0, middlewares_1.isHelmetOptions)(obj.csp)));
 };
 exports.isFlexibleCSP = isFlexibleCSP;
 //# sourceMappingURL=flexible-csp.js.map

package/src/interfaces/flexible-csp.js.map

@@ -1 +1 @@
-{"version":3,"file":"flexible-csp.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/interfaces/flexible-csp.ts"],"names":[],"mappings":";;;AACA,gDAAiD;AACjD,qDAAiE;AAO1D,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAuB,EAAE;IAC7D,OAAO,CACL,GAAG;QACH,OAAO,GAAG,KAAK,QAAQ;QACvB,eAAe,IAAI,GAAG;QACtB,KAAK,IAAI,GAAG;QACZ,IAAA,+BAAc,EAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAA,6BAAe,EAAC,GAAG,CAAC,GAAG,CAAC,CACpD,CAAC;AACJ,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB"}
+{"version":3,"file":"flexible-csp.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/interfaces/flexible-csp.ts"],"names":[],"mappings":";;;AACA,gDAAiD;AACjD,qDAAiE;AAO1D,MAAM,aAAa,GAAG,CAAC,GAAQ,EAAuB,EAAE;IAC7D,OAAO,CACL,CAAC,CAAC,GAAG;QACL,OAAO,GAAG,KAAK,QAAQ;QACvB,eAAe,IAAI,GAAG;QACtB,KAAK,IAAI,GAAG;QACZ,CAAC,IAAA,+BAAc,EAAC,GAAG,CAAC,GAAG,CAAC,IAAI,IAAA,6BAAe,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CACtD,CAAC;AACJ,CAAC,CAAA;AARY,QAAA,aAAa,iBAQzB"}

package/src/__tests__/fixtures/mock-backend-member.d.ts

@@ -1,69 +0,0 @@
-import { EmailString, MemberType, SecureBuffer, SecureString } from '@digitaldefiance/ecies-lib';
-import { Wallet } from '@ethereumjs/wallet';
-import { IMemberOperational, SignatureBuffer } from '@digitaldefiance/node-ecies-lib';
-import { Types } from 'mongoose';
-export declare class MockBackendMember implements IMemberOperational<Types.ObjectId> {
-    private _id;
-    private _type;
-    private _name;
-    private _email;
-    private _publicKey;
-    private _creatorId;
-    private _dateCreated;
-    private _dateUpdated;
-    private _privateKey?;
-    private _wallet?;
-    private _hasPrivateKey;
-    constructor(data?: Partial<{
-        id: Types.ObjectId;
-        type: MemberType;
-        name: string;
-        email: EmailString;
-        publicKey: Buffer;
-        privateKey: SecureBuffer;
-        wallet: Wallet;
-        creatorId: Types.ObjectId;
-        dateCreated: Date;
-        dateUpdated: Date;
-        hasPrivateKey: boolean;
-    }>);
-    get id(): Types.ObjectId;
-    get type(): MemberType;
-    get name(): string;
-    get email(): EmailString;
-    get publicKey(): Uint8Array;
-    get creatorId(): Types.ObjectId;
-    get dateCreated(): Date;
-    get dateUpdated(): Date;
-    get privateKey(): SecureBuffer | undefined;
-    get wallet(): Wallet | undefined;
-    get hasPrivateKey(): boolean;
-    unloadPrivateKey(): void;
-    unloadWallet(): void;
-    unloadWalletAndPrivateKey(): void;
-    loadWallet(mnemonic: SecureString): void;
-    loadPrivateKey(privateKey: SecureBuffer): void;
-    sign(data: Buffer): SignatureBuffer;
-    verify(signature: SignatureBuffer, data: Buffer): boolean;
-    encryptData(data: string | Buffer): Uint8Array;
-    decryptData(encryptedData: Buffer): Uint8Array;
-    toJson(): string;
-    dispose(): void;
-    static create(overrides?: Partial<{
-        id: Types.ObjectId;
-        type: MemberType;
-        name: string;
-        email: EmailString;
-        publicKey: Buffer;
-        privateKey: SecureBuffer;
-        wallet: Wallet;
-        creatorId: Types.ObjectId;
-        dateCreated: Date;
-        dateUpdated: Date;
-        hasPrivateKey: boolean;
-    }>): MockBackendMember;
-    static createMultiple(count: number): MockBackendMember[];
-    static createWithPrivateKey(): MockBackendMember;
-    static createWithoutPrivateKey(): MockBackendMember;
-}
-//# sourceMappingURL=mock-backend-member.d.ts.map

package/src/__tests__/fixtures/mock-backend-member.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"mock-backend-member.d.ts","sourceRoot":"","sources":["../../../../../../packages/digitaldefiance-node-express-suite/src/__tests__/fixtures/mock-backend-member.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,UAAU,EACV,YAAY,EACZ,YAAY,EACb,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAI5C,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AACtF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAUjC,qBAAa,iBACX,YAAW,kBAAkB,CAAC,KAAK,CAAC,QAAQ,CAAC;IAE7C,OAAO,CAAC,GAAG,CAAiB;IAC5B,OAAO,CAAC,KAAK,CAAa;IAC1B,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAS;IAC3B,OAAO,CAAC,UAAU,CAAiB;IACnC,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,YAAY,CAAO;IAC3B,OAAO,CAAC,WAAW,CAAC,CAAe;IACnC,OAAO,CAAC,OAAO,CAAC,CAAS;IACzB,OAAO,CAAC,cAAc,CAAU;gBAG9B,IAAI,GAAE,OAAO,CAAC;QACZ,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,UAAU,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,WAAW,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,YAAY,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;QAC1B,WAAW,EAAE,IAAI,CAAC;QAClB,WAAW,EAAE,IAAI,CAAC;QAClB,aAAa,EAAE,OAAO,CAAC;KACxB,CAAM;IAqBT,IAAI,EAAE,IAAI,KAAK,CAAC,QAAQ,CAEvB;IACD,IAAI,IAAI,IAAI,UAAU,CAErB;IACD,IAAI,IAAI,IAAI,MAAM,CAEjB;IACD,IAAI,KAAK,IAAI,WAAW,CAEvB;IACD,IAAI,SAAS,IAAI,UAAU,CAE1B;IACD,IAAI,SAAS,IAAI,KAAK,CAAC,QAAQ,CAE9B;IACD,IAAI,WAAW,IAAI,IAAI,CAEtB;IACD,IAAI,WAAW,IAAI,IAAI,CAEtB;IACD,IAAI,UAAU,IAAI,YAAY,GAAG,SAAS,CAEzC;IACD,IAAI,MAAM,IAAI,MAAM,GAAG,SAAS,CAE/B;IACD,IAAI,aAAa,IAAI,OAAO,CAE3B;IAED,gBAAgB,IAAI,IAAI;IAExB,YAAY,IAAI,IAAI;IAEpB,yBAAyB,IAAI,IAAI;IAEjC,UAAU,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAExC,cAAc,CAAC,UAAU,EAAE,YAAY,GAAG,IAAI;IAE9C,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe;IAOnC,MAAM,CAAC,SAAS,EAAE,eAAe,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO;IAIzD,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU;IAI9C,WAAW,CAAC,aAAa,EAAE,MAAM,GAAG,UAAU;IAI9C,MAAM,IAAI,MAAM;IAahB,OAAO,IAAI,IAAI;IAEf,MAAM,CAAC,MAAM,CACX,SAAS,GAAE,OAAO,CAAC;QACjB,EAAE,EAAE,KAAK,CAAC,QAAQ,CAAC;QACnB,IAAI,EAAE,UAAU,CAAC;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,KAAK,EAAE,WAAW,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,YAAY,CAAC;QACzB,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,KAAK,CAAC,QAAQ,CAAC;QAC1B,WAAW,EAAE,IAAI,CAAC;QAClB,WAAW,EAAE,IAAI,CAAC;QAClB,aAAa,EAAE,OAAO,CAAC;KACxB,CAAM,GACN,iBAAiB;IAIpB,MAAM,CAAC,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,iBAAiB,EAAE;IAIzD,MAAM,CAAC,oBAAoB,IAAI,iBAAiB;IAShD,MAAM,CAAC,uBAAuB,IAAI,iBAAiB;CAMpD"}

package/src/__tests__/fixtures/mock-backend-member.js

@@ -1,127 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MockBackendMember = void 0;
-const ecies_lib_1 = require("@digitaldefiance/ecies-lib");
-const faker_1 = require("@faker-js/faker");
-const mongodb_1 = require("mongodb");
-const createMockWallet = () => ({
-    getPrivateKey: () => Buffer.from(faker_1.faker.string.hexadecimal({ length: 64 }), 'hex'),
-    getPublicKey: () => Buffer.from(faker_1.faker.string.hexadecimal({ length: 128 }), 'hex'),
-    getAddress: () => Buffer.from(faker_1.faker.string.hexadecimal({ length: 40 }), 'hex'),
-    sign: () => Buffer.from(faker_1.faker.string.hexadecimal({ length: 128 }), 'hex'),
-});
-class MockBackendMember {
-    _id;
-    _type;
-    _name;
-    _email;
-    _publicKey;
-    _creatorId;
-    _dateCreated;
-    _dateUpdated;
-    _privateKey;
-    _wallet;
-    _hasPrivateKey;
-    constructor(data = {}) {
-        this._id = data.id || new mongodb_1.ObjectId();
-        this._type = data.type || faker_1.faker.helpers.enumValue(ecies_lib_1.MemberType);
-        this._name = data.name || faker_1.faker.person.fullName();
-        this._email = data.email || new ecies_lib_1.EmailString(faker_1.faker.internet.email());
-        this._publicKey =
-            data.publicKey ||
-                Buffer.from(faker_1.faker.string.hexadecimal({ length: 130 }), 'hex');
-        this._creatorId = data.creatorId || this._id;
-        this._dateCreated = data.dateCreated || faker_1.faker.date.past();
-        this._dateUpdated =
-            data.dateUpdated ||
-                faker_1.faker.date.between({ from: this._dateCreated, to: new Date() });
-        this._privateKey = data.privateKey;
-        this._wallet =
-            data.wallet ||
-                (data.hasPrivateKey !== false ? createMockWallet() : undefined);
-        this._hasPrivateKey = data.hasPrivateKey ?? !!this._privateKey;
-    }
-    get id() {
-        return this._id;
-    }
-    get type() {
-        return this._type;
-    }
-    get name() {
-        return this._name;
-    }
-    get email() {
-        return this._email;
-    }
-    get publicKey() {
-        return this._publicKey;
-    }
-    get creatorId() {
-        return this._creatorId;
-    }
-    get dateCreated() {
-        return this._dateCreated;
-    }
-    get dateUpdated() {
-        return this._dateUpdated;
-    }
-    get privateKey() {
-        return this._privateKey;
-    }
-    get wallet() {
-        return this._wallet;
-    }
-    get hasPrivateKey() {
-        return this._hasPrivateKey;
-    }
-    unloadPrivateKey() { }
-    unloadWallet() { }
-    unloadWalletAndPrivateKey() { }
-    loadWallet(mnemonic) { }
-    loadPrivateKey(privateKey) { }
-    sign(data) {
-        return Buffer.from(faker_1.faker.string.hexadecimal({ length: 128 }), 'hex');
-    }
-    verify(signature, data) {
-        return true;
-    }
-    encryptData(data) {
-        return Buffer.from(faker_1.faker.string.hexadecimal({ length: 256 }), 'hex');
-    }
-    decryptData(encryptedData) {
-        return Buffer.from(faker_1.faker.lorem.paragraph());
-    }
-    toJson() {
-        return JSON.stringify({
-            id: this._id.toString(),
-            type: this._type,
-            name: this._name,
-            email: this._email.toString(),
-            publicKey: this._publicKey.toString('base64'),
-            creatorId: this._creatorId.toString(),
-            dateCreated: this._dateCreated.toISOString(),
-            dateUpdated: this._dateUpdated.toISOString(),
-        });
-    }
-    dispose() { }
-    static create(overrides = {}) {
-        return new MockBackendMember(overrides);
-    }
-    static createMultiple(count) {
-        return Array.from({ length: count }, () => this.create());
-    }
-    static createWithPrivateKey() {
-        return new MockBackendMember({
-            privateKey: new ecies_lib_1.SecureBuffer(Buffer.from(faker_1.faker.string.hexadecimal({ length: 64 }), 'hex')),
-            hasPrivateKey: true,
-        });
-    }
-    static createWithoutPrivateKey() {
-        return new MockBackendMember({
-            privateKey: undefined,
-            hasPrivateKey: false,
-        });
-    }
-}
-exports.MockBackendMember = MockBackendMember;
-//# sourceMappingURL=mock-backend-member.js.map

package/src/__tests__/fixtures/mock-backend-member.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"mock-backend-member.js","sourceRoot":"","sources":["../../../../../../packages/digitaldefiance-node-express-suite/src/__tests__/fixtures/mock-backend-member.ts"],"names":[],"mappings":"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"}