npm - unleash-server - Versions diffs - 7.4.0 → 7.4.2 - Mend

unleash-server 7.4.0 → 7.4.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (718) hide show

package/dist/lib/services/openapi-service.js CHANGED Viewed

@@ -1,8 +1,16 @@
 import openapi from '@wesleytodd/openapi';
 import { createOpenApiSchema, removeJsonSchemaProps, } from '../openapi/index.js';
 import { validateSchema } from '../openapi/validate.js';
+import { calculateStability } from '../openapi/util/api-stability.js';
+const getStabilityLevel = (operation) => {
+    if (!operation || typeof operation !== 'object') {
+        return undefined;
+    }
+    return operation['x-stability-level'];
+};
 export class OpenApiService {
     constructor(config) {
+        this.isDevelopment = process.env.NODE_ENV === 'development';
         this.config = config;
         this.flagResolver = config.flagResolver;
         this.logger = config.getLogger('openapi-service.ts');
@@ -13,12 +21,17 @@ export class OpenApiService {
         });
     }
     validPath(op) {
-        const { beta, enterpriseOnly, ...rest } = op;
+        // extract enterpriseOnly and release to avoid leaking into the OpenAPI spec
+        const { enterpriseOnly, release, ...openapiSpec } = op;
         const { baseUriPath = '' } = this.config.server ?? {};
         const openapiStaticAssets = `${baseUriPath}/openapi-static`;
-        const betaBadge = beta
-            ? `![Beta](${openapiStaticAssets}/Beta.svg) This is a beta endpoint and it may change or be removed in the future.
+        const currentVersion = this.api.document.info.version;
+        const stability = calculateStability(release, currentVersion);
+        const summaryWithStability = stability !== 'stable' && openapiSpec.summary
+            ? `[${stability.toUpperCase()}] ${openapiSpec.summary}`
+            : openapiSpec.summary;
+        const stabilityBadge = stability !== 'stable'
+            ? `**[${stability.toUpperCase()}]** This API is in ${stability} state, which means it may change or be removed in the future.
             `
             : '';
         const enterpriseBadge = enterpriseOnly
@@ -26,7 +39,7 @@ export class OpenApiService {
             `
             : '';
-        const failDeprecated = (op.deprecated ?? false) && process.env.NODE_ENV === 'development';
+        const failDeprecated = (op.deprecated ?? false) && this.isDevelopment;
         if (failDeprecated) {
             return (req, res, _next) => {
                 this.logger.warn(`Deprecated endpoint: ${op.operationId} at ${req.path}`);
@@ -36,14 +49,43 @@ export class OpenApiService {
             };
         }
         return this.api.validPath({
-            ...rest,
-            description: `${enterpriseBadge}${betaBadge}${op.description}`.replaceAll(/\n\s*/g, '\n\n'),
+            ...openapiSpec,
+            summary: summaryWithStability,
+            'x-stability-level': stability,
+            description: `${enterpriseBadge}${stabilityBadge}${op.description}`.replaceAll(/\n\s*/g, '\n\n'),
         });
     }
     useDocs(app) {
+        // Serve a filtered OpenAPI document that hides alpha endpoints from Swagger UI.
+        app.get(`${this.docsPath()}.json`, (req, res, next) => {
+            try {
+                const doc = this.api.generateDocument(this.api.document, req.app._router || req.app.router, this.config.server.baseUriPath);
+                res.json(this.isDevelopment ? doc : this.removeAlphaOperations(doc));
+            }
+            catch (error) {
+                next(error);
+            }
+        });
         app.use(this.api);
         app.use(this.docsPath(), this.api.swaggerui());
     }
+    // Remove operations explicitly marked as alpha to keep them out of the rendered docs.
+    removeAlphaOperations(doc) {
+        if (!doc?.paths) {
+            return doc;
+        }
+        const filteredPaths = {};
+        for (const [path, methods] of Object.entries(doc.paths)) {
+            if (!methods) {
+                continue;
+            }
+            const entries = Object.entries(methods).filter(([, operation]) => getStabilityLevel(operation) !== 'alpha');
+            if (entries.length > 0) {
+                filteredPaths[path] = Object.fromEntries(entries);
+            }
+        }
+        return { ...doc, paths: filteredPaths };
+    }
     docsPath() {
         const { baseUriPath = '' } = this.config.server ?? {};
         return `${baseUriPath}/docs/openapi`;

package/dist/lib/services/openapi-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"openapi-service.js","sourceRoot":"","sources":["../../../src/lib/services/openapi-service.ts"],"names":[],"mappings":"AAAA,OAAO,OAAiC,MAAM,qBAAqB,CAAC;~~AAGpE~~,OAAO,EACH,mBAAmB,EAEnB,qBAAqB,GAExB,MAAM,qBAAqB,CAAC;~~AAG7B~~,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;~~AAGxD~~,MAAM,OAAO,cAAc;~~IASvB~~,YAAY,MAAsB;~~QAC9B~~,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,GAAG,OAAO,CACd,IAAI,CAAC,QAAQ,EAAE,EACf,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,EAClC;YACI,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;SACtC,~~CACJ~~,CAAC;~~IACN~~,CAAC;IAED,SAAS,CAAC,~~EAAgB~~;~~QACtB~~,MAAM,EAAE,~~IAAI~~,EAAE,~~cAAc~~,EAAE,GAAG,~~IAAI~~,EAAE,GAAG,EAAE,CAAC;~~QAC7C~~,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACtD,MAAM,mBAAmB,GAAG,GAAG,WAAW,iBAAiB,CAAC;~~QAC5D~~,MAAM,SAAS,GAAG,IAAI;YAClB,CAAC,CAAC,WAAW,~~mBAAmB;;aAE/B~~;~~YACD~~,CAAC,CAAC,EAAE,CAAC;~~QACT~~,MAAM,eAAe,GAAG,cAAc;YAClC,CAAC,CAAC,yBAAyB,mBAAmB;;aAE7C;YACD,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,cAAc,~~GAChB~~,CAAC,EAAE,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,~~OAAO~~,CAAC,~~GAAG,CAAC,QAAQ,KAAK,~~aAAa,CAAC;~~QAEvE~~,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,wBAAwB,EAAE,CAAC,WAAW,OAAO,GAAG,CAAC,IAAI,EAAE,CAC1D,CAAC;gBACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACxB,OAAO,EAAE,gBAAgB,EAAE,CAAC,WAAW,OAAO,GAAG,CAAC,IAAI,wCAAwC;iBACjG,CAAC,CAAC;YACP,CAAC,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;YACtB,GAAG,~~IAAI~~;~~YACP~~,WAAW,EACP,GAAG,eAAe,GAAG,~~SAAS~~,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,~~CACxD~~,QAAQ,EACR,MAAM,CACT;SACR,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,GAAY;QAChB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,QAAQ;QACJ,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACtD,OAAO,GAAG,WAAW,eAAe,CAAC;IACzC,CAAC;IAED,qBAAqB,CACjB,OAA0B;QAE1B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qBAAqB,CACjB,MAAc,EACd,GAAgB,EAChB,MAAgB,EAChB,IAAO,EACP,UAAwC,EAAE;QAE1C,MAAM,MAAM,GAAG,cAAc,CAAI,MAAM,EAAE,IAAI,CAAC,CAAC;QAE/C,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,wBAAwB,GAAG,CAAC,GAAG,EAAE,WAAW,IAAI,EAAE,GAAG,EACrD,MAAM,CACT,CAAC;YACF,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACxD,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;YAChD,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACJ"}
1	+ {"version":3,"file":"openapi-service.js","sourceRoot":"","sources":["../../../src/lib/services/openapi-service.ts"],"names":[],"mappings":"AAAA,OAAO,OAAiC,MAAM,qBAAqB,CAAC;AAIpE,OAAO,EACH,mBAAmB,EAEnB,qBAAqB,GAExB,MAAM,qBAAqB,CAAC;AAM7B,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kCAAkC,CAAC;AAEtE,MAAM,iBAAiB,GAAG,CAAC,SAAkB,EAAsB,EAAE;IACjE,IAAI,CAAC,SAAS,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC9C,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,OACI,SAGH,CAAC,mBAAmB,CAAC,CAAC;AAC3B,CAAC,CAAC;AAgBF,MAAM,OAAO,cAAc;IAWvB,YAAY,MAAsB;QAJjB,kBAAa,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;QAKpE,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAErD,IAAI,CAAC,GAAG,GAAG,OAAO,CACd,IAAI,CAAC,QAAQ,EAAE,EACf,mBAAmB,CAAC,MAAM,CAAC,MAAM,CAAC,EAClC;YACI,MAAM,EAAE,IAAI;YACZ,UAAU,EAAE,IAAI;YAChB,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW;SACtC,CACiB,CAAC;IAC3B,CAAC;IAED,SAAS,CAAC,EAAqC;QAC3C,4EAA4E;QAC5E,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,WAAW,EAAE,GAAG,EAAE,CAAC;QACvD,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACtD,MAAM,mBAAmB,GAAG,GAAG,WAAW,iBAAiB,CAAC;QAE5D,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC;QACtD,MAAM,SAAS,GAAG,kBAAkB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QAC9D,MAAM,oBAAoB,GACtB,SAAS,KAAK,QAAQ,IAAI,WAAW,CAAC,OAAO;YACzC,CAAC,CAAC,IAAI,SAAS,CAAC,WAAW,EAAE,KAAK,WAAW,CAAC,OAAO,EAAE;YACvD,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC;QAC9B,MAAM,cAAc,GAChB,SAAS,KAAK,QAAQ;YAClB,CAAC,CAAC,MAAM,SAAS,CAAC,WAAW,EAAE,sBAAsB,SAAS;aACjE;YACG,CAAC,CAAC,EAAE,CAAC;QACb,MAAM,eAAe,GAAG,cAAc;YAClC,CAAC,CAAC,yBAAyB,mBAAmB;;aAE7C;YACD,CAAC,CAAC,EAAE,CAAC;QAET,MAAM,cAAc,GAAG,CAAC,EAAE,CAAC,UAAU,IAAI,KAAK,CAAC,IAAI,IAAI,CAAC,aAAa,CAAC;QAEtE,IAAI,cAAc,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,IAAI,CACZ,wBAAwB,EAAE,CAAC,WAAW,OAAO,GAAG,CAAC,IAAI,EAAE,CAC1D,CAAC;gBACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;oBACxB,OAAO,EAAE,gBAAgB,EAAE,CAAC,WAAW,OAAO,GAAG,CAAC,IAAI,wCAAwC;iBACjG,CAAC,CAAC;YACP,CAAC,CAAC;QACN,CAAC;QACD,OAAO,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC;YACtB,GAAG,WAAW;YACd,OAAO,EAAE,oBAAoB;YAC7B,mBAAmB,EAAE,SAAS;YAC9B,WAAW,EACP,GAAG,eAAe,GAAG,cAAc,GAAG,EAAE,CAAC,WAAW,EAAE,CAAC,UAAU,CAC7D,QAAQ,EACR,MAAM,CACT;SACR,CAAC,CAAC;IACP,CAAC;IAED,OAAO,CAAC,GAAY;QAChB,gFAAgF;QAChF,GAAG,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;YAClD,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,CACjC,IAAI,CAAC,GAAG,CAAC,QAAQ,EACjB,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,EACjC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CACjC,CAAC;gBACF,GAAG,CAAC,IAAI,CACJ,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,CAC7D,CAAC;YACN,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,CAAC,CAAC;YAChB,CAAC;QACL,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAClB,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,sFAAsF;IAC9E,qBAAqB,CAAC,GAAoB;QAC9C,IAAI,CAAC,GAAG,EAAE,KAAK,EAAE,CAAC;YACd,OAAO,GAAG,CAAC;QACf,CAAC;QAED,MAAM,aAAa,GAA0B,EAAE,CAAC;QAChD,KAAK,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACtD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACX,SAAS;YACb,CAAC;YAED,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,CAC1C,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,KAAK,OAAO,CAC9D,CAAC;YAEF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACrB,aAAa,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,WAAW,CACpC,OAAO,CACkB,CAAC;YAClC,CAAC;QACL,CAAC;QAED,OAAO,EAAE,GAAG,GAAG,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;IAC5C,CAAC;IAED,QAAQ;QACJ,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC;QACtD,OAAO,GAAG,WAAW,eAAe,CAAC;IACzC,CAAC;IAED,qBAAqB,CACjB,OAA0B;QAE1B,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE;YAC/C,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,qBAAqB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAED,qBAAqB,CACjB,MAAc,EACd,GAAgB,EAChB,MAAgB,EAChB,IAAO,EACP,UAAwC,EAAE;QAE1C,MAAM,MAAM,GAAG,cAAc,CAAI,MAAM,EAAE,IAAI,CAAC,CAAC;QAE/C,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CACb,wBAAwB,GAAG,CAAC,GAAG,EAAE,WAAW,IAAI,EAAE,GAAG,EACrD,MAAM,CACT,CAAC;YACF,IAAI,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,wBAAwB,CAAC,EAAE,CAAC;gBACxD,MAAM,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;YACrD,CAAC;QACL,CAAC;QAED,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,KAAK,CAAC,EAAE,EAAE;YAChD,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC9B,CAAC,CAAC,CAAC;QAEH,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;CACJ"}

package/dist/lib/services/openapi-service.test.d.ts ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ export {};
2	+ //# sourceMappingURL=openapi-service.test.d.ts.map

package/dist/lib/services/openapi-service.test.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"openapi-service.test.d.ts","sourceRoot":"","sources":["../../../src/lib/services/openapi-service.test.ts"],"names":[],"mappings":""}

