unleash-server 4.5.1 → 4.6.0-beta.0
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.
- package/README.md +1 -6
- package/dist/lib/app.d.ts +1 -1
- package/dist/lib/app.js +8 -4
- package/dist/lib/app.js.map +1 -1
- package/dist/lib/app.test.js +7 -7
- package/dist/lib/app.test.js.map +1 -1
- package/dist/lib/create-config.js +3 -28
- package/dist/lib/create-config.js.map +1 -1
- package/dist/lib/create-config.test.js +1 -82
- package/dist/lib/create-config.test.js.map +1 -1
- package/dist/lib/db/access-store.d.ts +24 -13
- package/dist/lib/db/access-store.js +112 -74
- package/dist/lib/db/access-store.js.map +1 -1
- package/dist/lib/db/api-token-store.d.ts +0 -1
- package/dist/lib/db/api-token-store.js +0 -5
- package/dist/lib/db/api-token-store.js.map +1 -1
- package/dist/lib/db/feature-toggle-store.d.ts +1 -1
- package/dist/lib/db/feature-toggle-store.js +3 -0
- package/dist/lib/db/feature-toggle-store.js.map +1 -1
- package/dist/lib/db/index.js +2 -0
- package/dist/lib/db/index.js.map +1 -1
- package/dist/lib/db/project-store.js +1 -1
- package/dist/lib/db/project-store.js.map +1 -1
- package/dist/lib/db/role-store.d.ts +38 -0
- package/dist/lib/db/role-store.js +142 -0
- package/dist/lib/db/role-store.js.map +1 -0
- package/dist/lib/error/role-in-use-error.d.ts +5 -0
- package/dist/lib/error/role-in-use-error.js +23 -0
- package/dist/lib/error/role-in-use-error.js.map +1 -0
- package/dist/lib/middleware/oss-authentication.test.js +6 -6
- package/dist/lib/middleware/oss-authentication.test.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.d.ts +1 -1
- package/dist/lib/middleware/rbac-middleware.js +2 -2
- package/dist/lib/middleware/rbac-middleware.js.map +1 -1
- package/dist/lib/middleware/rbac-middleware.test.js +7 -7
- package/dist/lib/middleware/rbac-middleware.test.js.map +1 -1
- package/dist/lib/routes/admin-api/config.test.js +4 -4
- package/dist/lib/routes/admin-api/config.test.js.map +1 -1
- package/dist/lib/routes/admin-api/context.test.js +4 -4
- package/dist/lib/routes/admin-api/context.test.js.map +1 -1
- package/dist/lib/routes/admin-api/email.test.js +8 -8
- package/dist/lib/routes/admin-api/email.test.js.map +1 -1
- package/dist/lib/routes/admin-api/events.test.js +4 -4
- package/dist/lib/routes/admin-api/events.test.js.map +1 -1
- package/dist/lib/routes/admin-api/feature.js +7 -10
- package/dist/lib/routes/admin-api/feature.js.map +1 -1
- package/dist/lib/routes/admin-api/index.js +3 -1
- package/dist/lib/routes/admin-api/index.js.map +1 -1
- package/dist/lib/routes/admin-api/metrics.test.js +4 -4
- package/dist/lib/routes/admin-api/metrics.test.js.map +1 -1
- package/dist/lib/routes/admin-api/project/variants.js +2 -2
- package/dist/lib/routes/admin-api/project/variants.js.map +1 -1
- package/dist/lib/routes/admin-api/strategy.test.js +33 -33
- package/dist/lib/routes/admin-api/strategy.test.js.map +1 -1
- package/dist/lib/routes/admin-api/tag.test.js +4 -4
- package/dist/lib/routes/admin-api/tag.test.js.map +1 -1
- package/dist/lib/routes/admin-api/user.test.js +1 -1
- package/dist/lib/routes/admin-api/user.test.js.map +1 -1
- package/dist/lib/routes/backstage.test.js +1 -1
- package/dist/lib/routes/backstage.test.js.map +1 -1
- package/dist/lib/routes/client-api/feature.test.js +4 -4
- package/dist/lib/routes/client-api/feature.test.js.map +1 -1
- package/dist/lib/routes/client-api/metrics.test.js +5 -5
- package/dist/lib/routes/client-api/metrics.test.js.map +1 -1
- package/dist/lib/routes/client-api/register.test.js +4 -4
- package/dist/lib/routes/client-api/register.test.js.map +1 -1
- package/dist/lib/routes/health-check.test.js +6 -6
- package/dist/lib/routes/health-check.test.js.map +1 -1
- package/dist/lib/routes/index.test.js +4 -4
- package/dist/lib/routes/index.test.js.map +1 -1
- package/dist/lib/routes/util.js +2 -0
- package/dist/lib/routes/util.js.map +1 -1
- package/dist/lib/schema/role-schema.d.ts +3 -0
- package/dist/lib/schema/role-schema.js +27 -0
- package/dist/lib/schema/role-schema.js.map +1 -0
- package/dist/lib/{services/api-token-service.test.d.ts → schema/role-schema.test.d.ts} +0 -0
- package/dist/lib/schema/role-schema.test.js +72 -0
- package/dist/lib/schema/role-schema.test.js.map +1 -0
- package/dist/lib/server-impl.d.ts +1 -2
- package/dist/lib/server-impl.js +2 -4
- package/dist/lib/server-impl.js.map +1 -1
- package/dist/lib/services/access-service.d.ts +36 -11
- package/dist/lib/services/access-service.js +137 -47
- package/dist/lib/services/access-service.js.map +1 -1
- package/dist/lib/services/api-token-service.d.ts +2 -3
- package/dist/lib/services/api-token-service.js +15 -23
- package/dist/lib/services/api-token-service.js.map +1 -1
- package/dist/lib/services/email-service.js +0 -1
- package/dist/lib/services/email-service.js.map +1 -1
- package/dist/lib/services/feature-toggle-service.js +1 -1
- package/dist/lib/services/feature-toggle-service.js.map +1 -1
- package/dist/lib/services/project-service.d.ts +2 -2
- package/dist/lib/services/project-service.js +3 -3
- package/dist/lib/services/project-service.js.map +1 -1
- package/dist/lib/services/reset-token-service.js +2 -2
- package/dist/lib/services/reset-token-service.js.map +1 -1
- package/dist/lib/services/state-service.js +5 -6
- package/dist/lib/services/state-service.js.map +1 -1
- package/dist/lib/services/user-service.js +10 -9
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/types/api-user.js +1 -0
- package/dist/lib/types/api-user.js.map +1 -1
- package/dist/lib/types/model.d.ts +21 -4
- package/dist/lib/types/model.js.map +1 -1
- package/dist/lib/types/models/api-token.d.ts +0 -1
- package/dist/lib/types/models/api-token.js +1 -17
- package/dist/lib/types/models/api-token.js.map +1 -1
- package/dist/lib/types/option.d.ts +2 -3
- package/dist/lib/types/option.js.map +1 -1
- package/dist/lib/types/permissions.d.ts +5 -0
- package/dist/lib/types/permissions.js +7 -2
- package/dist/lib/types/permissions.js.map +1 -1
- package/dist/lib/types/stores/access-store.d.ts +20 -12
- package/dist/lib/types/stores/api-token-store.d.ts +0 -1
- package/dist/lib/types/stores/environment-store.d.ts +1 -0
- package/dist/lib/types/stores/role-store.d.ts +28 -0
- package/dist/lib/types/stores/role-store.js +3 -0
- package/dist/lib/types/stores/role-store.js.map +1 -0
- package/dist/lib/types/stores.d.ts +2 -0
- package/dist/lib/types/user.js +4 -1
- package/dist/lib/types/user.js.map +1 -1
- package/dist/lib/types/user.test.js +7 -5
- package/dist/lib/types/user.test.js.map +1 -1
- package/dist/lib/util/constants.d.ts +4 -0
- package/dist/lib/util/constants.js +5 -1
- package/dist/lib/util/constants.js.map +1 -1
- package/dist/lib/util/rewriteHTML.d.ts +1 -1
- package/dist/lib/util/rewriteHTML.js +2 -3
- package/dist/lib/util/rewriteHTML.js.map +1 -1
- package/dist/migrations/20211202120808-add-custom-roles.d.ts +2 -0
- package/dist/migrations/20211202120808-add-custom-roles.js +199 -0
- package/dist/migrations/20211202120808-add-custom-roles.js.map +1 -0
- package/dist/migrations/20220103134659-add-permissions-to-project-roles.d.ts +2 -0
- package/dist/migrations/20220103134659-add-permissions-to-project-roles.js +34 -0
- package/dist/migrations/20220103134659-add-permissions-to-project-roles.js.map +1 -0
- package/dist/migrations/20220103143843-add-permissions-to-editor-role.d.ts +2 -0
- package/dist/migrations/20220103143843-add-permissions-to-editor-role.js +21 -0
- package/dist/migrations/20220103143843-add-permissions-to-editor-role.js.map +1 -0
- package/dist/server-dev.js +0 -13
- package/dist/server-dev.js.map +1 -1
- package/dist/test/config/test-config.js +3 -0
- package/dist/test/config/test-config.js.map +1 -1
- package/dist/test/e2e/api/admin/feature.e2e.test.js +12 -0
- package/dist/test/e2e/api/admin/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js +0 -37
- package/dist/test/e2e/api/admin/project/features.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/project/variants.e2e.test.js +24 -22
- package/dist/test/e2e/api/admin/project/variants.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/state.e2e.test.js +7 -8
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js +3 -3
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/client/feature.e2e.test.js +14 -14
- package/dist/test/e2e/api/client/feature.e2e.test.js.map +1 -1
- package/dist/test/e2e/helpers/test-helper.js +2 -2
- package/dist/test/e2e/helpers/test-helper.js.map +1 -1
- package/dist/test/e2e/services/access-service.e2e.test.js +167 -60
- package/dist/test/e2e/services/access-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/environment-service.test.js +1 -0
- package/dist/test/e2e/services/environment-service.test.js.map +1 -1
- package/dist/test/e2e/services/project-service.e2e.test.js +141 -45
- package/dist/test/e2e/services/project-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +0 -18
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/fixtures/access-service-mock.d.ts +2 -4
- package/dist/test/fixtures/access-service-mock.js +6 -7
- package/dist/test/fixtures/access-service-mock.js.map +1 -1
- package/dist/test/fixtures/fake-access-store.d.ts +11 -4
- package/dist/test/fixtures/fake-access-store.js +25 -7
- package/dist/test/fixtures/fake-access-store.js.map +1 -1
- package/dist/test/fixtures/fake-api-token-store.d.ts +1 -4
- package/dist/test/fixtures/fake-api-token-store.js +1 -10
- package/dist/test/fixtures/fake-api-token-store.js.map +1 -1
- package/dist/test/fixtures/fake-role-store.d.ts +21 -0
- package/dist/test/fixtures/fake-role-store.js +54 -0
- package/dist/test/fixtures/fake-role-store.js.map +1 -0
- package/dist/test/fixtures/store.js +2 -0
- package/dist/test/fixtures/store.js.map +1 -1
- package/package.json +17 -18
- package/dist/lib/services/api-token-service.test.js +0 -32
- package/dist/lib/services/api-token-service.test.js.map +0 -1
- package/dist/lib/util/load-index-html.d.ts +0 -2
- package/dist/lib/util/load-index-html.js +0 -26
- package/dist/lib/util/load-index-html.js.map +0 -1
package/README.md
CHANGED
|
@@ -129,12 +129,7 @@ The are numbers of ways you can run Unleash.
|
|
|
129
129
|
|
|
130
130
|
### Run from Docker
|
|
131
131
|
|
|
132
|
-
1. Create a network by running
|
|
133
|
-
|
|
134
|
-
```sh
|
|
135
|
-
docker network create unleash
|
|
136
|
-
```
|
|
137
|
-
|
|
132
|
+
1. Create a network by running docker network create unleash
|
|
138
133
|
2. Start a postgres database:
|
|
139
134
|
|
|
140
135
|
```sh
|
package/dist/lib/app.d.ts
CHANGED
|
@@ -2,4 +2,4 @@ import { Application, RequestHandler } from 'express';
|
|
|
2
2
|
import { IUnleashServices } from './types/services';
|
|
3
3
|
import { IUnleashConfig } from './types/option';
|
|
4
4
|
import { IUnleashStores } from './types/stores';
|
|
5
|
-
export default function getApp(config: IUnleashConfig, stores: IUnleashStores, services: IUnleashServices, unleashSession?: RequestHandler):
|
|
5
|
+
export default function getApp(config: IUnleashConfig, stores: IUnleashStores, services: IUnleashServices, unleashSession?: RequestHandler): Application;
|
package/dist/lib/app.js
CHANGED
|
@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
const unleash_frontend_1 = require("unleash-frontend");
|
|
7
|
+
const fs_1 = __importDefault(require("fs"));
|
|
7
8
|
const express_1 = __importDefault(require("express"));
|
|
8
9
|
const cors_1 = __importDefault(require("cors"));
|
|
9
10
|
const compression_1 = __importDefault(require("compression"));
|
|
@@ -21,11 +22,14 @@ const demo_authentication_1 = __importDefault(require("./middleware/demo-authent
|
|
|
21
22
|
const oss_authentication_1 = __importDefault(require("./middleware/oss-authentication"));
|
|
22
23
|
const no_authentication_1 = __importDefault(require("./middleware/no-authentication"));
|
|
23
24
|
const secure_headers_1 = __importDefault(require("./middleware/secure-headers"));
|
|
24
|
-
const
|
|
25
|
-
|
|
25
|
+
const rewriteHTML_1 = require("./util/rewriteHTML");
|
|
26
|
+
function getApp(config, stores, services, unleashSession) {
|
|
26
27
|
const app = (0, express_1.default)();
|
|
27
28
|
const baseUriPath = config.server.baseUriPath || '';
|
|
28
|
-
let indexHTML =
|
|
29
|
+
let indexHTML = fs_1.default
|
|
30
|
+
.readFileSync(path_1.default.join(unleash_frontend_1.publicFolder, 'index.html'))
|
|
31
|
+
.toString();
|
|
32
|
+
indexHTML = (0, rewriteHTML_1.rewriteHTML)(indexHTML, baseUriPath);
|
|
29
33
|
app.set('trust proxy', true);
|
|
30
34
|
app.disable('x-powered-by');
|
|
31
35
|
app.set('port', config.server.port);
|
|
@@ -49,7 +53,6 @@ async function getApp(config, stores, services, unleashSession) {
|
|
|
49
53
|
app.use((0, secure_headers_1.default)(config));
|
|
50
54
|
app.use(express_1.default.urlencoded({ extended: true }));
|
|
51
55
|
app.use((0, serve_favicon_1.default)(path_1.default.join(unleash_frontend_1.publicFolder, 'favicon.ico')));
|
|
52
|
-
app.use(baseUriPath, (0, serve_favicon_1.default)(path_1.default.join(unleash_frontend_1.publicFolder, 'favicon.ico')));
|
|
53
56
|
app.use(baseUriPath, express_1.default.static(unleash_frontend_1.publicFolder, { index: false }));
|
|
54
57
|
if (config.enableOAS) {
|
|
55
58
|
app.use(`${baseUriPath}/oas`, express_1.default.static('docs/api/oas'));
|
|
@@ -112,4 +115,5 @@ async function getApp(config, stores, services, unleashSession) {
|
|
|
112
115
|
return app;
|
|
113
116
|
}
|
|
114
117
|
exports.default = getApp;
|
|
118
|
+
module.exports = getApp;
|
|
115
119
|
//# sourceMappingURL=app.js.map
|
package/dist/lib/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":";;;;;AAAA,uDAAgD;AAChD,sDAA+D;AAC/D,gDAAwB;AACxB,8DAAsC;AACtC,kEAAoC;AACpC,kEAAyC;AACzC,gDAAwB;AACxB,gEAAwC;AACxC,8EAAyE;AACzE,mFAA0D;AAC1D,6FAAmE;AAEnE,2CAA2D;AAG3D,sDAAmC;AAEnC,iFAAwD;AACxD,2FAAkE;AAClE,yFAAgE;AAChE,uFAA8D;AAC9D,iFAAwD;AAExD,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/lib/app.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/app.test.js
CHANGED
|
@@ -10,30 +10,30 @@ jest.mock('./routes', () => class Index {
|
|
|
10
10
|
return express_1.default.Router();
|
|
11
11
|
}
|
|
12
12
|
});
|
|
13
|
-
const getApp = require('./app')
|
|
14
|
-
test('should not throw when valid config',
|
|
13
|
+
const getApp = require('./app');
|
|
14
|
+
test('should not throw when valid config', () => {
|
|
15
15
|
const config = (0, test_config_1.createTestConfig)();
|
|
16
|
-
const app =
|
|
16
|
+
const app = getApp(config, {}, {});
|
|
17
17
|
expect(typeof app.listen).toBe('function');
|
|
18
18
|
});
|
|
19
|
-
test('should call preHook',
|
|
19
|
+
test('should call preHook', () => {
|
|
20
20
|
let called = 0;
|
|
21
21
|
const config = (0, test_config_1.createTestConfig)({
|
|
22
22
|
preHook: () => {
|
|
23
23
|
called++;
|
|
24
24
|
},
|
|
25
25
|
});
|
|
26
|
-
|
|
26
|
+
getApp(config, {}, {});
|
|
27
27
|
expect(called).toBe(1);
|
|
28
28
|
});
|
|
29
|
-
test('should call preRouterHook',
|
|
29
|
+
test('should call preRouterHook', () => {
|
|
30
30
|
let called = 0;
|
|
31
31
|
const config = (0, test_config_1.createTestConfig)({
|
|
32
32
|
preRouterHook: () => {
|
|
33
33
|
called++;
|
|
34
34
|
},
|
|
35
35
|
});
|
|
36
|
-
|
|
36
|
+
getApp(config, {}, {});
|
|
37
37
|
expect(called).toBe(1);
|
|
38
38
|
});
|
|
39
39
|
//# sourceMappingURL=app.test.js.map
|
package/dist/lib/app.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../../src/lib/app.test.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,4DAA8D;AAE9D,IAAI,CAAC,IAAI,CACL,UAAU,EACV,GAAG,EAAE,CACD,MAAM,KAAK;IACP,MAAM;QACF,OAAO,iBAAO,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;CACJ,CACR,CAAC;AAEF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC
|
|
1
|
+
{"version":3,"file":"app.test.js","sourceRoot":"","sources":["../../src/lib/app.test.ts"],"names":[],"mappings":";;;;;AAAA,sDAA8B;AAC9B,4DAA8D;AAE9D,IAAI,CAAC,IAAI,CACL,UAAU,EACV,GAAG,EAAE,CACD,MAAM,KAAK;IACP,MAAM;QACF,OAAO,iBAAO,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;CACJ,CACR,CAAC;AAEF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;AAEhC,IAAI,CAAC,oCAAoC,EAAE,GAAG,EAAE;IAC5C,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACnC,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC7B,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,OAAO,EAAE,GAAG,EAAE;YACV,MAAM,EAAE,CAAC;QACb,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACnC,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,aAAa,EAAE,GAAG,EAAE;YAChB,MAAM,EAAE,CAAC;QACb,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACvB,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}
|
|
@@ -32,7 +32,6 @@ const default_custom_auth_deny_all_1 = require("./default-custom-auth-deny-all")
|
|
|
32
32
|
const format_base_uri_1 = require("./util/format-base-uri");
|
|
33
33
|
const date_fns_1 = require("date-fns");
|
|
34
34
|
const events_1 = __importDefault(require("events"));
|
|
35
|
-
const api_token_1 = require("./types/models/api-token");
|
|
36
35
|
const safeToUpper = (s) => (s ? s.toUpperCase() : s);
|
|
37
36
|
function authTypeFromString(s, defaultType = option_1.IAuthType.OPEN_SOURCE) {
|
|
38
37
|
return option_1.IAuthType[safeToUpper(s)] || defaultType;
|
|
@@ -102,7 +101,6 @@ const defaultServerOption = {
|
|
|
102
101
|
host: process.env.HTTP_HOST,
|
|
103
102
|
port: safeNumber(process.env.HTTP_PORT || process.env.PORT, 4242),
|
|
104
103
|
baseUriPath: (0, format_base_uri_1.formatBaseUri)(process.env.BASE_URI_PATH),
|
|
105
|
-
cdnPrefix: process.env.CDN_PREFIX,
|
|
106
104
|
unleashUrl: process.env.UNLEASH_URL || 'http://localhost:4242',
|
|
107
105
|
serverMetrics: true,
|
|
108
106
|
keepAliveTimeout: (0, date_fns_1.minutesToMilliseconds)(1),
|
|
@@ -121,7 +119,6 @@ const defaultAuthentication = {
|
|
|
121
119
|
type: authTypeFromString(process.env.AUTH_TYPE),
|
|
122
120
|
customAuthHandler: default_custom_auth_deny_all_1.defaultCustomAuthDenyAll,
|
|
123
121
|
createAdminUser: true,
|
|
124
|
-
initApiTokens: [],
|
|
125
122
|
};
|
|
126
123
|
const defaultImport = {
|
|
127
124
|
file: process.env.IMPORT_FILE,
|
|
@@ -160,29 +157,6 @@ const formatServerOptions = (serverOptions) => {
|
|
|
160
157
|
baseUriPath: (0, format_base_uri_1.formatBaseUri)(serverOptions.baseUriPath),
|
|
161
158
|
};
|
|
162
159
|
};
|
|
163
|
-
const loadInitApiTokens = () => {
|
|
164
|
-
if (process.env.INIT_ADMIN_API_TOKENS) {
|
|
165
|
-
const initApiTokens = process.env.INIT_ADMIN_API_TOKENS.split(/,\s?/);
|
|
166
|
-
const tokens = initApiTokens.map((secret) => {
|
|
167
|
-
const [project = '*', rest] = secret.split(':');
|
|
168
|
-
const [environment = '*'] = rest.split('.');
|
|
169
|
-
const token = {
|
|
170
|
-
createdAt: undefined,
|
|
171
|
-
project,
|
|
172
|
-
environment,
|
|
173
|
-
secret,
|
|
174
|
-
type: api_token_1.ApiTokenType.ADMIN,
|
|
175
|
-
username: 'admin',
|
|
176
|
-
};
|
|
177
|
-
(0, api_token_1.validateApiToken)(token);
|
|
178
|
-
return token;
|
|
179
|
-
});
|
|
180
|
-
return tokens;
|
|
181
|
-
}
|
|
182
|
-
else {
|
|
183
|
-
return [];
|
|
184
|
-
}
|
|
185
|
-
};
|
|
186
160
|
function createConfig(options) {
|
|
187
161
|
let extraDbOptions = {};
|
|
188
162
|
if (options.databaseUrl) {
|
|
@@ -220,13 +194,11 @@ function createConfig(options) {
|
|
|
220
194
|
defaultVersionOption,
|
|
221
195
|
options.versionCheck,
|
|
222
196
|
]);
|
|
223
|
-
const initApiTokens = loadInitApiTokens();
|
|
224
197
|
const authentication = mergeAll([
|
|
225
198
|
defaultAuthentication,
|
|
226
199
|
options.authentication
|
|
227
200
|
? removeUndefinedKeys(options.authentication)
|
|
228
201
|
: options.authentication,
|
|
229
|
-
{ initApiTokens: initApiTokens },
|
|
230
202
|
]);
|
|
231
203
|
const importSetting = mergeAll([
|
|
232
204
|
defaultImport,
|
|
@@ -244,6 +216,8 @@ function createConfig(options) {
|
|
|
244
216
|
}
|
|
245
217
|
const secureHeaders = options.secureHeaders || safeBoolean(process.env.SECURE_HEADERS, false);
|
|
246
218
|
const enableOAS = options.enableOAS || safeBoolean(process.env.ENABLE_OAS, false);
|
|
219
|
+
const disableLegacyFeaturesApi = options.disableLegacyFeaturesApi ||
|
|
220
|
+
safeBoolean(process.env.DISABLE_LEGACY_FEATURES_API, false);
|
|
247
221
|
return {
|
|
248
222
|
db,
|
|
249
223
|
session,
|
|
@@ -258,6 +232,7 @@ function createConfig(options) {
|
|
|
258
232
|
email,
|
|
259
233
|
secureHeaders,
|
|
260
234
|
enableOAS,
|
|
235
|
+
disableLegacyFeaturesApi,
|
|
261
236
|
preHook: options.preHook,
|
|
262
237
|
preRouterHook: options.preRouterHook,
|
|
263
238
|
eventHook: options.eventHook,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA6C;AAC7C,0DAA8B;AAC9B,uCAAyB;AACzB,2CAcwB;AACxB,qCAAgF;AAChF,iFAA0E;AAC1E,4DAAuD;AACvD,uCAAwE;AACxE,oDAAkC;
|
|
1
|
+
{"version":3,"file":"create-config.js","sourceRoot":"","sources":["../../src/lib/create-config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
// @ts-nocheck
|
|
3
4
|
const create_config_1 = require("./create-config");
|
|
4
|
-
const api_token_1 = require("./types/models/api-token");
|
|
5
5
|
test('should create default config', async () => {
|
|
6
6
|
const config = (0, create_config_1.createConfig)({
|
|
7
7
|
db: {
|
|
@@ -17,85 +17,4 @@ test('should create default config', async () => {
|
|
|
17
17
|
});
|
|
18
18
|
expect(config).toMatchSnapshot();
|
|
19
19
|
});
|
|
20
|
-
test('should add initApiToken from options', async () => {
|
|
21
|
-
const token = {
|
|
22
|
-
environment: '*',
|
|
23
|
-
project: '*',
|
|
24
|
-
secret: '*:*.some-random-string',
|
|
25
|
-
type: api_token_1.ApiTokenType.ADMIN,
|
|
26
|
-
username: 'admin',
|
|
27
|
-
};
|
|
28
|
-
const config = (0, create_config_1.createConfig)({
|
|
29
|
-
db: {
|
|
30
|
-
host: 'localhost',
|
|
31
|
-
port: 4242,
|
|
32
|
-
user: 'unleash',
|
|
33
|
-
password: 'password',
|
|
34
|
-
database: 'unleash_db',
|
|
35
|
-
},
|
|
36
|
-
server: {
|
|
37
|
-
port: 4242,
|
|
38
|
-
},
|
|
39
|
-
authentication: {
|
|
40
|
-
initApiTokens: [token],
|
|
41
|
-
},
|
|
42
|
-
});
|
|
43
|
-
expect(config.authentication.initApiTokens).toHaveLength(1);
|
|
44
|
-
expect(config.authentication.initApiTokens[0].environment).toBe(token.environment);
|
|
45
|
-
expect(config.authentication.initApiTokens[0].project).toBe(token.project);
|
|
46
|
-
expect(config.authentication.initApiTokens[0].type).toBe(api_token_1.ApiTokenType.ADMIN);
|
|
47
|
-
});
|
|
48
|
-
test('should add initApiToken from env var', async () => {
|
|
49
|
-
process.env.INIT_ADMIN_API_TOKENS = '*:*.some-token1, *:*.some-token2';
|
|
50
|
-
const config = (0, create_config_1.createConfig)({
|
|
51
|
-
db: {
|
|
52
|
-
host: 'localhost',
|
|
53
|
-
port: 4242,
|
|
54
|
-
user: 'unleash',
|
|
55
|
-
password: 'password',
|
|
56
|
-
database: 'unleash_db',
|
|
57
|
-
},
|
|
58
|
-
server: {
|
|
59
|
-
port: 4242,
|
|
60
|
-
},
|
|
61
|
-
});
|
|
62
|
-
expect(config.authentication.initApiTokens).toHaveLength(2);
|
|
63
|
-
expect(config.authentication.initApiTokens[0].environment).toBe('*');
|
|
64
|
-
expect(config.authentication.initApiTokens[0].project).toBe('*');
|
|
65
|
-
expect(config.authentication.initApiTokens[0].type).toBe(api_token_1.ApiTokenType.ADMIN);
|
|
66
|
-
expect(config.authentication.initApiTokens[1].secret).toBe('*:*.some-token2');
|
|
67
|
-
delete process.env.INIT_ADMIN_API_TOKENS;
|
|
68
|
-
});
|
|
69
|
-
test('should validate initApiToken from env var', async () => {
|
|
70
|
-
process.env.INIT_ADMIN_API_TOKENS = 'invalidProject:*:some-token1';
|
|
71
|
-
expect(() => (0, create_config_1.createConfig)({})).toThrow('Admin token cannot be scoped to single project');
|
|
72
|
-
delete process.env.INIT_ADMIN_API_TOKENS;
|
|
73
|
-
});
|
|
74
|
-
test('should merge initApiToken from options and env vars', async () => {
|
|
75
|
-
process.env.INIT_ADMIN_API_TOKENS = '*:*.some-token1, *:*.some-token2';
|
|
76
|
-
const token = {
|
|
77
|
-
environment: '*',
|
|
78
|
-
project: '*',
|
|
79
|
-
secret: '*:*.some-random-string',
|
|
80
|
-
type: api_token_1.ApiTokenType.ADMIN,
|
|
81
|
-
username: 'admin',
|
|
82
|
-
};
|
|
83
|
-
const config = (0, create_config_1.createConfig)({
|
|
84
|
-
db: {
|
|
85
|
-
host: 'localhost',
|
|
86
|
-
port: 4242,
|
|
87
|
-
user: 'unleash',
|
|
88
|
-
password: 'password',
|
|
89
|
-
database: 'unleash_db',
|
|
90
|
-
},
|
|
91
|
-
server: {
|
|
92
|
-
port: 4242,
|
|
93
|
-
},
|
|
94
|
-
authentication: {
|
|
95
|
-
initApiTokens: [token],
|
|
96
|
-
},
|
|
97
|
-
});
|
|
98
|
-
expect(config.authentication.initApiTokens).toHaveLength(3);
|
|
99
|
-
delete process.env.INIT_ADMIN_API_TOKENS;
|
|
100
|
-
});
|
|
101
20
|
//# sourceMappingURL=create-config.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-config.test.js","sourceRoot":"","sources":["../../src/lib/create-config.test.ts"],"names":[],"mappings":";;AAAA,mDAA+C;
|
|
1
|
+
{"version":3,"file":"create-config.test.js","sourceRoot":"","sources":["../../src/lib/create-config.test.ts"],"names":[],"mappings":";;AAAA,cAAc;AACd,mDAA+C;AAE/C,IAAI,CAAC,8BAA8B,EAAE,KAAK,IAAI,EAAE;IAC5C,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC;QACxB,EAAE,EAAE;YACA,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,IAAI;YACV,IAAI,EAAE,SAAS;YACf,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE,YAAY;SACzB;QACD,MAAM,EAAE;YACJ,IAAI,EAAE,IAAI;SACb;KACJ,CAAC,CAAC;IAEH,MAAM,CAAC,MAAM,CAAC,CAAC,eAAe,EAAE,CAAC;AACrC,CAAC,CAAC,CAAC"}
|
|
@@ -1,7 +1,17 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { EventEmitter } from 'events';
|
|
3
3
|
import { Knex } from 'knex';
|
|
4
|
-
import { IAccessStore, IRole, IUserPermission
|
|
4
|
+
import { IAccessStore, IRole, IUserPermission } from '../types/stores/access-store';
|
|
5
|
+
import { IPermission } from 'lib/types/model';
|
|
6
|
+
interface IPermissionRow {
|
|
7
|
+
id: number;
|
|
8
|
+
permission: string;
|
|
9
|
+
display_name: string;
|
|
10
|
+
environment?: string;
|
|
11
|
+
type: string;
|
|
12
|
+
project?: string;
|
|
13
|
+
role_id: number;
|
|
14
|
+
}
|
|
5
15
|
export declare class AccessStore implements IAccessStore {
|
|
6
16
|
private logger;
|
|
7
17
|
private timer;
|
|
@@ -13,20 +23,21 @@ export declare class AccessStore implements IAccessStore {
|
|
|
13
23
|
exists(key: number): Promise<boolean>;
|
|
14
24
|
get(key: number): Promise<IRole>;
|
|
15
25
|
getAll(): Promise<IRole[]>;
|
|
26
|
+
getAvailablePermissions(): Promise<IPermission[]>;
|
|
27
|
+
mapPermission(permission: IPermissionRow): IPermission;
|
|
16
28
|
getPermissionsForUser(userId: number): Promise<IUserPermission[]>;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
removeRolesForProject(projectId: string): Promise<void>;
|
|
29
|
+
mapUserPermission(row: IPermissionRow): IUserPermission;
|
|
30
|
+
getPermissionsForRole(roleId: number): Promise<IPermission[]>;
|
|
31
|
+
addEnvironmentPermissionsToRole(role_id: number, permissions: IPermission[]): Promise<void>;
|
|
32
|
+
unlinkUserRoles(userId: number): Promise<void>;
|
|
33
|
+
getProjectUserIdsForRole(roleId: number, projectId?: string): Promise<number[]>;
|
|
23
34
|
getRolesForUserId(userId: number): Promise<IRole[]>;
|
|
24
35
|
getUserIdsForRole(roleId: number): Promise<number[]>;
|
|
25
|
-
addUserToRole(userId: number, roleId: number): Promise<void>;
|
|
26
|
-
removeUserFromRole(userId: number, roleId: number): Promise<void>;
|
|
36
|
+
addUserToRole(userId: number, roleId: number, projecId?: string): Promise<void>;
|
|
37
|
+
removeUserFromRole(userId: number, roleId: number, projectId?: string): Promise<void>;
|
|
27
38
|
removeRolesOfTypeForUser(userId: number, roleType: string): Promise<void>;
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
getRootRoleForAllUsers(): Promise<IUserRole[]>;
|
|
39
|
+
addPermissionsToRole(role_id: number, permissions: string[], environment?: string): Promise<void>;
|
|
40
|
+
removePermissionFromRole(role_id: number, permission: string, environment?: string): Promise<void>;
|
|
41
|
+
wipePermissionsFromRole(role_id: number): Promise<void>;
|
|
32
42
|
}
|
|
43
|
+
export {};
|