@nodestackapp/server 2.5.0 → 2.7.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 +42 -28
- package/dist/NodeStack.d.ts +5 -1
- package/dist/NodeStack.d.ts.map +1 -1
- package/dist/NodeStack.js +117 -18
- package/dist/NodeStack.js.map +1 -1
- package/dist/admin/AdminUIBundler.d.ts.map +1 -1
- package/dist/admin/AdminUIBundler.js +2 -0
- package/dist/admin/AdminUIBundler.js.map +1 -1
- package/dist/admin/ui/css/main.css +40 -3
- package/dist/admin/ui/css/webhooks.css +8 -0
- package/dist/admin/ui/index.html +21479 -17251
- package/dist/admin/ui/js/api-keys.js +1381 -0
- package/dist/admin/ui/js/api.js +8 -0
- package/dist/admin/ui/js/app.js +698 -641
- package/dist/admin/ui/js/apps.js +514 -489
- package/dist/admin/ui/js/collections.js +486 -484
- package/dist/admin/ui/js/command-palette.js +693 -673
- package/dist/admin/ui/js/cron.js +1706 -0
- package/dist/admin/ui/js/database.js +10 -0
- package/dist/admin/ui/js/flows-designer.js +1219 -1076
- package/dist/admin/ui/js/flows.js +947 -890
- package/dist/admin/ui/js/functions-tester.js +1 -1
- package/dist/admin/ui/js/functions-workbench.js +1162 -1101
- package/dist/admin/ui/js/functions.js +983 -979
- package/dist/admin/ui/js/rules.js +1080 -775
- package/dist/admin/ui/js/schema.js +346 -304
- package/dist/admin/ui/js/snapshots.js +338 -0
- package/dist/admin/ui/js/views.js +1 -1
- package/dist/apps/AppManager.d.ts +1 -1
- package/dist/apps/AppManager.d.ts.map +1 -1
- package/dist/apps/AppManager.js +11 -21
- package/dist/apps/AppManager.js.map +1 -1
- package/dist/apps/AppRegistry.d.ts +1 -0
- package/dist/apps/AppRegistry.d.ts.map +1 -1
- package/dist/apps/AppRegistry.js +78 -23
- package/dist/apps/AppRegistry.js.map +1 -1
- package/dist/apps/AppScope.d.ts +2 -1
- package/dist/apps/AppScope.d.ts.map +1 -1
- package/dist/apps/AppScope.js +27 -17
- package/dist/apps/AppScope.js.map +1 -1
- package/dist/auth/ApiKeyService.d.ts +63 -2
- package/dist/auth/ApiKeyService.d.ts.map +1 -1
- package/dist/auth/ApiKeyService.js +518 -8
- package/dist/auth/ApiKeyService.js.map +1 -1
- package/dist/auth/AuthService.d.ts +30 -1
- package/dist/auth/AuthService.d.ts.map +1 -1
- package/dist/auth/AuthService.js +468 -65
- package/dist/auth/AuthService.js.map +1 -1
- package/dist/auth/oauth/AppleProvider.d.ts +2 -0
- package/dist/auth/oauth/AppleProvider.d.ts.map +1 -1
- package/dist/auth/oauth/AppleProvider.js +40 -3
- package/dist/auth/oauth/AppleProvider.js.map +1 -1
- package/dist/auth/oauth/BaseOAuthProvider.d.ts +3 -2
- package/dist/auth/oauth/BaseOAuthProvider.d.ts.map +1 -1
- package/dist/auth/oauth/BaseOAuthProvider.js +29 -3
- package/dist/auth/oauth/BaseOAuthProvider.js.map +1 -1
- package/dist/auth/oauth/DiscordProvider.d.ts.map +1 -1
- package/dist/auth/oauth/DiscordProvider.js +4 -1
- package/dist/auth/oauth/DiscordProvider.js.map +1 -1
- package/dist/auth/oauth/GitHubProvider.d.ts.map +1 -1
- package/dist/auth/oauth/GitHubProvider.js +4 -1
- package/dist/auth/oauth/GitHubProvider.js.map +1 -1
- package/dist/auth/oauth/GoogleProvider.d.ts.map +1 -1
- package/dist/auth/oauth/GoogleProvider.js +4 -1
- package/dist/auth/oauth/GoogleProvider.js.map +1 -1
- package/dist/auth/oauth/MicrosoftProvider.d.ts.map +1 -1
- package/dist/auth/oauth/MicrosoftProvider.js +4 -1
- package/dist/auth/oauth/MicrosoftProvider.js.map +1 -1
- package/dist/auth/oauth/OAuthProviderRegistry.d.ts +6 -2
- package/dist/auth/oauth/OAuthProviderRegistry.d.ts.map +1 -1
- package/dist/auth/oauth/OAuthProviderRegistry.js +25 -10
- package/dist/auth/oauth/OAuthProviderRegistry.js.map +1 -1
- package/dist/auth/oauth/types.d.ts +4 -2
- package/dist/auth/oauth/types.d.ts.map +1 -1
- package/dist/cli/cli.d.ts.map +1 -1
- package/dist/cli/cli.js +228 -12
- package/dist/cli/cli.js.map +1 -1
- package/dist/core/config/ConfigService.d.ts.map +1 -1
- package/dist/core/config/ConfigService.js +5 -3
- package/dist/core/config/ConfigService.js.map +1 -1
- package/dist/core/config/EnvLoader.d.ts +14 -0
- package/dist/core/config/EnvLoader.d.ts.map +1 -1
- package/dist/core/config/EnvLoader.js +44 -0
- package/dist/core/config/EnvLoader.js.map +1 -1
- package/dist/core/container/Container.d.ts +14 -0
- package/dist/core/container/Container.d.ts.map +1 -1
- package/dist/core/container/Container.js +32 -0
- package/dist/core/container/Container.js.map +1 -1
- package/dist/core/container/Tokens.d.ts +2 -0
- package/dist/core/container/Tokens.d.ts.map +1 -1
- package/dist/core/container/Tokens.js +2 -0
- package/dist/core/container/Tokens.js.map +1 -1
- package/dist/core/errors/AppError.d.ts +7 -7
- package/dist/core/errors/AppError.d.ts.map +1 -1
- package/dist/core/errors/AppError.js +18 -14
- package/dist/core/errors/AppError.js.map +1 -1
- package/dist/core/events/EventBus.d.ts.map +1 -1
- package/dist/core/events/EventBus.js +36 -6
- package/dist/core/events/EventBus.js.map +1 -1
- package/dist/core/maintenance/MaintenanceGate.d.ts +47 -0
- package/dist/core/maintenance/MaintenanceGate.d.ts.map +1 -1
- package/dist/core/maintenance/MaintenanceGate.js +265 -7
- package/dist/core/maintenance/MaintenanceGate.js.map +1 -1
- package/dist/core/plugins/PluginManager.d.ts +20 -1
- package/dist/core/plugins/PluginManager.d.ts.map +1 -1
- package/dist/core/plugins/PluginManager.js +231 -146
- package/dist/core/plugins/PluginManager.js.map +1 -1
- package/dist/core/plugins/types.d.ts +48 -31
- package/dist/core/plugins/types.d.ts.map +1 -1
- package/dist/cron/CronParser.d.ts +83 -0
- package/dist/cron/CronParser.d.ts.map +1 -0
- package/dist/cron/CronParser.js +538 -0
- package/dist/cron/CronParser.js.map +1 -0
- package/dist/cron/CronService.d.ts +74 -0
- package/dist/cron/CronService.d.ts.map +1 -0
- package/dist/cron/CronService.js +1254 -0
- package/dist/cron/CronService.js.map +1 -0
- package/dist/cron/types.d.ts +98 -0
- package/dist/cron/types.d.ts.map +1 -0
- package/dist/cron/types.js +3 -0
- package/dist/cron/types.js.map +1 -0
- package/dist/database/DatabaseService.d.ts +4 -1
- package/dist/database/DatabaseService.d.ts.map +1 -1
- package/dist/database/DatabaseService.js +34 -9
- package/dist/database/DatabaseService.js.map +1 -1
- package/dist/database/config/DatabaseConfigService.d.ts +1 -0
- package/dist/database/config/DatabaseConfigService.d.ts.map +1 -1
- package/dist/database/config/DatabaseConfigService.js +4 -2
- package/dist/database/config/DatabaseConfigService.js.map +1 -1
- package/dist/database/drivers/DriverPackageLoader.d.ts +11 -0
- package/dist/database/drivers/DriverPackageLoader.d.ts.map +1 -0
- package/dist/database/drivers/DriverPackageLoader.js +112 -0
- package/dist/database/drivers/DriverPackageLoader.js.map +1 -0
- package/dist/database/drivers/DriverRegistry.d.ts +1 -0
- package/dist/database/drivers/DriverRegistry.d.ts.map +1 -1
- package/dist/database/drivers/DriverRegistry.js +29 -0
- package/dist/database/drivers/DriverRegistry.js.map +1 -1
- package/dist/database/drivers/IDatabaseDriver.d.ts +1 -0
- package/dist/database/drivers/IDatabaseDriver.d.ts.map +1 -1
- package/dist/database/drivers/MssqlDriver.d.ts.map +1 -1
- package/dist/database/drivers/MssqlDriver.js +10 -5
- package/dist/database/drivers/MssqlDriver.js.map +1 -1
- package/dist/database/drivers/NodeSqliteDriver.d.ts.map +1 -1
- package/dist/database/drivers/NodeSqliteDriver.js +15 -1
- package/dist/database/drivers/NodeSqliteDriver.js.map +1 -1
- package/dist/database/drivers/PostgresDriver.d.ts.map +1 -1
- package/dist/database/drivers/PostgresDriver.js +4 -5
- package/dist/database/drivers/PostgresDriver.js.map +1 -1
- package/dist/database/migration/DatabaseMigrationService.d.ts +1 -0
- package/dist/database/migration/DatabaseMigrationService.d.ts.map +1 -1
- package/dist/database/migration/DatabaseMigrationService.js +51 -0
- package/dist/database/migration/DatabaseMigrationService.js.map +1 -1
- package/dist/database/migrations/SystemMigrations.d.ts.map +1 -1
- package/dist/database/migrations/SystemMigrations.js +200 -5
- package/dist/database/migrations/SystemMigrations.js.map +1 -1
- package/dist/flows/FlowEngine.js.map +1 -1
- package/dist/flows/FlowService.d.ts +10 -1
- package/dist/flows/FlowService.d.ts.map +1 -1
- package/dist/flows/FlowService.js +227 -14
- package/dist/flows/FlowService.js.map +1 -1
- package/dist/flows/FlowValidator.d.ts +2 -1
- package/dist/flows/FlowValidator.d.ts.map +1 -1
- package/dist/flows/FlowValidator.js +89 -4
- package/dist/flows/FlowValidator.js.map +1 -1
- package/dist/flows/types.d.ts +20 -3
- package/dist/flows/types.d.ts.map +1 -1
- package/dist/functions/FunctionService.d.ts +10 -2
- package/dist/functions/FunctionService.d.ts.map +1 -1
- package/dist/functions/FunctionService.js +271 -37
- package/dist/functions/FunctionService.js.map +1 -1
- package/dist/functions/runtime/QuickJsWasmRuntime.d.ts.map +1 -1
- package/dist/functions/runtime/QuickJsWasmRuntime.js +189 -177
- package/dist/functions/runtime/QuickJsWasmRuntime.js.map +1 -1
- package/dist/functions/types.d.ts +31 -2
- package/dist/functions/types.d.ts.map +1 -1
- package/dist/http/HttpServer.d.ts +7 -1
- package/dist/http/HttpServer.d.ts.map +1 -1
- package/dist/http/HttpServer.js +187 -8
- package/dist/http/HttpServer.js.map +1 -1
- package/dist/http/controllers/ApiKeyController.d.ts +1 -0
- package/dist/http/controllers/ApiKeyController.d.ts.map +1 -1
- package/dist/http/controllers/ApiKeyController.js +47 -1
- package/dist/http/controllers/ApiKeyController.js.map +1 -1
- package/dist/http/controllers/AuthController.d.ts +12 -0
- package/dist/http/controllers/AuthController.d.ts.map +1 -1
- package/dist/http/controllers/AuthController.js +40 -2
- package/dist/http/controllers/AuthController.js.map +1 -1
- package/dist/http/controllers/CronController.d.ts +63 -0
- package/dist/http/controllers/CronController.d.ts.map +1 -0
- package/dist/http/controllers/CronController.js +92 -0
- package/dist/http/controllers/CronController.js.map +1 -0
- package/dist/http/controllers/DatabaseController.d.ts.map +1 -1
- package/dist/http/controllers/DatabaseController.js +53 -0
- package/dist/http/controllers/DatabaseController.js.map +1 -1
- package/dist/http/controllers/FlowController.d.ts.map +1 -1
- package/dist/http/controllers/FlowController.js +45 -4
- package/dist/http/controllers/FlowController.js.map +1 -1
- package/dist/http/controllers/FunctionController.d.ts.map +1 -1
- package/dist/http/controllers/FunctionController.js +16 -2
- package/dist/http/controllers/FunctionController.js.map +1 -1
- package/dist/http/controllers/HealthController.js +2 -2
- package/dist/http/middleware/AppResolutionMiddleware.d.ts +1 -1
- package/dist/http/middleware/AppResolutionMiddleware.d.ts.map +1 -1
- package/dist/http/middleware/AppResolutionMiddleware.js +2 -3
- package/dist/http/middleware/AppResolutionMiddleware.js.map +1 -1
- package/dist/http/middleware/AuthMiddleware.d.ts.map +1 -1
- package/dist/http/middleware/AuthMiddleware.js +6 -3
- package/dist/http/middleware/AuthMiddleware.js.map +1 -1
- package/dist/http/middleware/ChaosMiddleware.js +6 -6
- package/dist/http/middleware/ChaosMiddleware.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +6 -2
- package/dist/index.js.map +1 -1
- package/dist/queue/QueueService.d.ts +9 -0
- package/dist/queue/QueueService.d.ts.map +1 -1
- package/dist/queue/QueueService.js +143 -60
- package/dist/queue/QueueService.js.map +1 -1
- package/dist/queue/drivers/SqliteQueueDriver.d.ts +3 -0
- package/dist/queue/drivers/SqliteQueueDriver.d.ts.map +1 -1
- package/dist/queue/drivers/SqliteQueueDriver.js +315 -255
- package/dist/queue/drivers/SqliteQueueDriver.js.map +1 -1
- package/dist/records/FtsService.d.ts +7 -3
- package/dist/records/FtsService.d.ts.map +1 -1
- package/dist/records/FtsService.js +69 -5
- package/dist/records/FtsService.js.map +1 -1
- package/dist/records/QueryFilterParser.d.ts.map +1 -1
- package/dist/records/QueryFilterParser.js +58 -20
- package/dist/records/QueryFilterParser.js.map +1 -1
- package/dist/records/RecordSanitizer.d.ts.map +1 -1
- package/dist/records/RecordSanitizer.js +32 -4
- package/dist/records/RecordSanitizer.js.map +1 -1
- package/dist/records/RecordService.d.ts +6 -0
- package/dist/records/RecordService.d.ts.map +1 -1
- package/dist/records/RecordService.js +95 -14
- package/dist/records/RecordService.js.map +1 -1
- package/dist/records/RecordValidator.d.ts +10 -0
- package/dist/records/RecordValidator.d.ts.map +1 -1
- package/dist/records/RecordValidator.js +110 -2
- package/dist/records/RecordValidator.js.map +1 -1
- package/dist/records/fts/IFtsDriver.d.ts +7 -6
- package/dist/records/fts/IFtsDriver.d.ts.map +1 -1
- package/dist/records/fts/MssqlFtsDriver.d.ts +5 -1
- package/dist/records/fts/MssqlFtsDriver.d.ts.map +1 -1
- package/dist/records/fts/MssqlFtsDriver.js +35 -3
- package/dist/records/fts/MssqlFtsDriver.js.map +1 -1
- package/dist/records/fts/PostgresFtsDriver.d.ts +9 -2
- package/dist/records/fts/PostgresFtsDriver.d.ts.map +1 -1
- package/dist/records/fts/PostgresFtsDriver.js +116 -11
- package/dist/records/fts/PostgresFtsDriver.js.map +1 -1
- package/dist/records/fts/SqliteFts5Driver.d.ts +7 -1
- package/dist/records/fts/SqliteFts5Driver.d.ts.map +1 -1
- package/dist/records/fts/SqliteFts5Driver.js +66 -6
- package/dist/records/fts/SqliteFts5Driver.js.map +1 -1
- package/dist/schema/OpenApiGenerator.d.ts.map +1 -1
- package/dist/schema/OpenApiGenerator.js +103 -3
- package/dist/schema/OpenApiGenerator.js.map +1 -1
- package/dist/schema/models/Field.d.ts +1 -0
- package/dist/schema/models/Field.d.ts.map +1 -1
- package/dist/snapshots/SnapshotService.d.ts.map +1 -1
- package/dist/snapshots/SnapshotService.js +21 -9
- package/dist/snapshots/SnapshotService.js.map +1 -1
- package/dist/snapshots/drivers/LogicalSnapshotDriver.d.ts.map +1 -1
- package/dist/snapshots/drivers/LogicalSnapshotDriver.js +2 -0
- package/dist/snapshots/drivers/LogicalSnapshotDriver.js.map +1 -1
- package/dist/templates/definitions/ecommerce.js +6 -6
- package/dist/templates/definitions/ecommerce.js.map +1 -1
- package/dist/webhooks/WebhookService.js +1 -1
- package/package.json +5 -3
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ApiKeyController = void 0;
|
|
4
4
|
const BaseController_1 = require("./BaseController");
|
|
5
|
+
const AppError_1 = require("../../core/errors/AppError");
|
|
5
6
|
class ApiKeyController extends BaseController_1.BaseController {
|
|
6
7
|
apiKeyService;
|
|
7
8
|
constructor(apiKeyService) {
|
|
@@ -13,7 +14,39 @@ class ApiKeyController extends BaseController_1.BaseController {
|
|
|
13
14
|
}
|
|
14
15
|
async list(req, reply) {
|
|
15
16
|
const service = this.getService(req);
|
|
16
|
-
const
|
|
17
|
+
const query = req.query || {};
|
|
18
|
+
let limit;
|
|
19
|
+
if (query.limit !== undefined && query.limit !== '') {
|
|
20
|
+
const raw = typeof query.limit === 'string' ? query.limit.trim() : query.limit;
|
|
21
|
+
if (typeof raw === 'string' && !/^\+?\d+$/.test(raw)) {
|
|
22
|
+
throw new AppError_1.AppError("Query parameter 'limit' must be an integer", 400);
|
|
23
|
+
}
|
|
24
|
+
const num = Number(raw);
|
|
25
|
+
if (!Number.isInteger(num) || num < 1) {
|
|
26
|
+
throw new AppError_1.AppError("Query parameter 'limit' must be a positive integer", 400);
|
|
27
|
+
}
|
|
28
|
+
limit = num;
|
|
29
|
+
}
|
|
30
|
+
let offset;
|
|
31
|
+
if (query.offset !== undefined && query.offset !== '') {
|
|
32
|
+
const raw = typeof query.offset === 'string' ? query.offset.trim() : query.offset;
|
|
33
|
+
if (typeof raw === 'string' && !/^\+?\d+$/.test(raw)) {
|
|
34
|
+
throw new AppError_1.AppError("Query parameter 'offset' must be an integer", 400);
|
|
35
|
+
}
|
|
36
|
+
const num = Number(raw);
|
|
37
|
+
if (!Number.isInteger(num) || num < 0) {
|
|
38
|
+
throw new AppError_1.AppError("Query parameter 'offset' must be a non-negative integer", 400);
|
|
39
|
+
}
|
|
40
|
+
offset = num;
|
|
41
|
+
}
|
|
42
|
+
if (query.status && !['active', 'revoked', 'expired'].includes(query.status)) {
|
|
43
|
+
throw new AppError_1.AppError("Query parameter 'status' must be one of: active, revoked, expired", 400);
|
|
44
|
+
}
|
|
45
|
+
const keys = await service.listKeys({
|
|
46
|
+
limit,
|
|
47
|
+
offset,
|
|
48
|
+
status: query.status,
|
|
49
|
+
});
|
|
17
50
|
this.ok(reply, keys);
|
|
18
51
|
}
|
|
19
52
|
async create(req, reply) {
|
|
@@ -47,6 +80,19 @@ class ApiKeyController extends BaseController_1.BaseController {
|
|
|
47
80
|
const result = await service.rotateKey(req.params.id);
|
|
48
81
|
this.ok(reply, result);
|
|
49
82
|
}
|
|
83
|
+
async simulate(req, reply) {
|
|
84
|
+
const service = this.getService(req);
|
|
85
|
+
const body = req.body || {};
|
|
86
|
+
const keyId = req.params?.id || body.keyId;
|
|
87
|
+
const appScope = req?.appScope;
|
|
88
|
+
const appSlug = req.params?.appId || appScope?.app?.slug || appScope?.app?.id;
|
|
89
|
+
const result = await service.simulate({
|
|
90
|
+
...body,
|
|
91
|
+
keyId,
|
|
92
|
+
appSlug: appSlug && appSlug !== 'default' ? appSlug : body.appSlug,
|
|
93
|
+
});
|
|
94
|
+
this.ok(reply, result);
|
|
95
|
+
}
|
|
50
96
|
}
|
|
51
97
|
exports.ApiKeyController = ApiKeyController;
|
|
52
98
|
//# sourceMappingURL=ApiKeyController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiKeyController.js","sourceRoot":"","sources":["../../../src/http/controllers/ApiKeyController.ts"],"names":[],"mappings":";;;AACA,qDAAkD;
|
|
1
|
+
{"version":3,"file":"ApiKeyController.js","sourceRoot":"","sources":["../../../src/http/controllers/ApiKeyController.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,5 +45,17 @@ export declare class AuthController extends BaseController {
|
|
|
45
45
|
provider: string;
|
|
46
46
|
};
|
|
47
47
|
}>, reply: FastifyReply): Promise<void>;
|
|
48
|
+
requestVerification(req: FastifyRequest<{
|
|
49
|
+
Params: {
|
|
50
|
+
collection: string;
|
|
51
|
+
};
|
|
52
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
53
|
+
confirmVerification(req: FastifyRequest<{
|
|
54
|
+
Params: {
|
|
55
|
+
collection: string;
|
|
56
|
+
};
|
|
57
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
58
|
+
requestAdminVerification(req: FastifyRequest, reply: FastifyReply): Promise<void>;
|
|
59
|
+
confirmAdminVerification(req: FastifyRequest, reply: FastifyReply): Promise<void>;
|
|
48
60
|
}
|
|
49
61
|
//# sourceMappingURL=AuthController.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/AuthController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,qBAAa,cAAe,SAAQ,cAAc;IAE9C,OAAO,CAAC,WAAW;IACnB,OAAO,CAAC,kBAAkB,CAAC;IAF7B,YACU,WAAW,EAAE,WAAW,EACxB,kBAAkB,CAAC,EAAE,GAAG,EAGjC;IAED,OAAO,CAAC,OAAO;IAIf,OAAO,CAAC,QAAQ;IAIhB,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAoC;mBAE/C,oBAAoB;IAe5B,SAAS,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAI9E;IAEY,kBAAkB,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBvF;IAEY,WAAW,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAyBhF;IAEY,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAsB/E;IAEY,WAAW,CACtB,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EACvD,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAef;IAEY,UAAU,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAU/E;IAEY,eAAe,CAC1B,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,WAAW,EAAE;YAAE,WAAW,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EAC9F,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAef;IAEY,cAAc,CACzB,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,UAAU,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EACvD,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"AuthController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/AuthController.ts"],"names":[],"mappings":"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"}
|
|
@@ -144,7 +144,7 @@ class AuthController extends BaseController_1.BaseController {
|
|
|
144
144
|
}
|
|
145
145
|
async authWithOAuth2(req, reply) {
|
|
146
146
|
const { collection } = req.params;
|
|
147
|
-
const { provider, code, codeVerifier, redirectUrl, redirectUri, createData, state } = req.body || {};
|
|
147
|
+
const { provider, code, codeVerifier, redirectUrl, redirectUri, createData, state, user, extraData, } = req.body || {};
|
|
148
148
|
if (!provider || !code || !codeVerifier || !state) {
|
|
149
149
|
throw new AppError_1.AppError('provider, code, codeVerifier, and state are required for OAuth2 authentication', 400);
|
|
150
150
|
}
|
|
@@ -169,7 +169,8 @@ class AuthController extends BaseController_1.BaseController {
|
|
|
169
169
|
}
|
|
170
170
|
const auth = this.getAuth(req);
|
|
171
171
|
const files = this.getFiles(req);
|
|
172
|
-
const
|
|
172
|
+
const effectiveExtraData = extraData || (user !== undefined ? { user } : undefined);
|
|
173
|
+
const result = await auth.authenticateOAuth2(collection, provider, code, codeVerifier, redirectUrl || redirectUri, createData, files, req.auth, state, req, effectiveExtraData);
|
|
173
174
|
this.ok(reply, result);
|
|
174
175
|
}
|
|
175
176
|
async getExternalAuths(req, reply) {
|
|
@@ -190,6 +191,43 @@ class AuthController extends BaseController_1.BaseController {
|
|
|
190
191
|
await auth.unlinkExternalAuth(collection, id, provider);
|
|
191
192
|
this.noContent(reply);
|
|
192
193
|
}
|
|
194
|
+
async requestVerification(req, reply) {
|
|
195
|
+
const { collection } = req.params;
|
|
196
|
+
const { email } = req.body || {};
|
|
197
|
+
if (!email) {
|
|
198
|
+
throw new AppError_1.AppError('Email is required', 400);
|
|
199
|
+
}
|
|
200
|
+
const auth = this.getAuth(req);
|
|
201
|
+
await auth.requestVerification(collection, email);
|
|
202
|
+
this.ok(reply, { message: 'Verification email sent successfully' });
|
|
203
|
+
}
|
|
204
|
+
async confirmVerification(req, reply) {
|
|
205
|
+
const { token } = req.body || {};
|
|
206
|
+
if (!token) {
|
|
207
|
+
throw new AppError_1.AppError('Verification token is required', 400);
|
|
208
|
+
}
|
|
209
|
+
const auth = this.getAuth(req);
|
|
210
|
+
const record = await auth.confirmVerification(token);
|
|
211
|
+
this.ok(reply, record);
|
|
212
|
+
}
|
|
213
|
+
async requestAdminVerification(req, reply) {
|
|
214
|
+
const { email } = req.body || {};
|
|
215
|
+
if (!email) {
|
|
216
|
+
throw new AppError_1.AppError('Email is required', 400);
|
|
217
|
+
}
|
|
218
|
+
const auth = this.getAuth(req);
|
|
219
|
+
await auth.requestVerification('_admins', email);
|
|
220
|
+
this.ok(reply, { message: 'Verification email sent successfully' });
|
|
221
|
+
}
|
|
222
|
+
async confirmAdminVerification(req, reply) {
|
|
223
|
+
const { token } = req.body || {};
|
|
224
|
+
if (!token) {
|
|
225
|
+
throw new AppError_1.AppError('Verification token is required', 400);
|
|
226
|
+
}
|
|
227
|
+
const auth = this.getAuth(req);
|
|
228
|
+
const record = await auth.confirmVerification(token);
|
|
229
|
+
this.ok(reply, record);
|
|
230
|
+
}
|
|
193
231
|
}
|
|
194
232
|
exports.AuthController = AuthController;
|
|
195
233
|
//# sourceMappingURL=AuthController.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AuthController.js","sourceRoot":"","sources":["../../../src/http/controllers/AuthController.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AuthController.js","sourceRoot":"","sources":["../../../src/http/controllers/AuthController.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { FastifyRequest, FastifyReply } from 'fastify';
|
|
2
|
+
import { BaseController } from './BaseController';
|
|
3
|
+
import { CronService } from '../../cron/CronService';
|
|
4
|
+
import { CreateCronScheduleDto, UpdateCronScheduleDto } from '../../cron/types';
|
|
5
|
+
export declare class CronController extends BaseController {
|
|
6
|
+
private cronService?;
|
|
7
|
+
constructor(cronService?: CronService | undefined);
|
|
8
|
+
private getCronService;
|
|
9
|
+
getPreview(req: FastifyRequest<{
|
|
10
|
+
Body: {
|
|
11
|
+
cronExpression: string;
|
|
12
|
+
timezone?: string;
|
|
13
|
+
count?: number;
|
|
14
|
+
};
|
|
15
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
16
|
+
getStats(req: FastifyRequest, reply: FastifyReply): Promise<void>;
|
|
17
|
+
getSchedules(req: FastifyRequest<{
|
|
18
|
+
Querystring: {
|
|
19
|
+
targetType?: string;
|
|
20
|
+
enabled?: string;
|
|
21
|
+
targetId?: string;
|
|
22
|
+
};
|
|
23
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
24
|
+
createSchedule(req: FastifyRequest<{
|
|
25
|
+
Body: CreateCronScheduleDto;
|
|
26
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
27
|
+
getSchedule(req: FastifyRequest<{
|
|
28
|
+
Params: {
|
|
29
|
+
id: string;
|
|
30
|
+
};
|
|
31
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
32
|
+
updateSchedule(req: FastifyRequest<{
|
|
33
|
+
Params: {
|
|
34
|
+
id: string;
|
|
35
|
+
};
|
|
36
|
+
Body: UpdateCronScheduleDto;
|
|
37
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
38
|
+
deleteSchedule(req: FastifyRequest<{
|
|
39
|
+
Params: {
|
|
40
|
+
id: string;
|
|
41
|
+
};
|
|
42
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
43
|
+
triggerSchedule(req: FastifyRequest<{
|
|
44
|
+
Params: {
|
|
45
|
+
id: string;
|
|
46
|
+
};
|
|
47
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
48
|
+
getRuns(req: FastifyRequest<{
|
|
49
|
+
Querystring: {
|
|
50
|
+
scheduleId?: string;
|
|
51
|
+
targetType?: string;
|
|
52
|
+
status?: string;
|
|
53
|
+
page?: string;
|
|
54
|
+
perPage?: string;
|
|
55
|
+
};
|
|
56
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
57
|
+
clearRuns(req: FastifyRequest<{
|
|
58
|
+
Querystring: {
|
|
59
|
+
scheduleId?: string;
|
|
60
|
+
};
|
|
61
|
+
}>, reply: FastifyReply): Promise<void>;
|
|
62
|
+
}
|
|
63
|
+
//# sourceMappingURL=CronController.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CronController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/CronController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EAEtB,MAAM,kBAAkB,CAAC;AAE1B,qBAAa,cAAe,SAAQ,cAAc;IACpC,OAAO,CAAC,WAAW,CAAC;IAAhC,YAAoB,WAAW,CAAC,EAAE,WAAW,YAAA,EAE5C;IAED,OAAO,CAAC,cAAc;IAIT,UAAU,CACrB,GAAG,EAAE,cAAc,CAAC;QAClB,IAAI,EAAE;YAAE,cAAc,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;YAAC,KAAK,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KACrE,CAAC,EACF,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAKf;IAEY,QAAQ,CACnB,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;IAEY,YAAY,CACvB,GAAG,EAAE,cAAc,CAAC;QAClB,WAAW,EAAE;YAAE,UAAU,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;SAAE,CAAC;KAC3E,CAAC,EACF,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAef;IAEY,cAAc,CACzB,GAAG,EAAE,cAAc,CAAC;QAAE,IAAI,EAAE,qBAAqB,CAAA;KAAE,CAAC,EACpD,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;IAEY,WAAW,CACtB,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EAC/C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAQf;IAEY,cAAc,CACzB,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAC;QAAC,IAAI,EAAE,qBAAqB,CAAA;KAAE,CAAC,EAC5E,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;IAEY,cAAc,CACzB,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EAC/C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAQf;IAEY,eAAe,CAC1B,GAAG,EAAE,cAAc,CAAC;QAAE,MAAM,EAAE;YAAE,EAAE,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EAC/C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;IAEY,OAAO,CAClB,GAAG,EAAE,cAAc,CAAC;QAClB,WAAW,EAAE;YACX,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,UAAU,CAAC,EAAE,MAAM,CAAC;YACpB,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,OAAO,CAAC,EAAE,MAAM,CAAC;SAClB,CAAC;KACH,CAAC,EACF,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAYf;IAEY,SAAS,CACpB,GAAG,EAAE,cAAc,CAAC;QAAE,WAAW,EAAE;YAAE,UAAU,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EAC7D,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAIf;CACF"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CronController = void 0;
|
|
4
|
+
const BaseController_1 = require("./BaseController");
|
|
5
|
+
class CronController extends BaseController_1.BaseController {
|
|
6
|
+
cronService;
|
|
7
|
+
constructor(cronService) {
|
|
8
|
+
super();
|
|
9
|
+
this.cronService = cronService;
|
|
10
|
+
}
|
|
11
|
+
getCronService(req) {
|
|
12
|
+
return req?.appScope?.cron || this.cronService;
|
|
13
|
+
}
|
|
14
|
+
async getPreview(req, reply) {
|
|
15
|
+
const service = this.getCronService(req);
|
|
16
|
+
const { cronExpression, timezone, count } = req.body || {};
|
|
17
|
+
const result = service.preview(cronExpression, timezone, count);
|
|
18
|
+
this.ok(reply, result);
|
|
19
|
+
}
|
|
20
|
+
async getStats(req, reply) {
|
|
21
|
+
const service = this.getCronService(req);
|
|
22
|
+
const stats = await service.getStats();
|
|
23
|
+
this.ok(reply, stats);
|
|
24
|
+
}
|
|
25
|
+
async getSchedules(req, reply) {
|
|
26
|
+
const service = this.getCronService(req);
|
|
27
|
+
const targetType = req.query.targetType;
|
|
28
|
+
const enabled = req.query.enabled !== undefined
|
|
29
|
+
? req.query.enabled === 'true' || req.query.enabled === '1'
|
|
30
|
+
: undefined;
|
|
31
|
+
const targetId = req.query.targetId;
|
|
32
|
+
const schedules = await service.getAllSchedules({
|
|
33
|
+
targetType,
|
|
34
|
+
enabled,
|
|
35
|
+
targetId,
|
|
36
|
+
});
|
|
37
|
+
this.ok(reply, schedules);
|
|
38
|
+
}
|
|
39
|
+
async createSchedule(req, reply) {
|
|
40
|
+
const service = this.getCronService(req);
|
|
41
|
+
const schedule = await service.createSchedule(req.body, req.user);
|
|
42
|
+
this.ok(reply, schedule, 201);
|
|
43
|
+
}
|
|
44
|
+
async getSchedule(req, reply) {
|
|
45
|
+
const service = this.getCronService(req);
|
|
46
|
+
const schedule = await service.getSchedule(req.params.id);
|
|
47
|
+
if (!schedule) {
|
|
48
|
+
this.error(reply, `Schedule '${req.params.id}' not found`, 404);
|
|
49
|
+
return;
|
|
50
|
+
}
|
|
51
|
+
this.ok(reply, schedule);
|
|
52
|
+
}
|
|
53
|
+
async updateSchedule(req, reply) {
|
|
54
|
+
const service = this.getCronService(req);
|
|
55
|
+
const updated = await service.updateSchedule(req.params.id, req.body, req.user);
|
|
56
|
+
this.ok(reply, updated);
|
|
57
|
+
}
|
|
58
|
+
async deleteSchedule(req, reply) {
|
|
59
|
+
const service = this.getCronService(req);
|
|
60
|
+
const deleted = await service.deleteSchedule(req.params.id, req.user);
|
|
61
|
+
if (!deleted) {
|
|
62
|
+
this.error(reply, `Schedule '${req.params.id}' not found`, 404);
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
this.ok(reply, { success: true });
|
|
66
|
+
}
|
|
67
|
+
async triggerSchedule(req, reply) {
|
|
68
|
+
const service = this.getCronService(req);
|
|
69
|
+
const run = await service.triggerSchedule(req.params.id, req.user);
|
|
70
|
+
this.ok(reply, run);
|
|
71
|
+
}
|
|
72
|
+
async getRuns(req, reply) {
|
|
73
|
+
const service = this.getCronService(req);
|
|
74
|
+
const page = req.query.page ? parseInt(req.query.page, 10) : 1;
|
|
75
|
+
const perPage = req.query.perPage ? parseInt(req.query.perPage, 10) : 30;
|
|
76
|
+
const result = await service.getRuns({
|
|
77
|
+
scheduleId: req.query.scheduleId,
|
|
78
|
+
targetType: req.query.targetType,
|
|
79
|
+
status: req.query.status && req.query.status !== 'all' ? req.query.status : undefined,
|
|
80
|
+
page,
|
|
81
|
+
perPage,
|
|
82
|
+
});
|
|
83
|
+
this.ok(reply, result);
|
|
84
|
+
}
|
|
85
|
+
async clearRuns(req, reply) {
|
|
86
|
+
const service = this.getCronService(req);
|
|
87
|
+
const deletedCount = await service.clearRuns(req.query.scheduleId);
|
|
88
|
+
this.ok(reply, { success: true, count: deletedCount });
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
exports.CronController = CronController;
|
|
92
|
+
//# sourceMappingURL=CronController.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"CronController.js","sourceRoot":"","sources":["../../../src/http/controllers/CronController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/DatabaseController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DatabaseController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/DatabaseController.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,6CAA6C,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,EAAkB,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE,qBAAa,kBAAmB,SAAQ,cAAc;IAIlD,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,UAAU;IAClB,OAAO,CAAC,MAAM;IACd,OAAO,CAAC,eAAe,CAAC;IAN1B,OAAO,CAAC,uBAAuB,CAAkC;IAEjE,YACU,eAAe,EAAE,qBAAqB,EACtC,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,eAAe,EACvB,eAAe,CAAC,EAAE,eAAe,YAAA,EAG1C;IAED,OAAO,CAAC,cAAc;IAST,SAAS,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAc9E;IAEY,oBAAoB,CAAC,GAAG,EAAE,cAAc,EAAE,KAAK,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAEzF;IAEY,cAAc,CACzB,GAAG,EAAE,cAAc,CAAC;QAAE,IAAI,EAAE,cAAc,CAAA;KAAE,CAAC,EAC7C,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CAWf;IAEY,cAAc,CACzB,GAAG,EAAE,cAAc,CAAC;QAAE,IAAI,EAAE;YAAE,MAAM,EAAE,cAAc,CAAC;YAAC,WAAW,CAAC,EAAE,OAAO,CAAC;YAAC,WAAW,CAAC,EAAE,MAAM,CAAC;YAAC,OAAO,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC,EACxH,KAAK,EAAE,YAAY,GAClB,OAAO,CAAC,IAAI,CAAC,CA0Mf;CACF"}
|
|
@@ -1,6 +1,40 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
19
|
+
var ownKeys = function(o) {
|
|
20
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
21
|
+
var ar = [];
|
|
22
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
23
|
+
return ar;
|
|
24
|
+
};
|
|
25
|
+
return ownKeys(o);
|
|
26
|
+
};
|
|
27
|
+
return function (mod) {
|
|
28
|
+
if (mod && mod.__esModule) return mod;
|
|
29
|
+
var result = {};
|
|
30
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
31
|
+
__setModuleDefault(result, mod);
|
|
32
|
+
return result;
|
|
33
|
+
};
|
|
34
|
+
})();
|
|
2
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
36
|
exports.DatabaseController = void 0;
|
|
37
|
+
const path = __importStar(require("path"));
|
|
4
38
|
const BaseController_1 = require("./BaseController");
|
|
5
39
|
const DatabaseMigrationService_1 = require("../../database/migration/DatabaseMigrationService");
|
|
6
40
|
const DriverRegistry_1 = require("../../database/drivers/DriverRegistry");
|
|
@@ -31,6 +65,10 @@ class DatabaseController extends BaseController_1.BaseController {
|
|
|
31
65
|
const scope = await this.appManager.getAsync(appSlug);
|
|
32
66
|
const driver = scope.db.getRootDriver();
|
|
33
67
|
const status = await this.dbConfigService.getStatus(driver, appSlug);
|
|
68
|
+
if (scope.db.isDatabaseLocked()) {
|
|
69
|
+
status.connected = false;
|
|
70
|
+
status.error = scope.db.getLockReason();
|
|
71
|
+
}
|
|
34
72
|
this.ok(reply, status);
|
|
35
73
|
}
|
|
36
74
|
catch (err) {
|
|
@@ -102,6 +140,21 @@ class DatabaseController extends BaseController_1.BaseController {
|
|
|
102
140
|
catch {
|
|
103
141
|
// App scope may not exist in mock environments
|
|
104
142
|
}
|
|
143
|
+
const currentDriver = scope?.db ? scope.db.getRootDriver() : this.rootDb?.getRootDriver();
|
|
144
|
+
if (currentDriver && currentDriver.dialect.name === 'sqlite' && config.provider === 'sqlite') {
|
|
145
|
+
const currentPath = currentDriver.getPath?.() || currentDriver.filePath;
|
|
146
|
+
const targetPath = config.dbPath;
|
|
147
|
+
if (currentPath &&
|
|
148
|
+
targetPath &&
|
|
149
|
+
currentPath !== ':memory:' &&
|
|
150
|
+
targetPath !== ':memory:' &&
|
|
151
|
+
path.resolve(currentPath).toLowerCase() === path.resolve(targetPath).toLowerCase()) {
|
|
152
|
+
if (migrateData) {
|
|
153
|
+
this.error(reply, `Application '${appSlug}' is already running on this SQLite database. Migration cannot target the active database.`, 400);
|
|
154
|
+
return;
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
105
158
|
const executeSwitch = async () => {
|
|
106
159
|
// 1. Verify connection to target database
|
|
107
160
|
this.activeMigrationProgress = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DatabaseController.js","sourceRoot":"","sources":["../../../src/http/controllers/DatabaseController.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"DatabaseController.js","sourceRoot":"","sources":["../../../src/http/controllers/DatabaseController.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FlowController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/FlowController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,aAAa,EAAE,aAAa,EAA6B,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"FlowController.d.ts","sourceRoot":"","sources":["../../../src/http/controllers/FlowController.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.FlowController = void 0;
|
|
|
4
4
|
const BaseController_1 = require("./BaseController");
|
|
5
5
|
const AppError_1 = require("../../core/errors/AppError");
|
|
6
6
|
const FlowService_1 = require("../../flows/FlowService");
|
|
7
|
+
const ApiKeyService_1 = require("../../auth/ApiKeyService");
|
|
7
8
|
class FlowController extends BaseController_1.BaseController {
|
|
8
9
|
flowService;
|
|
9
10
|
constructor(flowService) {
|
|
@@ -92,14 +93,30 @@ class FlowController extends BaseController_1.BaseController {
|
|
|
92
93
|
this.error(reply, `Flow '${flow.name}' is currently disabled`, 403);
|
|
93
94
|
return;
|
|
94
95
|
}
|
|
95
|
-
//
|
|
96
|
+
// Enforce trigger / HTTP auth policy
|
|
97
|
+
const auth = req.auth;
|
|
96
98
|
if (flow.triggerType !== 'http') {
|
|
97
|
-
const auth = req.auth;
|
|
98
99
|
if (!auth || !auth.isAdmin) {
|
|
99
100
|
this.error(reply, `Flow '${flow.name}' has triggerType '${flow.triggerType}' and requires admin credentials to execute directly`, 403);
|
|
100
101
|
return;
|
|
101
102
|
}
|
|
102
103
|
}
|
|
104
|
+
else {
|
|
105
|
+
try {
|
|
106
|
+
service.verifyHttpAuthPolicy(flow, auth, {
|
|
107
|
+
query: req.query || {},
|
|
108
|
+
data: req.body ?? {},
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
catch (err) {
|
|
112
|
+
if (err instanceof AppError_1.AppError) {
|
|
113
|
+
this.error(reply, err.message, err.statusCode);
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
116
|
+
this.error(reply, err.message || 'Authorization failed', 403);
|
|
117
|
+
return;
|
|
118
|
+
}
|
|
119
|
+
}
|
|
103
120
|
const wait = req.query.wait === 'true' || req.query.wait === '1';
|
|
104
121
|
const timeoutMs = req.query.timeoutMs
|
|
105
122
|
? parseInt(req.query.timeoutMs, 10)
|
|
@@ -110,6 +127,7 @@ class FlowController extends BaseController_1.BaseController {
|
|
|
110
127
|
wait: true,
|
|
111
128
|
timeoutMs: typeof timeoutMs === 'number' && !isNaN(timeoutMs) ? timeoutMs : undefined,
|
|
112
129
|
executionId: req.body?.executionId,
|
|
130
|
+
query: req.query || {},
|
|
113
131
|
});
|
|
114
132
|
this.ok(reply, execution);
|
|
115
133
|
}
|
|
@@ -122,6 +140,7 @@ class FlowController extends BaseController_1.BaseController {
|
|
|
122
140
|
const dispatched = await service.executeFlow(flow.id, req.body || {}, req.auth, {
|
|
123
141
|
wait: false,
|
|
124
142
|
executionId,
|
|
143
|
+
query: req.query || {},
|
|
125
144
|
});
|
|
126
145
|
const dispatchStatus = dispatched.status === 'queued' ? 'queued' : 'running';
|
|
127
146
|
const response = {
|
|
@@ -170,13 +189,35 @@ class FlowController extends BaseController_1.BaseController {
|
|
|
170
189
|
return;
|
|
171
190
|
}
|
|
172
191
|
const flow = await service.getFlowById(execution.flowId);
|
|
173
|
-
|
|
174
|
-
|
|
192
|
+
const auth = req.auth;
|
|
193
|
+
if (!flow) {
|
|
194
|
+
if (!auth || !auth.isAdmin) {
|
|
195
|
+
this.error(reply, 'Flow execution not found or access denied', 404);
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
}
|
|
199
|
+
else if (flow.triggerType !== 'http') {
|
|
175
200
|
if (!auth || !auth.isAdmin) {
|
|
176
201
|
this.error(reply, `Flow execution for '${execution.flowName}' requires admin credentials`, 403);
|
|
177
202
|
return;
|
|
178
203
|
}
|
|
179
204
|
}
|
|
205
|
+
else if (flow.triggerType === 'http' && flow.authPolicy && flow.authPolicy !== 'public') {
|
|
206
|
+
if (!auth?.isAdmin) {
|
|
207
|
+
if (!auth || !auth.id) {
|
|
208
|
+
this.error(reply, `Authentication required to view execution for '${execution.flowName}'`, 401);
|
|
209
|
+
return;
|
|
210
|
+
}
|
|
211
|
+
if (auth.isApiKey && !(0, ApiKeyService_1.hasFlowScope)(auth, flow.name)) {
|
|
212
|
+
this.error(reply, `API Key missing required scope for '${flow.name}'`, 403);
|
|
213
|
+
return;
|
|
214
|
+
}
|
|
215
|
+
if (execution.actorId !== auth.id) {
|
|
216
|
+
this.error(reply, `You are not allowed to view execution '${execution.id}'`, 403);
|
|
217
|
+
return;
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
180
221
|
this.ok(reply, execution);
|
|
181
222
|
}
|
|
182
223
|
async clearExecutions(req, reply) {
|