package/dist/lib/services/openapi-service.test.js ADDED Viewed

@@ -0,0 +1,41 @@
+import { OpenApiService } from './openapi-service.js';
+import { createTestConfig } from '../../test/config/test-config.js';
+const okResponse = { '200': { description: 'ok' } };
+const buildDocument = () => ({
+    openapi: '3.0.0',
+    info: { title: 'Test API', version: '7.4.0' },
+    paths: {
+        '/alpha-only': {
+            get: {
+                responses: okResponse,
+                'x-stability-level': 'alpha',
+            },
+        },
+        '/mixed': {
+            get: {
+                responses: okResponse,
+                'x-stability-level': 'alpha',
+            },
+            post: {
+                responses: okResponse,
+                'x-stability-level': 'beta',
+            },
+        },
+        '/stable': {
+            put: {
+                responses: okResponse,
+            },
+        },
+    },
+});
+test('removeAlphaOperations removes alpha operations and empty paths', () => {
+    const openApiService = new OpenApiService(createTestConfig());
+    const removeAlphaOperations = openApiService.removeAlphaOperations.bind(openApiService);
+    const doc = buildDocument();
+    const filtered = removeAlphaOperations(doc);
+    expect(filtered.paths?.['/alpha-only']).toBeUndefined();
+    expect(filtered.paths?.['/mixed']?.get).toBeUndefined();
+    expect(filtered.paths?.['/mixed']?.post).toBeDefined();
+    expect(filtered.paths?.['/stable']).toBeDefined();
+});
+//# sourceMappingURL=openapi-service.test.js.map

