unleash-server 4.17.0-beta.4 → 4.17.0-beta.5

package/dist/lib/middleware/conditional-middleware.js

@@ -6,13 +6,12 @@ const conditionalMiddleware = (condition, middleware) => {
     const router = (0, express_1.Router)();
     router.use((req, res, next) => {
         if (condition()) {
-            next();
+            middleware(req, res, next);
         }
         else {
-            res.status(404).send({ message: 'Not found' });
+            next();
         }
     });
-    router.use(middleware);
     return router;
 };
 exports.conditionalMiddleware = conditionalMiddleware;

package/dist/lib/middleware/conditional-middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"conditional-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/conditional-middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAE1C,MAAM,qBAAqB,GAAG,CACjC,SAAwB,EACxB,UAA0B,EACZ,EAAE;IAChB,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;IAExB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,IAAI,SAAS,EAAE,EAAE;YACb,IAAI,EAAE,CAAC;SACV;aAAM;YACH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;SAClD;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IACvB,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAhBW,QAAA,qBAAqB,yBAgBhC"}
+{"version":3,"file":"conditional-middleware.js","sourceRoot":"","sources":["../../../src/lib/middleware/conditional-middleware.ts"],"names":[],"mappings":";;;AAAA,qCAAiD;AAE1C,MAAM,qBAAqB,GAAG,CACjC,SAAwB,EACxB,UAA0B,EACZ,EAAE;IAChB,MAAM,MAAM,GAAG,IAAA,gBAAM,GAAE,CAAC;IAExB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QAC1B,IAAI,SAAS,EAAE,EAAE;YACb,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;SAC9B;aAAM;YACH,IAAI,EAAE,CAAC;SACV;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAClB,CAAC,CAAC;AAfW,QAAA,qBAAqB,yBAehC"}

package/dist/test/e2e/api/admin/conditional-middleware.e2e.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/test/e2e/api/admin/conditional-middleware.e2e.test.js

@@ -0,0 +1,59 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const express_1 = __importDefault(require("express"));
+const conditional_middleware_1 = require("../../../../lib/middleware/conditional-middleware");
+const supertest_1 = __importDefault(require("supertest"));
+test('disabled middleware should not block paths that use the same path', async () => {
+    const app = (0, express_1.default)();
+    const path = '/api/admin/projects';
+    app.use(path, (0, conditional_middleware_1.conditionalMiddleware)(() => false, (req, res) => {
+        res.send({ suggestChanges: 'hello' });
+    }));
+    app.get(path, (req, res) => {
+        res.json({ projects: [] });
+    });
+    await (0, supertest_1.default)(app)
+        .get('/api/admin/projects')
+        .expect(200, { projects: [] });
+});
+test('should return 404 when path is not enabled', async () => {
+    const app = (0, express_1.default)();
+    const path = '/api/admin/projects';
+    app.use(`${path}/suggest-changes`, (0, conditional_middleware_1.conditionalMiddleware)(() => false, (req, res) => {
+        res.send({ suggestChanges: 'hello' });
+    }));
+    app.get(path, (req, res) => {
+        res.json({ projects: [] });
+    });
+    await (0, supertest_1.default)(app).get('/api/admin/projects/suggest-changes').expect(404);
+});
+test('should respect ordering of endpoints', async () => {
+    const app = (0, express_1.default)();
+    const path = '/api/admin/projects';
+    app.use(path, (0, conditional_middleware_1.conditionalMiddleware)(() => true, (req, res) => {
+        res.json({ name: 'Suggest changes' });
+    }));
+    app.get(path, (req, res) => {
+        res.json({ projects: [] });
+    });
+    await (0, supertest_1.default)(app)
+        .get('/api/admin/projects')
+        .expect(200, { name: 'Suggest changes' });
+});
+test('disabled middleware should not block paths that use the same basepath', async () => {
+    const app = (0, express_1.default)();
+    const path = '/api/admin/projects';
+    app.use(`${path}/suggest-changes`, (0, conditional_middleware_1.conditionalMiddleware)(() => false, (req, res) => {
+        res.json({ name: 'Suggest changes' });
+    }));
+    app.get(path, (req, res) => {
+        res.json({ projects: [] });
+    });
+    await (0, supertest_1.default)(app)
+        .get('/api/admin/projects')
+        .expect(200, { projects: [] });
+});
+//# sourceMappingURL=conditional-middleware.e2e.test.js.map

package/dist/test/e2e/api/admin/conditional-middleware.e2e.test.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"conditional-middleware.e2e.test.js","sourceRoot":"","sources":["../../../../../src/test/e2e/api/admin/conditional-middleware.e2e.test.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "unleash-server",
   "description": "Unleash is an enterprise ready feature toggles service. It provides different strategies for handling feature toggles.",
-  "version": "4.17.0-beta.4",
+  "version": "4.17.0-beta.5",
   "keywords": [
     "unleash",
     "feature toggle",