@terreno/api 57.4.0 → 57.6.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 +5 -5
- package/bunfig.toml +1 -1
- package/dist/actions.js +197 -368
- package/dist/adminModelRouter.js +88 -173
- package/dist/api.js +598 -852
- package/dist/audit/auditApp.js +48 -89
- package/dist/audit/auditEventModel.js +15 -16
- package/dist/audit/cloudTasksEnqueue.js +56 -149
- package/dist/audit/diff.js +70 -160
- package/dist/audit/processQueue.js +25 -70
- package/dist/audit/rbacSink.js +25 -66
- package/dist/audit/record.js +129 -251
- package/dist/auth.js +432 -681
- package/dist/authRecovery.js +155 -269
- package/dist/authTokens.js +43 -118
- package/dist/betterAuthApp.js +25 -26
- package/dist/betterAuthSetup.js +258 -413
- package/dist/browserLogsRoute.d.ts +6 -0
- package/dist/browserLogsRoute.js +97 -0
- package/dist/collectionRegistry.js +32 -47
- package/dist/config.js +53 -122
- package/dist/configurationApp.js +180 -361
- package/dist/configurationPlugin.js +130 -302
- package/dist/consentApp.js +276 -421
- package/dist/docLoader.js +78 -126
- package/dist/envConfigurationPlugin.js +25 -147
- package/dist/errors.js +151 -247
- package/dist/example.js +28 -34
- package/dist/expressServer.d.ts +10 -0
- package/dist/expressServer.js +109 -255
- package/dist/frameworkModelNames.d.ts +24 -0
- package/dist/frameworkModelNames.js +31 -0
- package/dist/githubAuth.js +152 -216
- package/dist/httpClient.js +176 -264
- package/dist/index.d.ts +2 -0
- package/dist/index.js +7 -2
- package/dist/logger.js +145 -278
- package/dist/mcp/auth.js +76 -128
- package/dist/mcp/createMCPRequest.js +4 -5
- package/dist/mcp/handlers.js +268 -480
- package/dist/mcp/query.js +56 -150
- package/dist/mcp/registry.js +17 -30
- package/dist/mcp/schemaGenerator.js +95 -181
- package/dist/mcp/server.js +28 -100
- package/dist/mcp/serviceTokens.js +102 -191
- package/dist/mcp/toolGenerator.js +78 -191
- package/dist/middleware.js +15 -27
- package/dist/migrations/fixtures/all-down/20260910120000-one.js +2 -42
- package/dist/migrations/fixtures/all-down/20260910120001-two.js +2 -42
- package/dist/migrations/fixtures/bad-id/20260910120000-mismatch.js +1 -39
- package/dist/migrations/fixtures/bad-name/not-a-migration.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120000-alpha.js +1 -39
- package/dist/migrations/fixtures/valid/20260910120001-beta.js +2 -42
- package/dist/migrations/generate.js +107 -229
- package/dist/migrations/load.js +75 -201
- package/dist/migrations/lock.js +54 -126
- package/dist/migrations/runner.js +192 -446
- package/dist/migrations/schemaCatalog.js +122 -263
- package/dist/models/consentForm.js +6 -6
- package/dist/models/consentResponse.js +5 -5
- package/dist/models/mcpServiceToken.js +66 -156
- package/dist/models/notification.js +6 -6
- package/dist/models/notificationPreference.js +6 -6
- package/dist/models/versionConfig.js +5 -5
- package/dist/notifications/notificationService.js +133 -273
- package/dist/notifications/notificationsApp.js +85 -179
- package/dist/notifications/notificationsBeforeSend.js +19 -64
- package/dist/notifiers/googleChatNotifier.js +36 -117
- package/dist/notifiers/slackNotifier.d.ts +31 -2
- package/dist/notifiers/slackNotifier.js +170 -119
- package/dist/notifiers/zoomNotifier.js +60 -111
- package/dist/openApi.js +107 -122
- package/dist/openApiBuilder.js +117 -159
- package/dist/openApiCompat.js +81 -148
- package/dist/openApiEtag.js +7 -7
- package/dist/openApiValidator.js +177 -286
- package/dist/orgs/orgContext.js +87 -157
- package/dist/orgs/orgPermissions.js +29 -68
- package/dist/orgs/orgPlugin.js +9 -27
- package/dist/orgs/organizationModel.js +65 -166
- package/dist/orgs/organizationSettings.js +29 -36
- package/dist/orgs/orgsApp.js +346 -608
- package/dist/permissions.js +88 -181
- package/dist/plugins.js +125 -218
- package/dist/populate.js +130 -240
- package/dist/rateLimit/applyTrustProxy.js +1 -1
- package/dist/rateLimit/createStore.js +7 -8
- package/dist/rateLimit/memoryStore.js +22 -100
- package/dist/rateLimit/middleware.js +48 -99
- package/dist/rateLimit/mongoStore.js +54 -112
- package/dist/rateLimit/policies.js +41 -75
- package/dist/rateLimit/redisStore.js +39 -133
- package/dist/rbac/access.js +119 -267
- package/dist/rbac/assertAllowed.js +95 -171
- package/dist/rbac/auditModel.js +14 -58
- package/dist/rbac/backfillAdmins.js +24 -130
- package/dist/rbac/fieldViews.js +46 -141
- package/dist/rbac/membershipOrgAdminSource.js +28 -99
- package/dist/rbac/middleware.js +30 -96
- package/dist/rbac/modelRouterAccess.js +130 -307
- package/dist/rbac/permissionUtils.js +40 -179
- package/dist/rbac/realtimeAccess.js +81 -147
- package/dist/rbac/resolve.d.ts +1 -1
- package/dist/rbac/resolve.js +148 -342
- package/dist/rbac/roleManager.js +318 -700
- package/dist/rbac/roleModel.js +44 -171
- package/dist/rbac/routes.js +93 -196
- package/dist/rbac/scopes.js +39 -133
- package/dist/rbac/statements.js +23 -91
- package/dist/rbac/userPlugin.js +3 -29
- package/dist/realtime/changeStreamWatcher.js +489 -800
- package/dist/realtime/deprecation.js +8 -10
- package/dist/realtime/queryMatcher.js +110 -191
- package/dist/realtime/queryStore.js +35 -118
- package/dist/realtime/realtimeApp.js +247 -401
- package/dist/realtime/registry.js +19 -30
- package/dist/realtime/sessionRevalidation.js +132 -358
- package/dist/realtime/socketAuth.js +89 -208
- package/dist/realtime/socketUser.js +10 -56
- package/dist/requestContext.js +93 -139
- package/dist/schemaMetadata.js +179 -274
- package/dist/scriptRunner.js +96 -266
- package/dist/scrubAdminFields.js +36 -108
- package/dist/secretProviders.js +130 -299
- package/dist/seedRunner.js +221 -514
- package/dist/sync/adminBroadcastScope.js +58 -170
- package/dist/sync/adminWindowAccess.js +15 -86
- package/dist/sync/adminWindowMutation.js +110 -181
- package/dist/sync/executors.js +425 -629
- package/dist/sync/loadHarness.js +392 -689
- package/dist/sync/models.js +181 -341
- package/dist/sync/mutationHandler.js +533 -801
- package/dist/sync/registrationSideEffects.js +41 -95
- package/dist/sync/registry.js +29 -49
- package/dist/sync/routes.js +484 -817
- package/dist/sync/scripts/compactTombstones.js +83 -228
- package/dist/sync/serialize.js +18 -58
- package/dist/sync/socketHandlers.js +253 -478
- package/dist/sync/streams.js +49 -117
- package/dist/sync/syncApp.js +12 -15
- package/dist/sync/syncBatch.js +63 -168
- package/dist/sync/syncSeqPlugin.js +430 -702
- package/dist/syncConsents.js +113 -253
- package/dist/terrenoApp.js +166 -276
- package/dist/tests/createTestData.js +146 -256
- package/dist/tests/models.js +14 -54
- package/dist/tests/mongoTestSetup.js +42 -103
- package/dist/tests/testHelper.js +31 -93
- package/dist/tests.js +12 -51
- package/dist/transformers.js +61 -164
- package/dist/utils.js +31 -93
- package/dist/vendor/wesleytodd-openapi/index.js +37 -51
- package/dist/vendor/wesleytodd-openapi/lib/generate-doc.js +32 -40
- package/dist/vendor/wesleytodd-openapi/lib/layer-schema.js +3 -3
- package/dist/vendor/wesleytodd-openapi/lib/ui.js +50 -19
- package/dist/vendor/wesleytodd-openapi/lib/validate.js +19 -47
- package/dist/versionCheckPlugin.js +52 -100
- package/dist/webhooks/headerValue.js +2 -2
- package/dist/webhooks/idempotency/memoryStore.js +16 -59
- package/dist/webhooks/idempotency/mongoStore.js +55 -130
- package/dist/webhooks/idempotency/webhookReceipt.js +9 -9
- package/dist/webhooks/rawBody.js +1 -1
- package/dist/webhooks/timingSafeEqual.js +4 -5
- package/dist/webhooks/verifiers/hmac.js +17 -18
- package/dist/webhooks/verifiers/sendgrid.js +20 -22
- package/dist/webhooks/verifiers/stripe.js +31 -65
- package/dist/webhooks/verifiers/twilio.js +23 -73
- package/dist/webhooks/webhooksApp.js +78 -177
- package/dist/zodOpenApi.js +2 -2
- package/package.json +6 -6
- package/src/__tests__/browserLogsRoute.test.ts +165 -0
- package/src/audit/auditApp.test.ts +5 -5
- package/src/audit/auditEventModel.ts +7 -3
- package/src/audit/auditRouter.test.ts +5 -5
- package/src/audit/rbacSink.test.ts +2 -2
- package/src/audit/record.test.ts +2 -2
- package/src/audit/record.ts +3 -2
- package/src/auth.ts +1 -1
- package/src/authRecovery.test.ts +43 -0
- package/src/authRecovery.ts +16 -10
- package/src/authTokens.ts +6 -2
- package/src/authVerification.test.ts +22 -0
- package/src/browserLogsRoute.ts +110 -0
- package/src/configurationPlugin.test.ts +1 -11
- package/src/expressServer.ts +10 -0
- package/src/frameworkModelNames.test.ts +62 -0
- package/src/frameworkModelNames.ts +33 -0
- package/src/index.ts +7 -0
- package/src/isolated/migrateCliConnect.isolated.ts +51 -0
- package/src/mcp/auth.test.ts +34 -1
- package/src/migrations/cli.test.ts +0 -23
- package/src/models/mcpServiceToken.ts +4 -3
- package/src/models/notification.ts +3 -2
- package/src/models/notificationPreference.ts +1 -1
- package/src/notifications/notificationsApp.test.ts +24 -1
- package/src/notifiers/slackNotifier.test.ts +186 -1
- package/src/notifiers/slackNotifier.ts +167 -8
- package/src/orgs/orgPlugin.ts +1 -1
- package/src/orgs/organizationModel.ts +11 -6
- package/src/plugins.test.ts +5 -0
- package/src/plugins.ts +3 -0
- package/src/realtime/realtimeApp.ts +1 -1
- package/src/sync/integration.test.ts +2 -2
- package/src/terrenoApp.ts +3 -0
- package/src/types.d.ts +1 -0
- package/src/webhooks/idempotency/webhookReceipt.ts +4 -3
- package/tsconfig.json +13 -54
- package/tsconfig.typedoc.json +2 -0
package/dist/orgs/orgContext.js
CHANGED
|
@@ -1,198 +1,128 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
3
|
exports.orgContextMiddleware = exports.resolveOrgContext = exports.assertOrganizationEnabled = exports.isPlatformOrgActor = exports.runWithOrgContext = exports.getOrgContext = exports.PLATFORM_ORG_ROLE_NAMES = exports.ORGANIZATION_DISABLED_TITLE = exports.ORGANIZATION_ID_HEADER = void 0;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
4
|
+
const node_async_hooks_1 = require("node:async_hooks");
|
|
5
|
+
const errors_1 = require("../errors");
|
|
6
|
+
const utils_1 = require("../utils");
|
|
7
|
+
const organizationModel_1 = require("./organizationModel");
|
|
44
8
|
exports.ORGANIZATION_ID_HEADER = "x-organization-id";
|
|
45
9
|
exports.ORGANIZATION_DISABLED_TITLE = "Organization is disabled";
|
|
46
10
|
exports.PLATFORM_ORG_ROLE_NAMES = ["operator", "superadmin"];
|
|
47
|
-
|
|
48
|
-
|
|
11
|
+
const orgContextAls = new node_async_hooks_1.AsyncLocalStorage();
|
|
12
|
+
const getOrgContext = () => {
|
|
49
13
|
return orgContextAls.getStore();
|
|
50
14
|
};
|
|
51
15
|
exports.getOrgContext = getOrgContext;
|
|
52
|
-
|
|
16
|
+
const runWithOrgContext = (context, fn) => {
|
|
53
17
|
return orgContextAls.run(context, fn);
|
|
54
18
|
};
|
|
55
19
|
exports.runWithOrgContext = runWithOrgContext;
|
|
56
|
-
|
|
57
|
-
var _a;
|
|
20
|
+
const isPlatformOrgActor = (user) => {
|
|
58
21
|
if (!user) {
|
|
59
22
|
return false;
|
|
60
23
|
}
|
|
61
|
-
|
|
24
|
+
const roles = user.roles ?? [];
|
|
62
25
|
return roles.includes("operator") || roles.includes("superadmin");
|
|
63
26
|
};
|
|
64
27
|
exports.isPlatformOrgActor = isPlatformOrgActor;
|
|
65
|
-
|
|
66
|
-
|
|
28
|
+
const readOrganizationIdHeader = (req) => {
|
|
29
|
+
const raw = req.header("X-Organization-Id");
|
|
67
30
|
if (typeof raw !== "string") {
|
|
68
31
|
return undefined;
|
|
69
32
|
}
|
|
70
|
-
|
|
33
|
+
const trimmed = raw.trim();
|
|
71
34
|
if (!trimmed) {
|
|
72
35
|
return undefined;
|
|
73
36
|
}
|
|
74
37
|
return trimmed;
|
|
75
38
|
};
|
|
76
|
-
|
|
39
|
+
const userIdForMembership = (user) => {
|
|
77
40
|
if (user._id) {
|
|
78
41
|
return String(user._id);
|
|
79
42
|
}
|
|
80
43
|
return user.id;
|
|
81
44
|
};
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
if (!organization) {
|
|
94
|
-
throw new errors_1.NotFoundError("Organization not found");
|
|
95
|
-
}
|
|
96
|
-
return [2 /*return*/, organization];
|
|
97
|
-
}
|
|
98
|
-
});
|
|
99
|
-
}); };
|
|
100
|
-
var assertOrganizationEnabled = function (organization) {
|
|
45
|
+
const loadOrganization = async (id) => {
|
|
46
|
+
if (!(0, utils_1.isValidObjectId)(id)) {
|
|
47
|
+
throw new errors_1.BadRequestError("Invalid organization id");
|
|
48
|
+
}
|
|
49
|
+
const organization = await organizationModel_1.Organization.findOneOrNone({ _id: id });
|
|
50
|
+
if (!organization) {
|
|
51
|
+
throw new errors_1.NotFoundError("Organization not found");
|
|
52
|
+
}
|
|
53
|
+
return organization;
|
|
54
|
+
};
|
|
55
|
+
const assertOrganizationEnabled = (organization) => {
|
|
101
56
|
if (organization.disabled) {
|
|
102
57
|
throw new errors_1.ForbiddenError(exports.ORGANIZATION_DISABLED_TITLE);
|
|
103
58
|
}
|
|
104
59
|
};
|
|
105
60
|
exports.assertOrganizationEnabled = assertOrganizationEnabled;
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
organizationId: organization._id,
|
|
126
|
-
status: "active",
|
|
127
|
-
userId: userIdForMembership(user),
|
|
128
|
-
})];
|
|
129
|
-
case 2:
|
|
130
|
-
membership = _a.sent();
|
|
131
|
-
if (!platform && !membership) {
|
|
132
|
-
throw new errors_1.ForbiddenError("Not a member of this organization");
|
|
133
|
-
}
|
|
134
|
-
return [2 /*return*/, { membership: membership !== null && membership !== void 0 ? membership : undefined, organization: organization }];
|
|
135
|
-
case 3:
|
|
136
|
-
if (!args.required) {
|
|
137
|
-
return [2 /*return*/, {}];
|
|
138
|
-
}
|
|
139
|
-
if (platform) {
|
|
140
|
-
throw new errors_1.BadRequestError("Organization context required");
|
|
141
|
-
}
|
|
142
|
-
return [4 /*yield*/, organizationModel_1.Membership.findActiveForUser(userIdForMembership(user))];
|
|
143
|
-
case 4:
|
|
144
|
-
active = _a.sent();
|
|
145
|
-
adminMemberships = active.filter(function (row) {
|
|
146
|
-
return row.roleName === "org-admin";
|
|
147
|
-
});
|
|
148
|
-
if (!(adminMemberships.length === 1)) return [3 /*break*/, 6];
|
|
149
|
-
membership = adminMemberships[0];
|
|
150
|
-
if (!membership) {
|
|
151
|
-
throw new errors_1.ForbiddenError("Organization context required");
|
|
152
|
-
}
|
|
153
|
-
return [4 /*yield*/, organizationModel_1.Organization.findExactlyOne({ _id: membership.organizationId })];
|
|
154
|
-
case 5:
|
|
155
|
-
organization = _a.sent();
|
|
156
|
-
(0, exports.assertOrganizationEnabled)(organization);
|
|
157
|
-
return [2 /*return*/, { membership: membership, organization: organization }];
|
|
158
|
-
case 6:
|
|
159
|
-
if (adminMemberships.length > 1) {
|
|
160
|
-
throw new errors_1.BadRequestError("Select an organization");
|
|
161
|
-
}
|
|
162
|
-
throw new errors_1.ForbiddenError("Organization context required");
|
|
61
|
+
const resolveOrgContext = async (args) => {
|
|
62
|
+
const user = args.user;
|
|
63
|
+
if (!user?.id) {
|
|
64
|
+
if (args.required) {
|
|
65
|
+
throw new errors_1.APIError({ status: 401, title: "Unauthorized" });
|
|
66
|
+
}
|
|
67
|
+
return {};
|
|
68
|
+
}
|
|
69
|
+
const platform = (0, exports.isPlatformOrgActor)(user);
|
|
70
|
+
if (args.organizationId) {
|
|
71
|
+
const organization = await loadOrganization(args.organizationId);
|
|
72
|
+
(0, exports.assertOrganizationEnabled)(organization);
|
|
73
|
+
const membership = await organizationModel_1.Membership.findOneOrNone({
|
|
74
|
+
organizationId: organization._id,
|
|
75
|
+
status: "active",
|
|
76
|
+
userId: userIdForMembership(user),
|
|
77
|
+
});
|
|
78
|
+
if (!platform && !membership) {
|
|
79
|
+
throw new errors_1.ForbiddenError("Not a member of this organization");
|
|
163
80
|
}
|
|
81
|
+
return { membership: membership ?? undefined, organization };
|
|
82
|
+
}
|
|
83
|
+
if (!args.required) {
|
|
84
|
+
return {};
|
|
85
|
+
}
|
|
86
|
+
if (platform) {
|
|
87
|
+
throw new errors_1.BadRequestError("Organization context required");
|
|
88
|
+
}
|
|
89
|
+
const active = await organizationModel_1.Membership.findActiveForUser(userIdForMembership(user));
|
|
90
|
+
const adminMemberships = active.filter((row) => {
|
|
91
|
+
return row.roleName === "org-admin";
|
|
164
92
|
});
|
|
165
|
-
|
|
93
|
+
if (adminMemberships.length === 1) {
|
|
94
|
+
const membership = adminMemberships[0];
|
|
95
|
+
if (!membership) {
|
|
96
|
+
throw new errors_1.ForbiddenError("Organization context required");
|
|
97
|
+
}
|
|
98
|
+
const organization = await organizationModel_1.Organization.findExactlyOne({ _id: membership.organizationId });
|
|
99
|
+
(0, exports.assertOrganizationEnabled)(organization);
|
|
100
|
+
return { membership, organization };
|
|
101
|
+
}
|
|
102
|
+
if (adminMemberships.length > 1) {
|
|
103
|
+
throw new errors_1.BadRequestError("Select an organization");
|
|
104
|
+
}
|
|
105
|
+
throw new errors_1.ForbiddenError("Organization context required");
|
|
106
|
+
};
|
|
166
107
|
exports.resolveOrgContext = resolveOrgContext;
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
next();
|
|
187
|
-
});
|
|
188
|
-
return [3 /*break*/, 3];
|
|
189
|
-
case 2:
|
|
190
|
-
error_1 = _a.sent();
|
|
191
|
-
next(error_1);
|
|
192
|
-
return [3 /*break*/, 3];
|
|
193
|
-
case 3: return [2 /*return*/];
|
|
194
|
-
}
|
|
195
|
-
});
|
|
196
|
-
}); };
|
|
108
|
+
const orgContextMiddleware = (options) => {
|
|
109
|
+
const required = options?.required ?? false;
|
|
110
|
+
return async (req, _res, next) => {
|
|
111
|
+
try {
|
|
112
|
+
const context = await (0, exports.resolveOrgContext)({
|
|
113
|
+
organizationId: readOrganizationIdHeader(req),
|
|
114
|
+
required,
|
|
115
|
+
user: req.user,
|
|
116
|
+
});
|
|
117
|
+
req.organization = context.organization;
|
|
118
|
+
req.membership = context.membership;
|
|
119
|
+
orgContextAls.run(context, () => {
|
|
120
|
+
next();
|
|
121
|
+
});
|
|
122
|
+
}
|
|
123
|
+
catch (error) {
|
|
124
|
+
next(error);
|
|
125
|
+
}
|
|
126
|
+
};
|
|
197
127
|
};
|
|
198
128
|
exports.orgContextMiddleware = orgContextMiddleware;
|
|
@@ -1,77 +1,38 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
|
|
13
|
-
return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
39
3
|
exports.isOrgMemberPermission = exports.OrgQueryFilter = void 0;
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
if (!
|
|
4
|
+
const errors_1 = require("../errors");
|
|
5
|
+
const organizationModel_1 = require("./organizationModel");
|
|
6
|
+
const orgContext_1 = require("./orgContext");
|
|
7
|
+
const OrgQueryFilter = (_user, _query) => {
|
|
8
|
+
const context = (0, orgContext_1.getOrgContext)();
|
|
9
|
+
if (!context?.organization) {
|
|
46
10
|
throw new errors_1.BadRequestError("Organization context required");
|
|
47
11
|
}
|
|
48
12
|
return { organizationId: context.organization._id };
|
|
49
13
|
};
|
|
50
14
|
exports.OrgQueryFilter = OrgQueryFilter;
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
return [2 /*return*/, organizationModel_1.Membership.isMember(user.id, String(organizationId))];
|
|
75
|
-
});
|
|
76
|
-
}); };
|
|
15
|
+
const isOrgMemberPermission = async (_method, user, obj) => {
|
|
16
|
+
if (!obj) {
|
|
17
|
+
return true;
|
|
18
|
+
}
|
|
19
|
+
if (!user) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
const organizationId = obj.organizationId;
|
|
23
|
+
if (!organizationId) {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
const context = (0, orgContext_1.getOrgContext)();
|
|
27
|
+
if (!context?.organization) {
|
|
28
|
+
return false;
|
|
29
|
+
}
|
|
30
|
+
if (String(context.organization._id) !== String(organizationId)) {
|
|
31
|
+
return false;
|
|
32
|
+
}
|
|
33
|
+
if ((0, orgContext_1.isPlatformOrgActor)(user)) {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
return organizationModel_1.Membership.isMember(user.id, String(organizationId));
|
|
37
|
+
};
|
|
77
38
|
exports.isOrgMemberPermission = isOrgMemberPermission;
|
package/dist/orgs/orgPlugin.js
CHANGED
|
@@ -1,43 +1,25 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __read = (this && this.__read) || function (o, n) {
|
|
3
|
-
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
4
|
-
if (!m) return o;
|
|
5
|
-
var i = m.call(o), r, ar = [], e;
|
|
6
|
-
try {
|
|
7
|
-
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
8
|
-
}
|
|
9
|
-
catch (error) { e = { error: error }; }
|
|
10
|
-
finally {
|
|
11
|
-
try {
|
|
12
|
-
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
13
|
-
}
|
|
14
|
-
finally { if (e) throw e.error; }
|
|
15
|
-
}
|
|
16
|
-
return ar;
|
|
17
|
-
};
|
|
18
2
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
19
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
20
4
|
};
|
|
21
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
22
6
|
exports.orgScopedPlugin = exports.organizationIdImmutabilityPlugin = exports.ORGANIZATION_ID_IMMUTABLE_TITLE = void 0;
|
|
23
|
-
|
|
24
|
-
|
|
7
|
+
const mongoose_1 = __importDefault(require("mongoose"));
|
|
8
|
+
const errors_1 = require("../errors");
|
|
25
9
|
exports.ORGANIZATION_ID_IMMUTABLE_TITLE = "organizationId cannot be changed";
|
|
26
|
-
|
|
10
|
+
const updateContainsOrganizationId = (value) => {
|
|
27
11
|
if (Array.isArray(value)) {
|
|
28
12
|
return value.some(updateContainsOrganizationId);
|
|
29
13
|
}
|
|
30
14
|
if (!value || typeof value !== "object") {
|
|
31
15
|
return false;
|
|
32
16
|
}
|
|
33
|
-
return Object.entries(value).some(
|
|
34
|
-
var _b = __read(_a, 2), key = _b[0], nestedValue = _b[1];
|
|
17
|
+
return Object.entries(value).some(([key, nestedValue]) => {
|
|
35
18
|
if (key === "organizationId" || key.startsWith("organizationId.")) {
|
|
36
19
|
return true;
|
|
37
20
|
}
|
|
38
21
|
if (key === "$rename" && nestedValue && typeof nestedValue === "object") {
|
|
39
|
-
return Object.entries(nestedValue).some(
|
|
40
|
-
var _b = __read(_a, 2), source = _b[0], target = _b[1];
|
|
22
|
+
return Object.entries(nestedValue).some(([source, target]) => {
|
|
41
23
|
return (source === "organizationId" ||
|
|
42
24
|
source.startsWith("organizationId.") ||
|
|
43
25
|
target === "organizationId" ||
|
|
@@ -48,7 +30,7 @@ var updateContainsOrganizationId = function (value) {
|
|
|
48
30
|
});
|
|
49
31
|
};
|
|
50
32
|
/** Rejects post-create changes to an existing `organizationId` schema path. */
|
|
51
|
-
|
|
33
|
+
const organizationIdImmutabilityPlugin = (schema) => {
|
|
52
34
|
schema.pre("save", function () {
|
|
53
35
|
if (this.isNew || !this.isModified("organizationId")) {
|
|
54
36
|
return;
|
|
@@ -56,7 +38,7 @@ var organizationIdImmutabilityPlugin = function (schema) {
|
|
|
56
38
|
throw new errors_1.BadRequestError(exports.ORGANIZATION_ID_IMMUTABLE_TITLE);
|
|
57
39
|
});
|
|
58
40
|
schema.pre(["updateOne", "findOneAndUpdate"], function () {
|
|
59
|
-
|
|
41
|
+
const update = this.getUpdate();
|
|
60
42
|
if (!updateContainsOrganizationId(update)) {
|
|
61
43
|
return;
|
|
62
44
|
}
|
|
@@ -69,12 +51,12 @@ exports.organizationIdImmutabilityPlugin = organizationIdImmutabilityPlugin;
|
|
|
69
51
|
* without an organization. After creation, `organizationId` is immutable for REST, admin,
|
|
70
52
|
* sync, and direct saves.
|
|
71
53
|
*/
|
|
72
|
-
|
|
54
|
+
const orgScopedPlugin = (schema) => {
|
|
73
55
|
schema.add({
|
|
74
56
|
organizationId: {
|
|
75
57
|
description: "Organization this document belongs to",
|
|
76
58
|
index: true,
|
|
77
|
-
ref: "
|
|
59
|
+
ref: "TerrenoOrganization",
|
|
78
60
|
required: true,
|
|
79
61
|
type: mongoose_1.default.Schema.Types.ObjectId,
|
|
80
62
|
},
|