package/dist/lib/services/openapi-service.test.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"openapi-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/openapi-service.test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAC;AAEpE,MAAM,UAAU,GAAG,EAAE,KAAK,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC;AAKpD,MAAM,aAAa,GAAG,GAAuB,EAAE,CAAC,CAAC;IAC7C,OAAO,EAAE,OAAO;IAChB,IAAI,EAAE,EAAE,KAAK,EAAE,UAAU,EAAE,OAAO,EAAE,OAAO,EAAE;IAC7C,KAAK,EAAE;QACH,aAAa,EAAE;YACX,GAAG,EAAE;gBACD,SAAS,EAAE,UAAU;gBACrB,mBAAmB,EAAE,OAAO;aACL;SAC9B;QACD,QAAQ,EAAE;YACN,GAAG,EAAE;gBACD,SAAS,EAAE,UAAU;gBACrB,mBAAmB,EAAE,OAAO;aACL;YAC3B,IAAI,EAAE;gBACF,SAAS,EAAE,UAAU;gBACrB,mBAAmB,EAAE,MAAM;aACJ;SAC9B;QACD,SAAS,EAAE;YACP,GAAG,EAAE;gBACD,SAAS,EAAE,UAAU;aACxB;SACJ;KACJ;CACJ,CAAC,CAAC;AAEH,IAAI,CAAC,gEAAgE,EAAE,GAAG,EAAE;IACxE,MAAM,cAAc,GAAG,IAAI,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC;IAC9D,MAAM,qBAAqB,GACvB,cAKH,CAAC,qBAAqB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAE7C,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;IAC5B,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAE5C,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;IACxD,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;IACxD,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,CAAC,WAAW,EAAE,CAAC;IACvD,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AACtD,CAAC,CAAC,CAAC"}

