unleash-server 4.6.0-beta.0 → 4.6.0-beta.5
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 +6 -1
- package/dist/lib/app.d.ts +1 -1
- package/dist/lib/app.js +4 -8
- 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 +28 -0
- package/dist/lib/create-config.js.map +1 -1
- package/dist/lib/create-config.test.js +82 -1
- package/dist/lib/create-config.test.js.map +1 -1
- package/dist/lib/db/access-store.d.ts +1 -1
- package/dist/lib/db/access-store.js +5 -8
- package/dist/lib/db/access-store.js.map +1 -1
- package/dist/lib/db/api-token-store.d.ts +1 -0
- package/dist/lib/db/api-token-store.js +5 -0
- 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 +0 -3
- package/dist/lib/db/feature-toggle-store.js.map +1 -1
- 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/secure-headers.js +11 -3
- package/dist/lib/middleware/secure-headers.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 +10 -7
- package/dist/lib/routes/admin-api/feature.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/features.js +6 -6
- package/dist/lib/routes/admin-api/project/features.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/schema/role-schema.js +1 -1
- package/dist/lib/schema/role-schema.js.map +1 -1
- package/dist/lib/server-impl.d.ts +2 -1
- package/dist/lib/server-impl.js +4 -2
- package/dist/lib/server-impl.js.map +1 -1
- package/dist/lib/services/access-service.d.ts +1 -0
- package/dist/lib/services/access-service.js +13 -2
- package/dist/lib/services/access-service.js.map +1 -1
- package/dist/lib/services/api-token-service.d.ts +3 -2
- package/dist/lib/services/api-token-service.js +23 -15
- package/dist/lib/services/api-token-service.js.map +1 -1
- package/dist/lib/services/api-token-service.test.d.ts +1 -0
- package/dist/lib/services/api-token-service.test.js +32 -0
- package/dist/lib/services/api-token-service.test.js.map +1 -0
- package/dist/lib/services/email-service.js +1 -0
- 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 -1
- package/dist/lib/services/project-service.js +8 -7
- 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 +6 -5
- package/dist/lib/services/state-service.js.map +1 -1
- package/dist/lib/services/user-service.js +6 -8
- package/dist/lib/services/user-service.js.map +1 -1
- package/dist/lib/types/api-user.js +0 -1
- package/dist/lib/types/api-user.js.map +1 -1
- package/dist/lib/types/model.d.ts +1 -1
- package/dist/lib/types/models/api-token.d.ts +1 -0
- package/dist/lib/types/models/api-token.js +17 -1
- package/dist/lib/types/models/api-token.js.map +1 -1
- package/dist/lib/types/option.d.ts +3 -0
- package/dist/lib/types/option.js.map +1 -1
- package/dist/lib/types/permissions.d.ts +1 -0
- package/dist/lib/types/permissions.js +2 -1
- package/dist/lib/types/permissions.js.map +1 -1
- package/dist/lib/types/project.d.ts +1 -0
- package/dist/lib/types/project.js +5 -0
- package/dist/lib/types/project.js.map +1 -0
- package/dist/lib/types/stores/api-token-store.d.ts +1 -0
- package/dist/lib/types/user.js +1 -4
- package/dist/lib/types/user.js.map +1 -1
- package/dist/lib/types/user.test.js +5 -7
- package/dist/lib/types/user.test.js.map +1 -1
- package/dist/lib/util/load-index-html.d.ts +2 -0
- package/dist/lib/util/load-index-html.js +26 -0
- package/dist/lib/util/load-index-html.js.map +1 -0
- package/dist/lib/util/rewriteHTML.d.ts +1 -1
- package/dist/lib/util/rewriteHTML.js +3 -2
- package/dist/lib/util/rewriteHTML.js.map +1 -1
- package/dist/migrations/20220111112804-update-permission-descriptions.d.ts +2 -0
- package/dist/migrations/20220111112804-update-permission-descriptions.js +39 -0
- package/dist/migrations/20220111112804-update-permission-descriptions.js.map +1 -0
- package/dist/migrations/20220111115613-move-feature-toggle-permission.d.ts +2 -0
- package/dist/migrations/20220111115613-move-feature-toggle-permission.js +29 -0
- package/dist/migrations/20220111115613-move-feature-toggle-permission.js.map +1 -0
- package/dist/migrations/20220111120346-roles-unique-name.d.ts +2 -0
- package/dist/migrations/20220111120346-roles-unique-name.js +11 -0
- package/dist/migrations/20220111120346-roles-unique-name.js.map +1 -0
- package/dist/migrations/20220111121010-update-project-for-editor-role.d.ts +2 -0
- package/dist/migrations/20220111121010-update-project-for-editor-role.js +13 -0
- package/dist/migrations/20220111121010-update-project-for-editor-role.js.map +1 -0
- package/dist/migrations/20220111125620-role-permission-empty-string-for-non-environment-type.d.ts +2 -0
- package/dist/migrations/20220111125620-role-permission-empty-string-for-non-environment-type.js +10 -0
- package/dist/migrations/20220111125620-role-permission-empty-string-for-non-environment-type.js.map +1 -0
- package/dist/server-dev.js +14 -0
- package/dist/server-dev.js.map +1 -1
- package/dist/test/config/test-config.js +0 -3
- package/dist/test/config/test-config.js.map +1 -1
- package/dist/test/e2e/api/admin/project/features.e2e.test.js +37 -0
- 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 +22 -24
- package/dist/test/e2e/api/admin/project/variants.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/state.e2e.test.js +8 -7
- package/dist/test/e2e/api/admin/state.e2e.test.js.map +1 -1
- package/dist/test/e2e/api/admin/user-admin.e2e.test.js +2 -2
- 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 +60 -2
- package/dist/test/e2e/services/access-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/environment-service.test.js +0 -1
- package/dist/test/e2e/services/environment-service.test.js.map +1 -1
- package/dist/test/e2e/services/project-service.e2e.test.js +2 -2
- package/dist/test/e2e/services/project-service.e2e.test.js.map +1 -1
- package/dist/test/e2e/services/user-service.e2e.test.js +18 -0
- package/dist/test/e2e/services/user-service.e2e.test.js.map +1 -1
- package/dist/test/fixtures/fake-api-token-store.d.ts +4 -1
- package/dist/test/fixtures/fake-api-token-store.js +10 -1
- package/dist/test/fixtures/fake-api-token-store.js.map +1 -1
- package/package.json +19 -18
package/README.md
CHANGED
|
@@ -129,7 +129,12 @@ 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
|
|
132
|
+
1. Create a network by running the following command:
|
|
133
|
+
|
|
134
|
+
```sh
|
|
135
|
+
docker network create unleash
|
|
136
|
+
```
|
|
137
|
+
|
|
133
138
|
2. Start a postgres database:
|
|
134
139
|
|
|
135
140
|
```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): Application
|
|
5
|
+
export default function getApp(config: IUnleashConfig, stores: IUnleashStores, services: IUnleashServices, unleashSession?: RequestHandler): Promise<Application>;
|
package/dist/lib/app.js
CHANGED
|
@@ -4,7 +4,6 @@ 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"));
|
|
8
7
|
const express_1 = __importDefault(require("express"));
|
|
9
8
|
const cors_1 = __importDefault(require("cors"));
|
|
10
9
|
const compression_1 = __importDefault(require("compression"));
|
|
@@ -22,14 +21,11 @@ const demo_authentication_1 = __importDefault(require("./middleware/demo-authent
|
|
|
22
21
|
const oss_authentication_1 = __importDefault(require("./middleware/oss-authentication"));
|
|
23
22
|
const no_authentication_1 = __importDefault(require("./middleware/no-authentication"));
|
|
24
23
|
const secure_headers_1 = __importDefault(require("./middleware/secure-headers"));
|
|
25
|
-
const
|
|
26
|
-
function getApp(config, stores, services, unleashSession) {
|
|
24
|
+
const load_index_html_1 = require("./util/load-index-html");
|
|
25
|
+
async function getApp(config, stores, services, unleashSession) {
|
|
27
26
|
const app = (0, express_1.default)();
|
|
28
27
|
const baseUriPath = config.server.baseUriPath || '';
|
|
29
|
-
let indexHTML =
|
|
30
|
-
.readFileSync(path_1.default.join(unleash_frontend_1.publicFolder, 'index.html'))
|
|
31
|
-
.toString();
|
|
32
|
-
indexHTML = (0, rewriteHTML_1.rewriteHTML)(indexHTML, baseUriPath);
|
|
28
|
+
let indexHTML = await (0, load_index_html_1.loadIndexHTML)(config, unleash_frontend_1.publicFolder);
|
|
33
29
|
app.set('trust proxy', true);
|
|
34
30
|
app.disable('x-powered-by');
|
|
35
31
|
app.set('port', config.server.port);
|
|
@@ -53,6 +49,7 @@ function getApp(config, stores, services, unleashSession) {
|
|
|
53
49
|
app.use((0, secure_headers_1.default)(config));
|
|
54
50
|
app.use(express_1.default.urlencoded({ extended: true }));
|
|
55
51
|
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')));
|
|
56
53
|
app.use(baseUriPath, express_1.default.static(unleash_frontend_1.publicFolder, { index: false }));
|
|
57
54
|
if (config.enableOAS) {
|
|
58
55
|
app.use(`${baseUriPath}/oas`, express_1.default.static('docs/api/oas'));
|
|
@@ -115,5 +112,4 @@ function getApp(config, stores, services, unleashSession) {
|
|
|
115
112
|
return app;
|
|
116
113
|
}
|
|
117
114
|
exports.default = getApp;
|
|
118
|
-
module.exports = getApp;
|
|
119
115
|
//# 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,
|
|
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').default;
|
|
14
|
+
test('should not throw when valid config', async () => {
|
|
15
15
|
const config = (0, test_config_1.createTestConfig)();
|
|
16
|
-
const app = getApp(config, {}, {});
|
|
16
|
+
const app = await getApp(config, {}, {});
|
|
17
17
|
expect(typeof app.listen).toBe('function');
|
|
18
18
|
});
|
|
19
|
-
test('should call preHook', () => {
|
|
19
|
+
test('should call preHook', async () => {
|
|
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
|
-
getApp(config, {}, {});
|
|
26
|
+
await getApp(config, {}, {});
|
|
27
27
|
expect(called).toBe(1);
|
|
28
28
|
});
|
|
29
|
-
test('should call preRouterHook', () => {
|
|
29
|
+
test('should call preRouterHook', async () => {
|
|
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
|
-
getApp(config, {}, {});
|
|
36
|
+
await 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,OAAO,CAAC;AAExC,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;IAClD,MAAM,MAAM,GAAG,IAAA,8BAAgB,GAAE,CAAC;IAClC,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IACzC,MAAM,CAAC,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,qBAAqB,EAAE,KAAK,IAAI,EAAE;IACnC,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,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,2BAA2B,EAAE,KAAK,IAAI,EAAE;IACzC,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,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7B,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAC3B,CAAC,CAAC,CAAC"}
|
|
@@ -32,6 +32,7 @@ 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");
|
|
35
36
|
const safeToUpper = (s) => (s ? s.toUpperCase() : s);
|
|
36
37
|
function authTypeFromString(s, defaultType = option_1.IAuthType.OPEN_SOURCE) {
|
|
37
38
|
return option_1.IAuthType[safeToUpper(s)] || defaultType;
|
|
@@ -101,6 +102,7 @@ const defaultServerOption = {
|
|
|
101
102
|
host: process.env.HTTP_HOST,
|
|
102
103
|
port: safeNumber(process.env.HTTP_PORT || process.env.PORT, 4242),
|
|
103
104
|
baseUriPath: (0, format_base_uri_1.formatBaseUri)(process.env.BASE_URI_PATH),
|
|
105
|
+
cdnPrefix: process.env.CDN_PREFIX,
|
|
104
106
|
unleashUrl: process.env.UNLEASH_URL || 'http://localhost:4242',
|
|
105
107
|
serverMetrics: true,
|
|
106
108
|
keepAliveTimeout: (0, date_fns_1.minutesToMilliseconds)(1),
|
|
@@ -119,6 +121,7 @@ const defaultAuthentication = {
|
|
|
119
121
|
type: authTypeFromString(process.env.AUTH_TYPE),
|
|
120
122
|
customAuthHandler: default_custom_auth_deny_all_1.defaultCustomAuthDenyAll,
|
|
121
123
|
createAdminUser: true,
|
|
124
|
+
initApiTokens: [],
|
|
122
125
|
};
|
|
123
126
|
const defaultImport = {
|
|
124
127
|
file: process.env.IMPORT_FILE,
|
|
@@ -157,6 +160,29 @@ const formatServerOptions = (serverOptions) => {
|
|
|
157
160
|
baseUriPath: (0, format_base_uri_1.formatBaseUri)(serverOptions.baseUriPath),
|
|
158
161
|
};
|
|
159
162
|
};
|
|
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
|
+
};
|
|
160
186
|
function createConfig(options) {
|
|
161
187
|
let extraDbOptions = {};
|
|
162
188
|
if (options.databaseUrl) {
|
|
@@ -194,11 +220,13 @@ function createConfig(options) {
|
|
|
194
220
|
defaultVersionOption,
|
|
195
221
|
options.versionCheck,
|
|
196
222
|
]);
|
|
223
|
+
const initApiTokens = loadInitApiTokens();
|
|
197
224
|
const authentication = mergeAll([
|
|
198
225
|
defaultAuthentication,
|
|
199
226
|
options.authentication
|
|
200
227
|
? removeUndefinedKeys(options.authentication)
|
|
201
228
|
: options.authentication,
|
|
229
|
+
{ initApiTokens: initApiTokens },
|
|
202
230
|
]);
|
|
203
231
|
const importSetting = mergeAll([
|
|
204
232
|
defaultImport,
|
|
@@ -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
|
|
4
3
|
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,4 +17,85 @@ 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
|
+
});
|
|
20
101
|
//# 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,
|
|
1
|
+
{"version":3,"file":"create-config.test.js","sourceRoot":"","sources":["../../src/lib/create-config.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
import { EventEmitter } from 'events';
|
|
3
3
|
import { Knex } from 'knex';
|
|
4
4
|
import { IAccessStore, IRole, IUserPermission } from '../types/stores/access-store';
|
|
5
|
-
import { IPermission } from '
|
|
5
|
+
import { IPermission } from '../types/model';
|
|
6
6
|
interface IPermissionRow {
|
|
7
7
|
id: number;
|
|
8
8
|
permission: string;
|
|
@@ -15,7 +15,6 @@ const T = {
|
|
|
15
15
|
PERMISSIONS: 'permissions',
|
|
16
16
|
PERMISSION_TYPES: 'permission_types',
|
|
17
17
|
};
|
|
18
|
-
const EDITOR_ID = 2;
|
|
19
18
|
class AccessStore {
|
|
20
19
|
constructor(db, eventBus, getLogger) {
|
|
21
20
|
this.db = db;
|
|
@@ -79,24 +78,22 @@ class AccessStore {
|
|
|
79
78
|
return rows.map(this.mapUserPermission);
|
|
80
79
|
}
|
|
81
80
|
mapUserPermission(row) {
|
|
82
|
-
let project;
|
|
81
|
+
let project = undefined;
|
|
83
82
|
// Since the editor should have access to the default project,
|
|
84
83
|
// we map the project to the project and environment specific
|
|
85
84
|
// permissions that are connected to the editor role.
|
|
86
|
-
if (row.
|
|
87
|
-
project =
|
|
88
|
-
}
|
|
89
|
-
else if (row.type !== constants_1.ROOT_PERMISSION_TYPE) {
|
|
90
|
-
project = row.project ? row.project : undefined;
|
|
85
|
+
if (row.type !== constants_1.ROOT_PERMISSION_TYPE) {
|
|
86
|
+
project = row.project;
|
|
91
87
|
}
|
|
92
88
|
const environment = row.type === constants_1.ENVIRONMENT_PERMISSION_TYPE
|
|
93
89
|
? row.environment
|
|
94
90
|
: undefined;
|
|
95
|
-
|
|
91
|
+
const result = {
|
|
96
92
|
project,
|
|
97
93
|
environment,
|
|
98
94
|
permission: row.permission,
|
|
99
95
|
};
|
|
96
|
+
return result;
|
|
100
97
|
}
|
|
101
98
|
async getPermissionsForRole(roleId) {
|
|
102
99
|
const stopTimer = this.timer('getPermissionsForRole');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"access-store.js","sourceRoot":"","sources":["../../../src/lib/db/access-store.ts"],"names":[],"mappings":";;;;;;AAEA,4EAAmD;AACnD,oDAA2C;AAQ3C,6EAAoD;AACpD,iDAG2B;AAE3B,MAAM,CAAC,GAAG;IACN,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,gBAAgB,EAAE,kBAAkB;CACvC,CAAC;AAYF,
|
|
1
|
+
{"version":3,"file":"access-store.js","sourceRoot":"","sources":["../../../src/lib/db/access-store.ts"],"names":[],"mappings":";;;;;;AAEA,4EAAmD;AACnD,oDAA2C;AAQ3C,6EAAoD;AACpD,iDAG2B;AAE3B,MAAM,CAAC,GAAG;IACN,SAAS,EAAE,WAAW;IACtB,KAAK,EAAE,OAAO;IACd,eAAe,EAAE,iBAAiB;IAClC,WAAW,EAAE,aAAa;IAC1B,gBAAgB,EAAE,kBAAkB;CACvC,CAAC;AAYF,MAAa,WAAW;IAOpB,YAAY,EAAQ,EAAE,QAAsB,EAAE,SAAmB;QAC7D,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,CAAC,MAAc,EAAE,EAAE,CAC5B,wBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,uBAAO,EAAE;YACvC,KAAK,EAAE,cAAc;YACrB,MAAM;SACT,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAW;QACpB,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;IACjC,CAAC;IAED,OAAO,KAAU,CAAC;IAElB,KAAK,CAAC,MAAM,CAAC,GAAW;QACpB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,gCAAgC,CAAC,CAAC,KAAK,2BAA2B,EAClE,CAAC,GAAG,CAAC,CACR,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACjB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC;aAC7C,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC;aAChB,KAAK,EAAE;aACP,IAAI,CAAQ,CAAC,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,CAAC,IAAI,EAAE;YACP,MAAM,IAAI,wBAAa,CAAC,gCAAgC,GAAG,EAAE,CAAC,CAAC;SAClE;QAED,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,MAAM;QACR,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,uBAAuB;QACzB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,CAAC,IAAI,EAAE,YAAY,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;aACpD,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC;aACxB,OAAO,CAAC,MAAM,EAAE,aAAa,CAAC;aAC9B,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,OAAO,CAAC,CAAC;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACxC,CAAC;IAED,aAAa,CAAC,UAA0B;QACpC,OAAO;YACH,EAAE,EAAE,UAAU,CAAC,EAAE;YACjB,IAAI,EAAE,UAAU,CAAC,UAAU;YAC3B,WAAW,EAAE,UAAU,CAAC,YAAY;YACpC,IAAI,EAAE,UAAU,CAAC,IAAI;SACxB,CAAC;IACN,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CACH,SAAS,EACT,YAAY,EACZ,aAAa,EACb,MAAM,EACN,YAAY,CACf;aACA,IAAI,CAAiB,GAAG,CAAC,CAAC,eAAe,QAAQ,CAAC;aAClD,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,QAAQ,EAAE,YAAY,EAAE,YAAY,CAAC;aACxD,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC;aACzD,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtC,SAAS,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAAC,GAAmB;QACjC,IAAI,OAAO,GAAW,SAAS,CAAC;QAChC,8DAA8D;QAC9D,6DAA6D;QAC7D,qDAAqD;QACrD,IAAI,GAAG,CAAC,IAAI,KAAK,gCAAoB,EAAE;YACnC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;SACzB;QAED,MAAM,WAAW,GACb,GAAG,CAAC,IAAI,KAAK,uCAA2B;YACpC,CAAC,CAAC,GAAG,CAAC,WAAW;YACjB,CAAC,CAAC,SAAS,CAAC;QAEpB,MAAM,MAAM,GAAG;YACX,OAAO;YACP,WAAW;YACX,UAAU,EAAE,GAAG,CAAC,UAAU;SAC7B,CAAC;QACF,OAAO,MAAM,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,MAAc;QACtC,MAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACtD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CACH,MAAM,EACN,cAAc,EACd,gBAAgB,EAChB,gBAAgB,EAChB,QAAQ,CACX;aACA,IAAI,CAAc,GAAG,CAAC,CAAC,eAAe,QAAQ,CAAC;aAC/C,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,OAAO,EAAE,MAAM,EAAE,kBAAkB,CAAC;aACzD,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;QACtC,SAAS,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YAC3B,OAAO;gBACH,EAAE,EAAE,UAAU,CAAC,EAAE;gBACjB,IAAI,EAAE,UAAU,CAAC,UAAU;gBAC3B,WAAW,EAAE,UAAU,CAAC,WAAW;gBACnC,WAAW,EAAE,UAAU,CAAC,YAAY;gBACpC,IAAI,EAAE,UAAU,CAAC,IAAI;aACxB,CAAC;QACN,CAAC,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,+BAA+B,CACjC,OAAe,EACf,WAA0B;QAE1B,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;YACxC,OAAO;gBACH,OAAO;gBACP,aAAa,EAAE,UAAU,CAAC,EAAE;gBAC5B,WAAW,EAAE,UAAU,CAAC,WAAW;aACtC,CAAC;QACN,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,MAAc;QAChC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aACtB,KAAK,CAAC;YACH,OAAO,EAAE,MAAM;SAClB,CAAC;aACD,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,MAAc,EACd,SAAkB;QAElB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;aACnB,IAAI,CAAQ,GAAG,CAAC,CAAC,SAAS,QAAQ,CAAC;aACnC,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,OAAO,EAAE,YAAY,EAAE,IAAI,CAAC;aAC3C,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC;aACrB,QAAQ,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;QACvC,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAc;QAClC,OAAO,IAAI,CAAC,EAAE;aACT,MAAM,CAAC,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;aACxD,IAAI,CAAU,CAAC,CAAC,KAAK,CAAC;aACtB,SAAS,CAAC,GAAG,CAAC,CAAC,SAAS,QAAQ,EAAE,YAAY,EAAE,IAAI,CAAC;aACrD,KAAK,CAAC,YAAY,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,MAAc;QAClC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC;aACnB,IAAI,CAAQ,CAAC,CAAC,SAAS,CAAC;aACxB,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CACf,MAAc,EACd,MAAc,EACd,QAAiB;QAEjB,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC;YAC/B,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,QAAQ;SACpB,CAAC,CAAC;IACP,CAAC;IAED,KAAK,CAAC,kBAAkB,CACpB,MAAc,EACd,MAAc,EACd,SAAkB;QAElB,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aACtB,KAAK,CAAC;YACH,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,SAAS;SACrB,CAAC;aACD,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,MAAc,EACd,QAAgB;QAEhB,MAAM,aAAa,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;aACjC,MAAM,CAAC,IAAI,CAAC;aACZ,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE/B,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;aACtB,KAAK,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;aAC1B,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC;aACjC,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,oBAAoB,CACtB,OAAe,EACf,WAAqB,EACrB,WAAoB;QAEpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,oBAAoB,CAAC;aAC5B,IAAI,CAAS,CAAC,CAAC,WAAW,CAAC;aAC3B,OAAO,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAExC,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAChC,OAAO;YACP,WAAW;YACX,aAAa,EAAE,GAAG,CAAC,YAAY;SAClC,CAAC,CAAC,CAAC;QAEJ,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,wBAAwB,CAC1B,OAAe,EACf,UAAkB,EAClB,WAAoB;QAEpB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,oBAAoB,CAAC;aAC5B,IAAI,CAAS,CAAC,CAAC,WAAW,CAAC;aAC3B,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAErC,MAAM,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAE1C,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;aAC5B,KAAK,CAAC;YACH,OAAO;YACP,aAAa,EAAE,YAAY;YAC3B,WAAW;SACd,CAAC;aACD,MAAM,EAAE,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,OAAe;QACzC,OAAO,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,eAAe,CAAC;aAC5B,KAAK,CAAC;YACH,OAAO;SACV,CAAC;aACD,MAAM,EAAE,CAAC;IAClB,CAAC;CACJ;AAnRD,kCAmRC"}
|
|
@@ -9,6 +9,7 @@ export declare class ApiTokenStore implements IApiTokenStore {
|
|
|
9
9
|
private timer;
|
|
10
10
|
private db;
|
|
11
11
|
constructor(db: Knex, eventBus: EventEmitter, getLogger: LogProvider);
|
|
12
|
+
count(): Promise<number>;
|
|
12
13
|
getAll(): Promise<IApiToken[]>;
|
|
13
14
|
getAllActive(): Promise<IApiToken[]>;
|
|
14
15
|
insert(newToken: IApiTokenCreate): Promise<IApiToken>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-token-store.js","sourceRoot":"","sources":["../../../src/lib/db/api-token-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api-token-store.js","sourceRoot":"","sources":["../../../src/lib/db/api-token-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -135,9 +135,6 @@ class FeatureToggleStore {
|
|
|
135
135
|
project,
|
|
136
136
|
archived: data.archived || false,
|
|
137
137
|
stale: data.stale,
|
|
138
|
-
variants: data.variants
|
|
139
|
-
? JSON.stringify(data.variants.sort((a, b) => a.name.localeCompare(b.name)))
|
|
140
|
-
: JSON.stringify([]),
|
|
141
138
|
created_at: data.createdAt,
|
|
142
139
|
};
|
|
143
140
|
if (!row.created_at) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-toggle-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-toggle-store.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"feature-toggle-store.js","sourceRoot":"","sources":["../../../src/lib/db/feature-toggle-store.ts"],"names":[],"mappings":";;;;;AAEA,4EAAmD;AACnD,oDAA2C;AAC3C,6EAAoD;AAKpD,MAAM,eAAe,GAAG;IACpB,MAAM;IACN,aAAa;IACb,MAAM;IACN,SAAS;IACT,OAAO;IACP,UAAU;IACV,YAAY;IACZ,cAAc;CACjB,CAAC;AAaF,MAAM,KAAK,GAAG,UAAU,CAAC;AAEzB,MAAqB,kBAAkB;IAOnC,YAAY,EAAQ,EAAE,QAAsB,EAAE,SAAsB;QAChE,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,yBAAyB,CAAC,CAAC;QACnD,IAAI,CAAC,KAAK,GAAG,CAAC,MAAM,EAAE,EAAE,CACpB,wBAAa,CAAC,SAAS,CAAC,QAAQ,EAAE,uBAAO,EAAE;YACvC,KAAK,EAAE,gBAAgB;YACvB,MAAM;SACT,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,KAAK,CACP,QAII,EAAE,QAAQ,EAAE,KAAK,EAAE;QAEvB,OAAO,IAAI,CAAC,EAAE;aACT,KAAK,CAAC,GAAG,CAAC;aACV,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,KAAK,CAAC;aACZ,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;IAC/B,CAAC;IAED,OAAO,KAAU,CAAC;IAElB,KAAK,CAAC,GAAG,CAAC,IAAY;QAClB,OAAO,IAAI,CAAC,EAAE;aACT,KAAK,CAAC,eAAe,CAAC;aACtB,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;aACf,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,MAAM,CACR,QAII,EAAE,QAAQ,EAAE,KAAK,EAAE;QAEvB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,eAAe,CAAC;aACvB,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,KAAK,CAAC,CAAC;QAClB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,QAAiB;QAC/B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,eAAe,CAAC;aACvB,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;QACzB,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,YAAY,CAAC,IAAY;QAC3B,OAAO,IAAI,CAAC,EAAE;aACT,KAAK,CAAC,CAAC,SAAS,CAAC,CAAC;aAClB,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;aACf,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aACxC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YACrB,OAAO,SAAS,CAAC;QACrB,CAAC,CAAC,CAAC;IACX,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,GAAG,CAC5B,kEAAkE,EAClE,CAAC,IAAI,CAAC,CACT,CAAC;QACF,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,OAAO,CAAC;IACnB,CAAC;IAED,KAAK,CAAC,mBAAmB;QACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE;aACrB,MAAM,CAAC,eAAe,CAAC;aACvB,IAAI,CAAC,KAAK,CAAC;aACX,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aACzB,OAAO,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAqB;QACnC,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI;YACA,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;iBACf,MAAM,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;iBAC7B,OAAO,CACJ,MAAM,EACN,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;iBACT,MAAM,CAAC,MAAM,CAAC;iBACd,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC;iBAC5B,SAAS,EAAE;iBACX,UAAU,EAAE,CACpB,CAAC;SACT;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,oCAAoC,EAAE,GAAG,CAAC,CAAC;SAChE;IACL,CAAC;IAED,YAAY,CAAC,GAAkB;QAC3B,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,wBAAa,CAAC,yBAAyB,CAAC,CAAC;SACtD;QACD,MAAM,cAAc,GAAI,GAAG,CAAC,QAAkC,IAAI,EAAE,CAAC;QACrE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAC5D,OAAO;YACH,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,WAAW,EAAE,GAAG,CAAC,WAAW;YAC5B,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,OAAO,EAAE,GAAG,CAAC,OAAO;YACpB,KAAK,EAAE,GAAG,CAAC,KAAK;YAChB,QAAQ,EAAE,cAAc;YACxB,SAAS,EAAE,GAAG,CAAC,UAAU;YACzB,UAAU,EAAE,GAAG,CAAC,YAAY;SAC/B,CAAC;IACN,CAAC;IAED,aAAa,CAAC,GAAkB;QAC5B,IAAI,CAAC,GAAG,EAAE;YACN,MAAM,IAAI,wBAAa,CAAC,yBAAyB,CAAC,CAAC;SACtD;QACD,MAAM,cAAc,GAAI,GAAG,CAAC,QAAkC,IAAI,EAAE,CAAC;QACrE,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QAE5D,OAAO,cAAc,CAAC;IAC1B,CAAC;IAED,QAAQ,CAAC,OAAe,EAAE,IAAsB;QAC5C,MAAM,GAAG,GAAG;YACR,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO;YACP,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,KAAK;YAChC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,UAAU,EAAE,IAAI,CAAC,SAAS;SAC7B,CAAC;QACF,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;YACjB,OAAO,GAAG,CAAC,UAAU,CAAC;SACzB;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAED,KAAK,CAAC,MAAM,CACR,OAAe,EACf,IAAsB;QAEtB,IAAI;YACA,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;iBAC3B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;iBACpC,SAAS,CAAC,eAAe,CAAC,CAAC;YAEhC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SACpC;QAAC,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mCAAmC,EAAE,GAAG,CAAC,CAAC;SAC/D;QACD,OAAO,SAAS,CAAC;IACrB,CAAC;IAED,KAAK,CAAC,MAAM,CACR,OAAe,EACf,IAAsB;QAEtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC3B,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;aAC1B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;aACpC,SAAS,CAAC,eAAe,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAY;QACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC3B,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;aACf,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;aAC1B,SAAS,CAAC,eAAe,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aACf,KAAK,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,oDAAoD;aACpF,GAAG,EAAE,CAAC;IACf,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAY;QACrB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC3B,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC;aACf,MAAM,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;aAC3B,SAAS,CAAC,eAAe,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,WAAmB;QACjC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC3B,MAAM,CAAC,UAAU,CAAC;aAClB,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,YAAY,CACd,OAAe,EACf,WAAmB,EACnB,WAAuB;QAEvB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC;aAC3B,MAAM,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,CAAC;aACjD,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;aAC9C,SAAS,CAAC,eAAe,CAAC,CAAC;QAChC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC;CACJ;AAvOD,qCAuOC;AAED,MAAM,CAAC,OAAO,GAAG,kBAAkB,CAAC"}
|
|
@@ -11,7 +11,7 @@ const oss_authentication_1 = __importDefault(require("./oss-authentication"));
|
|
|
11
11
|
const app_1 = __importDefault(require("../app"));
|
|
12
12
|
const user_1 = __importDefault(require("../types/user"));
|
|
13
13
|
const session_db_1 = __importDefault(require("./session-db"));
|
|
14
|
-
function getSetup(preRouterHook) {
|
|
14
|
+
async function getSetup(preRouterHook) {
|
|
15
15
|
const base = `/random${Math.round(Math.random() * 1000)}`;
|
|
16
16
|
const config = (0, test_config_1.createTestConfig)({
|
|
17
17
|
server: { baseUriPath: base },
|
|
@@ -26,21 +26,21 @@ function getSetup(preRouterHook) {
|
|
|
26
26
|
const stores = (0, store_1.default)();
|
|
27
27
|
const services = (0, services_1.createServices)(stores, config);
|
|
28
28
|
const unleashSession = (0, session_db_1.default)(config, undefined);
|
|
29
|
-
const app = (0, app_1.default)(config, stores, services, unleashSession);
|
|
29
|
+
const app = await (0, app_1.default)(config, stores, services, unleashSession);
|
|
30
30
|
return {
|
|
31
31
|
base,
|
|
32
32
|
request: (0, supertest_1.default)(app),
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
-
test('should return 401 when missing user', () => {
|
|
35
|
+
test('should return 401 when missing user', async () => {
|
|
36
36
|
expect.assertions(0);
|
|
37
|
-
const { base, request } = getSetup(() => { });
|
|
37
|
+
const { base, request } = await getSetup(() => { });
|
|
38
38
|
return request.get(`${base}/api/protectedResource`).expect(401);
|
|
39
39
|
});
|
|
40
|
-
test('should return 200 when user exists', () => {
|
|
40
|
+
test('should return 200 when user exists', async () => {
|
|
41
41
|
expect.assertions(0);
|
|
42
42
|
const user = new user_1.default({ id: 1, email: 'some@mail.com' });
|
|
43
|
-
const { base, request } = getSetup((app) => app.use((req, res, next) => {
|
|
43
|
+
const { base, request } = await getSetup((app) => app.use((req, res, next) => {
|
|
44
44
|
req.user = user;
|
|
45
45
|
next();
|
|
46
46
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oss-authentication.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/oss-authentication.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0CAA6C;AAC7C,+DAAiE;AAEjE,sEAAqD;AACrD,8EAA2C;AAC3C,iDAA4B;AAC5B,yDAAiC;AACjC,8DAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"oss-authentication.test.js","sourceRoot":"","sources":["../../../src/lib/middleware/oss-authentication.test.ts"],"names":[],"mappings":";;;;;AAAA,0DAAkC;AAClC,0CAA6C;AAC7C,+DAAiE;AAEjE,sEAAqD;AACrD,8EAA2C;AAC3C,iDAA4B;AAC5B,yDAAiC;AACjC,8DAAqC;AAErC,KAAK,UAAU,QAAQ,CAAC,aAAa;IACjC,MAAM,IAAI,GAAG,UAAU,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IAC1D,MAAM,MAAM,GAAG,IAAA,8BAAgB,EAAC;QAC5B,MAAM,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;QAC7B,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE;YACpB,aAAa,CAAC,IAAI,CAAC,CAAC;YACpB,IAAA,4BAAO,EAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACpB,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,wBAAwB,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACnD,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;YAClD,CAAC,CAAC,CAAC;QACP,CAAC;KACJ,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,IAAA,eAAY,GAAE,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAA,yBAAc,EAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,MAAM,cAAc,GAAG,IAAA,oBAAS,EAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpD,MAAM,GAAG,GAAG,MAAM,IAAA,aAAM,EAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAC;IAEnE,OAAO;QACH,IAAI;QACJ,OAAO,EAAE,IAAA,mBAAS,EAAC,GAAG,CAAC;KAC1B,CAAC;AACN,CAAC;AAED,IAAI,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;IACnD,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,QAAQ,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;IAEnD,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,wBAAwB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC;AAEH,IAAI,CAAC,oCAAoC,EAAE,KAAK,IAAI,EAAE;IAClD,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrB,MAAM,IAAI,GAAG,IAAI,cAAI,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC,CAAC;IACzD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,QAAQ,CAAC,CAAC,GAAG,EAAE,EAAE,CAC7C,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACvB,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAChB,IAAI,EAAE,CAAC;IACX,CAAC,CAAC,CACL,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,wBAAwB,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AACpE,CAAC,CAAC,CAAC"}
|
|
@@ -15,23 +15,31 @@ const secureHeaders = (config) => {
|
|
|
15
15
|
},
|
|
16
16
|
contentSecurityPolicy: {
|
|
17
17
|
directives: {
|
|
18
|
-
defaultSrc: ["'self'"],
|
|
18
|
+
defaultSrc: ["'self'", 'cdn.getunleash.io', 'gravatar.com'],
|
|
19
19
|
fontSrc: [
|
|
20
20
|
"'self'",
|
|
21
|
+
'cdn.getunleash.io',
|
|
21
22
|
'fonts.googleapis.com',
|
|
22
23
|
'fonts.gstatic.com',
|
|
23
24
|
],
|
|
24
25
|
styleSrc: [
|
|
25
26
|
"'self'",
|
|
26
27
|
"'unsafe-inline'",
|
|
28
|
+
'cdn.getunleash.io',
|
|
27
29
|
'fonts.googleapis.com',
|
|
28
30
|
'fonts.gstatic.com',
|
|
29
31
|
'data:',
|
|
30
32
|
],
|
|
31
|
-
scriptSrc: ["'self'"],
|
|
32
|
-
imgSrc: [
|
|
33
|
+
scriptSrc: ["'self'", 'cdn.getunleash.io'],
|
|
34
|
+
imgSrc: [
|
|
35
|
+
"'self'",
|
|
36
|
+
'data:',
|
|
37
|
+
'cdn.getunleash.io',
|
|
38
|
+
'gravatar.com',
|
|
39
|
+
],
|
|
33
40
|
},
|
|
34
41
|
},
|
|
42
|
+
crossOriginEmbedderPolicy: false,
|
|
35
43
|
});
|
|
36
44
|
}
|
|
37
45
|
return (req, res, next) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"secure-headers.js","sourceRoot":"","sources":["../../../src/lib/middleware/secure-headers.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAG5B,uCAA0C;AAE1C,MAAM,aAAa,GAA+C,CAAC,MAAM,EAAE,EAAE;IACzE,IAAI,MAAM,CAAC,aAAa,EAAE;QACtB,OAAO,IAAA,gBAAM,EAAC;YACV,IAAI,EAAE;gBACF,MAAM,EAAE,IAAA,yBAAc,EAAC,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;gBACpC,iBAAiB,EAAE,IAAI;gBACvB,OAAO,EAAE,IAAI;aAChB;YACD,qBAAqB,EAAE;gBACnB,UAAU,EAAE;oBACR,UAAU,EAAE,CAAC,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"secure-headers.js","sourceRoot":"","sources":["../../../src/lib/middleware/secure-headers.ts"],"names":[],"mappings":";;;;;AAAA,oDAA4B;AAG5B,uCAA0C;AAE1C,MAAM,aAAa,GAA+C,CAAC,MAAM,EAAE,EAAE;IACzE,IAAI,MAAM,CAAC,aAAa,EAAE;QACtB,OAAO,IAAA,gBAAM,EAAC;YACV,IAAI,EAAE;gBACF,MAAM,EAAE,IAAA,yBAAc,EAAC,EAAE,GAAG,GAAG,GAAG,CAAC,CAAC;gBACpC,iBAAiB,EAAE,IAAI;gBACvB,OAAO,EAAE,IAAI;aAChB;YACD,qBAAqB,EAAE;gBACnB,UAAU,EAAE;oBACR,UAAU,EAAE,CAAC,QAAQ,EAAE,mBAAmB,EAAE,cAAc,CAAC;oBAC3D,OAAO,EAAE;wBACL,QAAQ;wBACR,mBAAmB;wBACnB,sBAAsB;wBACtB,mBAAmB;qBACtB;oBACD,QAAQ,EAAE;wBACN,QAAQ;wBACR,iBAAiB;wBACjB,mBAAmB;wBACnB,sBAAsB;wBACtB,mBAAmB;wBACnB,OAAO;qBACV;oBACD,SAAS,EAAE,CAAC,QAAQ,EAAE,mBAAmB,CAAC;oBAC1C,MAAM,EAAE;wBACJ,QAAQ;wBACR,OAAO;wBACP,mBAAmB;wBACnB,cAAc;qBACjB;iBACJ;aACJ;YACD,yBAAyB,EAAE,KAAK;SACnC,CAAC,CAAC;KACN;IACD,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,EAAE;QACtB,IAAI,EAAE,CAAC;IACX,CAAC,CAAC;AACN,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|