package/dist/lib/services/user-service.d.ts CHANGED Viewed

@@ -10,6 +10,7 @@ import { RoleName } from '../types/model.js';
 import type SettingService from './setting-service.js';
 import type { TokenUserSchema } from '../openapi/index.js';
 import type EventService from '../features/events/event-service.js';
+import type { ResourceLimitsService } from './index.js';
 export interface ICreateUserWithRole {
     name?: string;
     email?: string;
@@ -39,6 +40,7 @@ export declare class UserService {
     private sessionService;
     private emailService;
     private settingService;
+    private resourceLimitsService;
     private flagResolver;
     private passwordResetTimeouts;
     private baseUriPath;
@@ -51,6 +53,7 @@ export declare class UserService {
         eventService: EventService;
         sessionService: SessionService;
         settingService: SettingService;
+        resourceLimitsService: ResourceLimitsService;
     });
     validatePassword(password: string): boolean;
     initAdminUser({ createAdminUser, initialAdminUser, }: Pick<IAuthOption, 'createAdminUser' | 'initialAdminUser'>): Promise<void>;
@@ -81,7 +84,9 @@ export declare class UserService {
     loginUserWithoutPassword(email: string, autoCreateUser?: boolean): Promise<IUser>;
     loginUserSSO({ email, name, rootRole, autoCreate, }: ILoginUserRequest): Promise<IUser>;
     loginDemoAuthDefaultAdmin(): Promise<IUser>;
-    changePassword(userId: number, password: string): Promise<void>;
+    changePassword(userId: number, password: string, { logoutUser }?: {
+        logoutUser?: boolean;
+    }): Promise<void>;
     changePasswordWithPreviouslyUsedPasswordCheck(userId: number, password: string): Promise<void>;
     changePasswordWithVerification(userId: number, newPassword: string, oldPassword: string): Promise<void>;
     getUserForToken(token: string): Promise<TokenUserSchema>;

package/dist/lib/services/user-service.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"user-service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE/B,OAAa,EACT,KAAK,UAAU,EACf,KAAK,KAAK,EACV,KAAK,iBAAiB,EACzB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,KAAK,iBAAiB,MAAM,0BAA0B,CAAC;AAG9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EACR,WAAW,EACX,cAAc,EACd,iBAAiB,EACpB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AACvD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AASzD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,KAAK,cAAc,MAAM,sBAAsB,CAAC;AAQvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,KAAK,YAAY,MAAM,qCAAqC,CAAC;~~AAYpE~~,MAAM,WAAW,mBAAmB;IAChC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,GAAG,QAAQ,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IACxB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;CAChC;AAED,MAAM,WAAW,iBAAiB;IAC9B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,CAAC;IAC7B,UAAU,CAAC,EAAE,OAAO,CAAC;CACxB;AAKD,qBAAa,WAAW;IACpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,KAAK,CAAa;IAE1B,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,QAAQ,CAAe;IAE/B,OAAO,CAAC,aAAa,CAAgB;IAErC,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,cAAc,CAAiB;IAEvC,OAAO,CAAC,YAAY,CAAgB;IAEpC,OAAO,CAAC,qBAAqB,CAAyC;IAEtE,OAAO,CAAC,WAAW,CAAS;IAE5B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAE5B,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;gBAGjC,MAAM,EAAE,IAAI,CAAC,cAAc,EAAE,WAAW,CAAC,EACzC,EACI,MAAM,EACN,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,OAAO,GACV,EAAE,IAAI,CACH,cAAc,EACd,WAAW,GAAG,QAAQ,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,CACnE,EACD,QAAQ,EAAE;QACN,aAAa,EAAE,aAAa,CAAC;QAC7B,iBAAiB,EAAE,iBAAiB,CAAC;QACrC,YAAY,EAAE,YAAY,CAAC;QAC3B,YAAY,EAAE,YAAY,CAAC;QAC3B,cAAc,EAAE,cAAc,CAAC;QAC/B,cAAc,EAAE,cAAc,CAAC;~~KAClC~~;~~IAiBL~~,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO;IAWrC,aAAa,CAAC,EAChB,eAAe,EACf,gBAAgB,GACnB,EAAE,IAAI,CACH,WAAW,EACX,iBAAiB,GAAG,kBAAkB,CACzC,GAAG,OAAO,CAAC,IAAI,CAAC;IAMX,qBAAqB,CACvB,iBAAiB,CAAC,EAAE,iBAAiB,GACtC,OAAO,CAAC,IAAI,CAAC;IAiCV,MAAM,IAAI,OAAO,CAAC,iBAAiB,EAAE,CAAC;~~IAuBtC~~,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAS/C,MAAM,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,EAAE,CAAC;IAIvC,UAAU,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC;IAI/C,OAAO,CAAC,aAAa;IAaf,UAAU,CACZ,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,mBAAmB,EAClE,SAAS,GAAE,UAA8B,GAC1C,OAAO,CAAC,iBAAiB,CAAC;IA2CvB,iBAAiB,CACnB,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,EAC7C,SAAS,GAAE,UAA8B,GAC1C,OAAO,CAAC,MAAM,CAAC;IAkBZ,gBAAgB,CAClB,IAAI,EAAE,iBAAiB,EACvB,UAAU,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;IA4Bb,UAAU,CACZ,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,WAAW,EAC1C,SAAS,EAAE,UAAU,GACtB,OAAO,CAAC,iBAAiB,CAAC;IAgCvB,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAehE,eAAe,CAAC,SAAS,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,SAAS,CACX,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,MAAM,EAChB,MAAM,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,GAC5C,OAAO,CAAC,KAAK,CAAC;IAoDjB;;;;;;;OAOG;IACG,wBAAwB,CAC1B,KAAK,EAAE,MAAM,EACb,cAAc,GAAE,OAAe,GAChC,OAAO,CAAC,KAAK,CAAC;IAIX,YAAY,CAAC,EACf,KAAK,EACL,IAAI,EACJ,QAAQ,EACR,UAAkB,GACrB,EAAE,iBAAiB,GAAG,OAAO,CAAC,KAAK,CAAC;IAkD/B,yBAAyB,IAAI,OAAO,CAAC,KAAK,CAAC;IAO3C,cAAc,~~CAAC~~,MAAM,EAAE,MAAM,~~EAAE~~,QAAQ,EAAE,MAAM,~~GAAG~~,OAAO,CAAC,IAAI,CAAC;~~IAa/D~~,6CAA6C,CAC/C,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAaV,8BAA8B,CAChC,MAAM,EAAE,MAAM,EACd,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,GACpB,OAAO,CAAC,IAAI,CAAC;IAeV,eAAe,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAoB9D;;;;OAIG;IACG,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7D,wBAAwB,CAC1B,aAAa,EAAE,MAAM,EACrB,IAAI,GAAE,KAGJ,GACH,OAAO,CAAC,GAAG,CAAC;CA2BlB;AAED,eAAe,WAAW,CAAC"}
1	+ {"version":3,"file":"user-service.d.ts","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/user-service.js CHANGED Viewed

@@ -17,6 +17,9 @@ import { SYSTEM_USER, SYSTEM_USER_AUDIT, } from '../types/index.js';
 import { PasswordPreviouslyUsedError } from '../error/password-previously-used.js';
 import { RateLimitError } from '../error/rate-limit-error.js';
 import { USER_LOGIN } from '../metric-events.js';
+owasp.config({
+    allowPassphrases: false,
+});
 const saltRounds = 10;
 const disallowNPreviousPasswords = 5;
 export class UserService {
@@ -31,6 +34,7 @@ export class UserService {
         this.emailService = services.emailService;
         this.sessionService = services.sessionService;
         this.settingService = services.settingService;
+        this.resourceLimitsService = services.resourceLimitsService;
         this.flagResolver = flagResolver;
         this.maxParallelSessions = session.maxParallelSessions;
         this.baseUriPath = server.baseUriPath || '';
@@ -75,23 +79,26 @@ export class UserService {
         }
     }
     async getAll() {
-        const users = await this.store.getAll();
+        const baseUsers = await this.store.getAll();
         const defaultRole = await this.accessService.getPredefinedRole(RoleName.VIEWER);
         const userRoles = await this.accessService.getRootRoleForAllUsers();
-        const usersWithRootRole = users.map((u) => {
+        let users = baseUsers.map((u) => {
             const rootRole = userRoles.find((r) => r.userId === u.id);
             const roleId = rootRole ? rootRole.roleId : defaultRole.id;
             return { ...u, rootRole: roleId };
         });
         if (this.flagResolver.isEnabled('showUserDeviceCount')) {
             const sessionCounts = await this.sessionService.getSessionsCount();
-            const usersWithSessionCounts = usersWithRootRole.map((u) => ({
+            users = users.map((u) => ({
                 ...u,
                 activeSessions: sessionCounts[u.id] || 0,
             }));
-            return usersWithSessionCounts;
         }
-        return usersWithRootRole;
+        const { readOnlyUsers } = await this.resourceLimitsService.getResourceLimits();
+        if (!this.flagResolver.isEnabled('readOnlyUsersUI') || !readOnlyUsers) {
+            users = users.map(({ seatType, ...user }) => user);
+        }
+        return users;
     }
     async getUser(id) {
         const user = await this.store.get(id);
@@ -311,12 +318,14 @@ export class UserService {
         this.eventBus.emit(USER_LOGIN, { loginOrder });
         return user;
     }
-    async changePassword(userId, password) {
+    async changePassword(userId, password, { logoutUser } = { logoutUser: true }) {
         this.validatePassword(password);
         const passwordHash = await bcrypt.hash(password, saltRounds);
         await this.store.setPasswordHash(userId, passwordHash, disallowNPreviousPasswords);
-        await this.sessionService.deleteSessionsForUser(userId);
         await this.resetTokenService.expireExistingTokensForUser(userId);
+        if (logoutUser) {
+            await this.sessionService.deleteSessionsForUser(userId);
+        }
     }
     async changePasswordWithPreviouslyUsedPasswordCheck(userId, password) {
         const previouslyUsed = await this.store.getPasswordsPreviouslyUsed(userId);

package/dist/lib/services/user-service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"user-service.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"user-service.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.ts"],"names":[],"mappings":"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"}

package/dist/lib/services/user-service.test.js CHANGED Viewed

@@ -15,6 +15,7 @@ import FakeSettingStore from '../../test/fixtures/fake-setting-store.js';
 import { extractAuditInfoFromUser } from '../util/index.js';
 import { createFakeEventsService } from '../features/index.js';
 import { vi, expect, test, describe, beforeEach } from 'vitest';
+import { ResourceLimitsService } from './index.js';
 const config = createTestConfig();
 const systemUser = new User({ id: -1, username: 'system' });
 test.each([
@@ -33,6 +34,7 @@ test.each([
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -40,6 +42,7 @@ test.each([
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     const user = await service.createUser({
         username: 'test',
@@ -75,6 +78,7 @@ describe('Default admin initialization', () => {
         const settingService = new SettingService({
             settingStore: new FakeSettingStore(),
         }, config, eventService);
+        const resourceLimitsService = new ResourceLimitsService(config);
         userService = new UserService({ userStore }, config, {
             accessService,
             resetTokenService,
@@ -82,6 +86,7 @@ describe('Default admin initialization', () => {
             eventService,
             sessionService,
             settingService,
+            resourceLimitsService,
         });
     });
     test('Should create default admin user if `createAdminUser` is true and `initialAdminUser` is not set', async () => {
@@ -113,6 +118,7 @@ describe('Default admin initialization', () => {
         const settingService = new SettingService({
             settingStore: new FakeSettingStore(),
         }, config, eventService);
+        const resourceLimitsService = new ResourceLimitsService(config);
         const service = new UserService({ userStore }, config, {
             accessService,
             resetTokenService,
@@ -120,6 +126,7 @@ describe('Default admin initialization', () => {
             eventService,
             sessionService,
             settingService,
+            resourceLimitsService,
         });
         await service.initAdminUser({});
         await expect(service.loginUser('admin', 'unleash4all')).rejects.toThrow('The combination of password and username you provided is invalid');
@@ -135,29 +142,6 @@ describe('Default admin initialization', () => {
         });
     });
 });
-test('Should be a valid password', async () => {
-    const userStore = new UserStoreMock();
-    const accessService = new AccessServiceMock();
-    const resetTokenStore = new FakeResetTokenStore();
-    const resetTokenService = new ResetTokenService({ resetTokenStore }, config);
-    const emailService = new EmailService(config);
-    const sessionStore = new FakeSessionStore();
-    const sessionService = new SessionService({ sessionStore }, config);
-    const eventService = createFakeEventsService(config);
-    const settingService = new SettingService({
-        settingStore: new FakeSettingStore(),
-    }, config, eventService);
-    const service = new UserService({ userStore }, config, {
-        accessService,
-        resetTokenService,
-        emailService,
-        eventService,
-        sessionService,
-        settingService,
-    });
-    const valid = service.validatePassword('this is a strong password!');
-    expect(valid).toBe(true);
-});
 test('Password must be at least 10 chars', async () => {
     const userStore = new UserStoreMock();
     const accessService = new AccessServiceMock();
@@ -170,6 +154,7 @@ test('Password must be at least 10 chars', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -177,6 +162,7 @@ test('Password must be at least 10 chars', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     expect(() => service.validatePassword('admin')).toThrow('The password must be at least 10 characters long.');
     expect(() => service.validatePassword('qwertyabcde')).toThrowError(OwaspValidationError);
@@ -193,6 +179,7 @@ test('The password must contain at least one uppercase letter.', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -200,6 +187,7 @@ test('The password must contain at least one uppercase letter.', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     expect(() => service.validatePassword('qwertyabcde')).toThrowError('The password must contain at least one uppercase letter.');
     expect(() => service.validatePassword('qwertyabcde')).toThrowError(OwaspValidationError);
@@ -216,6 +204,7 @@ test('The password must contain at least one number', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -223,6 +212,7 @@ test('The password must contain at least one number', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     expect(() => service.validatePassword('qwertyabcdE')).toThrowError('The password must contain at least one number.');
     expect(() => service.validatePassword('qwertyabcdE')).toThrowError(OwaspValidationError);
@@ -239,6 +229,7 @@ test('The password must contain at least one special character', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -246,11 +237,12 @@ test('The password must contain at least one special character', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     expect(() => service.validatePassword('qwertyabcdE2')).toThrowError('The password must contain at least one special character.');
     expect(() => service.validatePassword('qwertyabcdE2')).toThrowError(OwaspValidationError);
 });
-test('Should be a valid password with special chars', async () => {
+test('The password should not be considered valid just because it is long', async () => {
     const userStore = new UserStoreMock();
     const accessService = new AccessServiceMock();
     const resetTokenStore = new FakeResetTokenStore();
@@ -262,6 +254,7 @@ test('Should be a valid password with special chars', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -269,9 +262,11 @@ test('Should be a valid password with special chars', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
-    const valid = service.validatePassword('this is a strong password!');
-    expect(valid).toBe(true);
+    const longPassword = 'aiaiaiaiaiaiaiaiaiaia';
+    expect(() => service.validatePassword(longPassword)).toThrowError('The password must contain at least one uppercase letter.');
+    expect(() => service.validatePassword(longPassword)).toThrowError(OwaspValidationError);
 });
 test('Should send password reset email if user exists', async () => {
     const userStore = new UserStoreMock();
@@ -285,6 +280,7 @@ test('Should send password reset email if user exists', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -292,6 +288,7 @@ test('Should send password reset email if user exists', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     const unknownUser = service.createResetPasswordEmail('unknown@example.com');
     expect(unknownUser).rejects.toThrowError('Could not find user');
@@ -323,6 +320,7 @@ test('Should throttle password reset email', async () => {
     const settingService = new SettingService({
         settingStore: new FakeSettingStore(),
     }, config, eventService);
+    const resourceLimitsService = new ResourceLimitsService(config);
     const service = new UserService({ userStore }, config, {
         accessService,
         resetTokenService,
@@ -330,6 +328,7 @@ test('Should throttle password reset email', async () => {
         eventService,
         sessionService,
         settingService,
+        resourceLimitsService,
     });
     await userStore.insert({
         id: 123,

package/dist/lib/services/user-service.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"user-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.test.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"user-service.test.js","sourceRoot":"","sources":["../../../src/lib/services/user-service.test.ts"],"names":[],"mappings":"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"}