@astram/identity 0.4.0 → 0.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/dist/company-membership.object.d.ts.map +1 -1
- package/dist/company-membership.object.js +3 -2
- package/dist/company.object.d.ts.map +1 -1
- package/dist/company.object.js +8 -3
- package/dist/features/access/index.d.ts.map +1 -1
- package/dist/features/access/index.js +1 -5
- package/dist/features/audit/audit-read.service.d.ts.map +1 -1
- package/dist/features/audit/audit-read.service.js +13 -6
- package/dist/features/audit/audit.controller.d.ts.map +1 -1
- package/dist/features/audit/audit.controller.js +2 -0
- package/dist/features/audit/mariadb-audit-reader.d.ts.map +1 -1
- package/dist/features/authz/access-bundle-reconcile.job.d.ts.map +1 -1
- package/dist/features/authz/catalog-reconcile.job.d.ts.map +1 -1
- package/dist/features/authz/catalog-reconcile.job.js +1 -3
- package/dist/features/authz/db-permission-facts.adapter.d.ts +16 -0
- package/dist/features/authz/db-permission-facts.adapter.d.ts.map +1 -1
- package/dist/features/authz/db-permission-facts.adapter.js +46 -2
- package/dist/features/authz/grant-admin.controller.d.ts +8 -5
- package/dist/features/authz/grant-admin.controller.d.ts.map +1 -1
- package/dist/features/authz/grant-admin.controller.js +20 -18
- package/dist/features/authz/grant-admin.service.d.ts +72 -16
- package/dist/features/authz/grant-admin.service.d.ts.map +1 -1
- package/dist/features/authz/grant-admin.service.js +232 -86
- package/dist/features/authz/grant-ceiling.d.ts +100 -1
- package/dist/features/authz/grant-ceiling.d.ts.map +1 -1
- package/dist/features/authz/grant-ceiling.js +264 -2
- package/dist/features/authz/mariadb-catalog-store.d.ts.map +1 -1
- package/dist/features/authz/mariadb-catalog-store.js +15 -3
- package/dist/features/authz/permission-version.bumper.d.ts +52 -1
- package/dist/features/authz/permission-version.bumper.d.ts.map +1 -1
- package/dist/features/authz/permission-version.bumper.js +119 -20
- package/dist/features/authz/record-authorization.d.ts +12 -0
- package/dist/features/authz/record-authorization.d.ts.map +1 -1
- package/dist/features/authz/record-authorization.js +49 -0
- package/dist/features/authz/role-binding.d.ts +36 -0
- package/dist/features/authz/role-binding.d.ts.map +1 -0
- package/dist/features/authz/role-binding.js +53 -0
- package/dist/features/company/company-hierarchy.service.d.ts +108 -0
- package/dist/features/company/company-hierarchy.service.d.ts.map +1 -0
- package/dist/features/company/company-hierarchy.service.js +277 -0
- package/dist/features/company/company.controller.d.ts +23 -5
- package/dist/features/company/company.controller.d.ts.map +1 -1
- package/dist/features/company/company.controller.js +47 -12
- package/dist/features/company/company.service.d.ts +28 -12
- package/dist/features/company/company.service.d.ts.map +1 -1
- package/dist/features/company/company.service.js +61 -14
- package/dist/features/cross-tenant/cross-tenant-grant.controller.d.ts.map +1 -1
- package/dist/features/cross-tenant/cross-tenant-grant.controller.js +2 -0
- package/dist/features/identity-feature.module.d.ts +2 -0
- package/dist/features/identity-feature.module.d.ts.map +1 -1
- package/dist/features/identity-feature.module.js +72 -5
- package/dist/features/membership/membership.controller.d.ts +6 -5
- package/dist/features/membership/membership.controller.d.ts.map +1 -1
- package/dist/features/membership/membership.controller.js +34 -22
- package/dist/features/membership/membership.service.d.ts +20 -14
- package/dist/features/membership/membership.service.d.ts.map +1 -1
- package/dist/features/membership/membership.service.js +62 -29
- package/dist/features/membership/posting-version-bump.d.ts +12 -0
- package/dist/features/membership/posting-version-bump.d.ts.map +1 -1
- package/dist/features/membership/posting.service.d.ts +20 -24
- package/dist/features/membership/posting.service.d.ts.map +1 -1
- package/dist/features/membership/posting.service.js +101 -64
- package/dist/features/org-structure/org-catalog.controller.d.ts.map +1 -1
- package/dist/features/org-structure/org-catalog.controller.js +2 -0
- package/dist/features/org-structure/org-catalog.service.d.ts.map +1 -1
- package/dist/features/org-structure/org-catalog.service.js +4 -1
- package/dist/features/policy/policy.controller.d.ts.map +1 -1
- package/dist/features/policy/policy.controller.js +2 -0
- package/dist/features/role/role.controller.d.ts +3 -2
- package/dist/features/role/role.controller.d.ts.map +1 -1
- package/dist/features/role/role.controller.js +15 -10
- package/dist/features/role/role.service.d.ts +39 -8
- package/dist/features/role/role.service.d.ts.map +1 -1
- package/dist/features/role/role.service.js +77 -10
- package/dist/features/scope/scope-closure.service.d.ts +54 -4
- package/dist/features/scope/scope-closure.service.d.ts.map +1 -1
- package/dist/features/scope/scope-closure.service.js +237 -85
- package/dist/features/service-account/service-account.controller.d.ts +3 -2
- package/dist/features/service-account/service-account.controller.d.ts.map +1 -1
- package/dist/features/service-account/service-account.controller.js +29 -15
- package/dist/features/service-account/service-account.service.d.ts +29 -7
- package/dist/features/service-account/service-account.service.d.ts.map +1 -1
- package/dist/features/service-account/service-account.service.js +73 -12
- package/dist/features/service-account/service-account.store.d.ts +15 -0
- package/dist/features/service-account/service-account.store.d.ts.map +1 -1
- package/dist/features/service-account/service-account.store.js +29 -0
- package/dist/features/share/share.controller.d.ts.map +1 -1
- package/dist/features/share/share.controller.js +2 -0
- package/dist/features/share/share.service.d.ts.map +1 -1
- package/dist/features/shared/identity-error.interceptor.d.ts +24 -0
- package/dist/features/shared/identity-error.interceptor.d.ts.map +1 -0
- package/dist/features/shared/identity-error.interceptor.js +82 -0
- package/dist/features/shared/identity-errors.d.ts +23 -0
- package/dist/features/shared/identity-errors.d.ts.map +1 -0
- package/dist/features/shared/identity-errors.js +41 -0
- package/dist/features/user/session-revocation-check.d.ts +11 -0
- package/dist/features/user/session-revocation-check.d.ts.map +1 -0
- package/dist/features/user/session-revocation-check.js +21 -0
- package/dist/features/user/user.controller.d.ts +11 -6
- package/dist/features/user/user.controller.d.ts.map +1 -1
- package/dist/features/user/user.controller.js +35 -17
- package/dist/features/user/user.service.d.ts +55 -14
- package/dist/features/user/user.service.d.ts.map +1 -1
- package/dist/features/user/user.service.js +143 -16
- package/dist/index.d.ts +7 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +7 -6
- package/dist/internal.d.ts +10 -0
- package/dist/internal.d.ts.map +1 -0
- package/dist/internal.js +13 -0
- package/dist/membership-posting.object.d.ts.map +1 -1
- package/dist/membership-posting.object.js +4 -2
- package/dist/objects.d.ts.map +1 -1
- package/dist/objects.js +13 -3
- package/dist/role.object.d.ts.map +1 -1
- package/dist/role.object.js +3 -0
- package/dist/user.object.d.ts.map +1 -1
- package/dist/user.object.js +3 -0
- package/migrations/1710000000019-AddSessionMustReenroll.cjs +35 -0
- package/package.json +15 -4
- package/dist/auth-facts-keys.js.map +0 -1
- package/dist/branch.object.js.map +0 -1
- package/dist/company-branch.object.js.map +0 -1
- package/dist/company-department.object.js.map +0 -1
- package/dist/company-membership.object.js.map +0 -1
- package/dist/company.object.js.map +0 -1
- package/dist/cross-tenant-grant.object.js.map +0 -1
- package/dist/department.object.js.map +0 -1
- package/dist/features/access/access-admin.access.js.map +0 -1
- package/dist/features/access/company-admin.access.js.map +0 -1
- package/dist/features/access/index.js.map +0 -1
- package/dist/features/access/user-management.access.js.map +0 -1
- package/dist/features/audit/audit-read.service.js.map +0 -1
- package/dist/features/audit/audit.controller.js.map +0 -1
- package/dist/features/audit/directory-label-resolver.js.map +0 -1
- package/dist/features/audit/mariadb-audit-reader.js.map +0 -1
- package/dist/features/authz/access-bundle-reconcile.job.js.map +0 -1
- package/dist/features/authz/access-bundle-store.js.map +0 -1
- package/dist/features/authz/catalog-bootstrap.provider.js.map +0 -1
- package/dist/features/authz/catalog-reconcile.job.js.map +0 -1
- package/dist/features/authz/db-permission-facts.adapter.js.map +0 -1
- package/dist/features/authz/grant-admin.controller.js.map +0 -1
- package/dist/features/authz/grant-admin.service.js.map +0 -1
- package/dist/features/authz/grant-ceiling.js.map +0 -1
- package/dist/features/authz/mariadb-catalog-store.js.map +0 -1
- package/dist/features/authz/permission-version.bumper.js.map +0 -1
- package/dist/features/authz/record-authorization.js.map +0 -1
- package/dist/features/authz/session-facts.reader.js.map +0 -1
- package/dist/features/company/company.controller.js.map +0 -1
- package/dist/features/company/company.service.js.map +0 -1
- package/dist/features/cross-tenant/cross-tenant-grant-read.service.js.map +0 -1
- package/dist/features/cross-tenant/cross-tenant-grant.controller.js.map +0 -1
- package/dist/features/cross-tenant/grant-authorize.js.map +0 -1
- package/dist/features/identity-feature.module.js.map +0 -1
- package/dist/features/membership/membership-checker.js.map +0 -1
- package/dist/features/membership/membership.controller.js.map +0 -1
- package/dist/features/membership/membership.service.js.map +0 -1
- package/dist/features/membership/posting-version-bump.js.map +0 -1
- package/dist/features/membership/posting.service.js.map +0 -1
- package/dist/features/org-structure/org-catalog.controller.js.map +0 -1
- package/dist/features/org-structure/org-catalog.service.js.map +0 -1
- package/dist/features/policy/policy.controller.js.map +0 -1
- package/dist/features/policy/policy.service.js.map +0 -1
- package/dist/features/role/role.controller.js.map +0 -1
- package/dist/features/role/role.service.js.map +0 -1
- package/dist/features/scope/scope-closure.service.js.map +0 -1
- package/dist/features/scope/scope-subtree.resolver.js.map +0 -1
- package/dist/features/share/share.controller.js.map +0 -1
- package/dist/features/share/share.service.js.map +0 -1
- package/dist/features/shared/http.js.map +0 -1
- package/dist/features/shared/list-query.js.map +0 -1
- package/dist/features/shared/named-option.js.map +0 -1
- package/dist/features/shared/record-resolver.js.map +0 -1
- package/dist/features/user/user.controller.js.map +0 -1
- package/dist/features/user/user.service.js.map +0 -1
- package/dist/index.js.map +0 -1
- package/dist/membership-posting.object.js.map +0 -1
- package/dist/migrations-dir.js.map +0 -1
- package/dist/objects.js.map +0 -1
- package/dist/record-share.object.js.map +0 -1
- package/dist/role.object.js.map +0 -1
- package/dist/schema.js.map +0 -1
- package/dist/shared-resource.object.js.map +0 -1
- package/dist/user.object.js.map +0 -1
|
@@ -19,12 +19,16 @@ const membership_service_js_1 = require("./membership.service.js");
|
|
|
19
19
|
const posting_service_js_1 = require("./posting.service.js");
|
|
20
20
|
const record_resolver_js_1 = require("../shared/record-resolver.js");
|
|
21
21
|
const http_js_1 = require("../shared/http.js");
|
|
22
|
+
const identity_error_interceptor_js_1 = require("../shared/identity-error.interceptor.js");
|
|
22
23
|
// ── Memberships + postings ───────────────────────────────────────────────────
|
|
23
24
|
//
|
|
24
25
|
// Gated on the `company_membership` / `membership_posting` grants via `@Classified`
|
|
25
26
|
// + the engine's mandatory in-pipe gate. Both are DATA-plane types, so the capped root
|
|
26
27
|
// is denied them by construction — the membership admin surface is grant-driven, not
|
|
27
|
-
// root-driven.
|
|
28
|
+
// root-driven. Per-company-admin scoping is structural: reads, updates and deletes are walled
|
|
29
|
+
// to the caller's subtree (ADR-0027/0030), creates by the ADR-0034 create wall; adding an
|
|
30
|
+
// existing user needs that user already in the subtree (D4), and posting a role runs the
|
|
31
|
+
// role-assignment ceiling + binding rule (#11). Errors map via IdentityErrorInterceptor.
|
|
28
32
|
let MembershipController = class MembershipController {
|
|
29
33
|
memberships;
|
|
30
34
|
postings;
|
|
@@ -78,8 +82,8 @@ let MembershipController = class MembershipController {
|
|
|
78
82
|
return { memberships: cards };
|
|
79
83
|
}
|
|
80
84
|
/** Add the user to a company (creates an inactive membership card). */
|
|
81
|
-
async addUserMembership(userUuid, body) {
|
|
82
|
-
const id = await this.memberships.addMembership(userUuid, body?.companyUuid ?? '');
|
|
85
|
+
async addUserMembership(req, userUuid, body) {
|
|
86
|
+
const id = await this.memberships.addMembership(req.principal, userUuid, body?.companyUuid ?? '');
|
|
83
87
|
return { id };
|
|
84
88
|
}
|
|
85
89
|
/**
|
|
@@ -87,26 +91,29 @@ let MembershipController = class MembershipController {
|
|
|
87
91
|
* invariant); `status` is a plain field update. Activating requires the owning user so
|
|
88
92
|
* the invariant can deactivate the user's OTHER memberships.
|
|
89
93
|
*/
|
|
90
|
-
async updateMembership(membershipUuid, body) {
|
|
94
|
+
async updateMembership(req, membershipUuid, body) {
|
|
91
95
|
if (body?.isActive === true) {
|
|
92
96
|
if (!body.userUuid) {
|
|
93
97
|
throw new common_1.ForbiddenException('userUuid is required to activate a membership');
|
|
94
98
|
}
|
|
95
|
-
await this.memberships.setActive(membershipUuid, body.userUuid);
|
|
99
|
+
await this.memberships.setActive(req.principal, membershipUuid, body.userUuid);
|
|
96
100
|
}
|
|
97
101
|
if (typeof body?.status === 'string') {
|
|
98
|
-
await this.memberships.updateMembership(membershipUuid, {
|
|
102
|
+
await this.memberships.updateMembership(req.principal, membershipUuid, {
|
|
103
|
+
status: body.status,
|
|
104
|
+
});
|
|
99
105
|
}
|
|
100
106
|
return { success: true };
|
|
101
107
|
}
|
|
102
|
-
/** Remove a membership card (its postings cascade at the DB). */
|
|
103
|
-
async removeMembership(membershipUuid) {
|
|
104
|
-
await this.memberships.removeMembership(membershipUuid);
|
|
108
|
+
/** Remove a membership card (its postings cascade at the DB). A peer's needs dominance. */
|
|
109
|
+
async removeMembership(req, membershipUuid) {
|
|
110
|
+
await this.memberships.removeMembership(req.principal, membershipUuid);
|
|
105
111
|
return { success: true };
|
|
106
112
|
}
|
|
107
113
|
/** Atomically replace a membership's full posting set (the diff sync). */
|
|
108
|
-
async replacePostings(membershipUuid, body) {
|
|
109
|
-
|
|
114
|
+
async replacePostings(req, membershipUuid, body) {
|
|
115
|
+
const postings = Array.isArray(body?.postings) ? body.postings : [];
|
|
116
|
+
await this.postings.replacePostings(req.principal, membershipUuid, postings);
|
|
110
117
|
return { success: true };
|
|
111
118
|
}
|
|
112
119
|
/**
|
|
@@ -134,40 +141,45 @@ __decorate([
|
|
|
134
141
|
__decorate([
|
|
135
142
|
(0, common_1.Post)('users/:userUuid/memberships'),
|
|
136
143
|
(0, guard_1.Classified)({ typeKey: 'company_membership', action: 'create' }),
|
|
137
|
-
__param(0, (0, common_1.
|
|
138
|
-
__param(1, (0, common_1.
|
|
144
|
+
__param(0, (0, common_1.Req)()),
|
|
145
|
+
__param(1, (0, common_1.Param)('userUuid')),
|
|
146
|
+
__param(2, (0, common_1.Body)()),
|
|
139
147
|
__metadata("design:type", Function),
|
|
140
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
148
|
+
__metadata("design:paramtypes", [Object, String, Object]),
|
|
141
149
|
__metadata("design:returntype", Promise)
|
|
142
150
|
], MembershipController.prototype, "addUserMembership", null);
|
|
143
151
|
__decorate([
|
|
144
152
|
(0, common_1.Put)('memberships/:membershipUuid'),
|
|
145
153
|
(0, guard_1.Classified)({ typeKey: 'company_membership', action: 'update' }),
|
|
146
|
-
__param(0, (0, common_1.
|
|
147
|
-
__param(1, (0, common_1.
|
|
154
|
+
__param(0, (0, common_1.Req)()),
|
|
155
|
+
__param(1, (0, common_1.Param)('membershipUuid')),
|
|
156
|
+
__param(2, (0, common_1.Body)()),
|
|
148
157
|
__metadata("design:type", Function),
|
|
149
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
158
|
+
__metadata("design:paramtypes", [Object, String, Object]),
|
|
150
159
|
__metadata("design:returntype", Promise)
|
|
151
160
|
], MembershipController.prototype, "updateMembership", null);
|
|
152
161
|
__decorate([
|
|
153
162
|
(0, common_1.Delete)('memberships/:membershipUuid'),
|
|
154
163
|
(0, guard_1.Classified)({ typeKey: 'company_membership', action: 'delete' }),
|
|
155
|
-
__param(0, (0, common_1.
|
|
164
|
+
__param(0, (0, common_1.Req)()),
|
|
165
|
+
__param(1, (0, common_1.Param)('membershipUuid')),
|
|
156
166
|
__metadata("design:type", Function),
|
|
157
|
-
__metadata("design:paramtypes", [String]),
|
|
167
|
+
__metadata("design:paramtypes", [Object, String]),
|
|
158
168
|
__metadata("design:returntype", Promise)
|
|
159
169
|
], MembershipController.prototype, "removeMembership", null);
|
|
160
170
|
__decorate([
|
|
161
171
|
(0, common_1.Put)('memberships/:membershipUuid/postings'),
|
|
162
172
|
(0, guard_1.Classified)({ typeKey: 'membership_posting', action: 'update' }),
|
|
163
|
-
__param(0, (0, common_1.
|
|
164
|
-
__param(1, (0, common_1.
|
|
173
|
+
__param(0, (0, common_1.Req)()),
|
|
174
|
+
__param(1, (0, common_1.Param)('membershipUuid')),
|
|
175
|
+
__param(2, (0, common_1.Body)()),
|
|
165
176
|
__metadata("design:type", Function),
|
|
166
|
-
__metadata("design:paramtypes", [String, Object]),
|
|
177
|
+
__metadata("design:paramtypes", [Object, String, Object]),
|
|
167
178
|
__metadata("design:returntype", Promise)
|
|
168
179
|
], MembershipController.prototype, "replacePostings", null);
|
|
169
180
|
exports.MembershipController = MembershipController = __decorate([
|
|
170
181
|
(0, common_1.Controller)('identity'),
|
|
182
|
+
(0, common_1.UseInterceptors)(identity_error_interceptor_js_1.IdentityErrorInterceptor),
|
|
171
183
|
__metadata("design:paramtypes", [membership_service_js_1.MembershipService,
|
|
172
184
|
posting_service_js_1.PostingService,
|
|
173
185
|
record_resolver_js_1.RecordResolverService])
|
|
@@ -11,17 +11,20 @@
|
|
|
11
11
|
* `cm_is_active`; `setActive` is the guard.
|
|
12
12
|
*/
|
|
13
13
|
import { RecordsService, type RecordId, type RecordView } from '@astram/engine';
|
|
14
|
+
import type { Principal } from '@astram/core';
|
|
14
15
|
import { type PostingVersionBump } from './posting-version-bump.js';
|
|
16
|
+
import { GrantCeiling } from '../authz/grant-ceiling.js';
|
|
15
17
|
export declare class MembershipService {
|
|
16
18
|
private readonly records;
|
|
19
|
+
private readonly ceiling;
|
|
17
20
|
private readonly versionBump?;
|
|
18
|
-
constructor(records: RecordsService, versionBump?: (PostingVersionBump | null) | undefined);
|
|
21
|
+
constructor(records: RecordsService, ceiling: GrantCeiling, versionBump?: (PostingVersionBump | null) | undefined);
|
|
19
22
|
/**
|
|
20
|
-
* Read a membership
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
+
* Read a membership through the subtree wall (404 when out of reach) and, unless the actor is
|
|
24
|
+
* acting on their OWN membership, require the actor to dominate its user (security review): a
|
|
25
|
+
* sub-admin must not delete, suspend or re-activate a more privileged peer's membership.
|
|
23
26
|
*/
|
|
24
|
-
private
|
|
27
|
+
private reachMember;
|
|
25
28
|
/**
|
|
26
29
|
* Bump the permission version for each DISTINCT tenant in `tenantUuids` (best-effort +
|
|
27
30
|
* fail-safe): the mutation already succeeded, so a bump hiccup must NOT surface as an
|
|
@@ -37,17 +40,17 @@ export declare class MembershipService {
|
|
|
37
40
|
* hits the DB's UNIQUE constraint and the engine's error surfaces to the caller (NOT
|
|
38
41
|
* swallowed here). `createdBy` is stamped server-side (actorId-trusted).
|
|
39
42
|
*/
|
|
40
|
-
addMembership(userUuid: string, companyUuid: string): Promise<RecordId>;
|
|
43
|
+
addMembership(actor: Principal, userUuid: string, companyUuid: string): Promise<RecordId>;
|
|
41
44
|
/** List a user's membership cards (tenant-scoped by the pipe). */
|
|
42
45
|
listMemberships(userUuid: string): Promise<readonly RecordView[]>;
|
|
43
46
|
/**
|
|
44
47
|
* Flip which of the user's memberships is active — the ONE-ACTIVE invariant. The service
|
|
45
48
|
* is the guard because the DB has no partial-unique on `cm_is_active`.
|
|
46
49
|
*
|
|
47
|
-
* ⚠️ ORDER IS LOAD-BEARING (fail-safe against a LOGIN LOCKOUT).
|
|
48
|
-
*
|
|
49
|
-
*
|
|
50
|
-
* deactivate the others:
|
|
50
|
+
* ⚠️ ORDER IS LOAD-BEARING (fail-safe against a LOGIN LOCKOUT). Each `update` is its OWN
|
|
51
|
+
* transaction (no cross-call atomicity), and the engine's `list` order (PK-ordered since the
|
|
52
|
+
* Phase 3 tiebreaker) says nothing about which membership is the target. So this MUST
|
|
53
|
+
* activate the TARGET FIRST, then deactivate the others:
|
|
51
54
|
* - Worst case of a mid-loop failure is then a transient TWO-active window, which is
|
|
52
55
|
* RECOVERABLE — the credential resolver reads `is_active=1 LIMIT 1`, so it still
|
|
53
56
|
* resolves a tenant and login works.
|
|
@@ -58,16 +61,19 @@ export declare class MembershipService {
|
|
|
58
61
|
* Guard: if `membershipUuid` is NOT one of the user's memberships, throw — otherwise the
|
|
59
62
|
* loop would deactivate everything and activate nothing (also a zero-active lockout).
|
|
60
63
|
*/
|
|
61
|
-
setActive(membershipUuid: string, userUuid: string): Promise<void>;
|
|
64
|
+
setActive(actor: Principal, membershipUuid: string, userUuid: string): Promise<void>;
|
|
62
65
|
/**
|
|
63
66
|
* Update a membership's mutable non-activity fields (currently `status`). Activity is
|
|
64
67
|
* flipped only via `setActive` to preserve the one-active invariant, so `isActive` is
|
|
65
68
|
* intentionally NOT a patch key here.
|
|
66
69
|
*/
|
|
67
|
-
updateMembership(membershipUuid: string, patch: {
|
|
70
|
+
updateMembership(actor: Principal, membershipUuid: string, patch: {
|
|
68
71
|
status?: string;
|
|
69
72
|
}): Promise<void>;
|
|
70
|
-
/**
|
|
71
|
-
|
|
73
|
+
/**
|
|
74
|
+
* Remove a membership card (its postings cascade at the DB via FK ON DELETE CASCADE). A peer's
|
|
75
|
+
* membership needs dominance over the peer (security review); your own does not.
|
|
76
|
+
*/
|
|
77
|
+
removeMembership(actor: Principal, membershipUuid: string): Promise<void>;
|
|
72
78
|
}
|
|
73
79
|
//# sourceMappingURL=membership.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"membership.service.d.ts","sourceRoot":"","sources":["../../../src/features/membership/membership.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,cAAc,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAwB,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE1F,qBACa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAQxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"membership.service.d.ts","sourceRoot":"","sources":["../../../src/features/membership/membership.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,cAAc,EAAE,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAChF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAwB,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE1F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,qBACa,iBAAiB;IAE1B,OAAO,CAAC,QAAQ,CAAC,OAAO;IAGxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAQxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBAXZ,OAAO,EAAE,cAAc,EAGvB,OAAO,EAAE,YAAY,EAQrB,WAAW,CAAC,GAAE,kBAAkB,GAAG,IAAI,aAAA;IAG1D;;;;OAIG;YACW,WAAW;IAQzB;;;;;;OAMG;YACW,WAAW;IAYzB;;;;;;OAMG;IACG,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC;IAkB/F,kEAAkE;IAC5D,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC;IAKvE;;;;;;;;;;;;;;;;;OAiBG;IACG,SAAS,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsC1F;;;;OAIG;IACG,gBAAgB,CACpB,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,EACtB,KAAK,EAAE;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACzB,OAAO,CAAC,IAAI,CAAC;IAchB;;;OAGG;IACG,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAYhF"}
|
|
@@ -28,27 +28,33 @@ exports.MembershipService = void 0;
|
|
|
28
28
|
const common_1 = require("@nestjs/common");
|
|
29
29
|
const engine_1 = require("@astram/engine");
|
|
30
30
|
const posting_version_bump_js_1 = require("./posting-version-bump.js");
|
|
31
|
+
const identity_errors_js_1 = require("../shared/identity-errors.js");
|
|
32
|
+
const grant_ceiling_js_1 = require("../authz/grant-ceiling.js");
|
|
31
33
|
let MembershipService = class MembershipService {
|
|
32
34
|
records;
|
|
35
|
+
ceiling;
|
|
33
36
|
versionBump;
|
|
34
|
-
constructor(records,
|
|
37
|
+
constructor(records,
|
|
38
|
+
// Dominance over the member for destructive ops (security review): REQUIRED, so a missing
|
|
39
|
+
// ceiling fails DI at boot instead of silently skipping the check.
|
|
40
|
+
ceiling, versionBump) {
|
|
35
41
|
this.records = records;
|
|
42
|
+
this.ceiling = ceiling;
|
|
36
43
|
this.versionBump = versionBump;
|
|
37
44
|
}
|
|
38
45
|
/**
|
|
39
|
-
* Read a membership
|
|
40
|
-
*
|
|
41
|
-
*
|
|
46
|
+
* Read a membership through the subtree wall (404 when out of reach) and, unless the actor is
|
|
47
|
+
* acting on their OWN membership, require the actor to dominate its user (security review): a
|
|
48
|
+
* sub-admin must not delete, suspend or re-activate a more privileged peer's membership.
|
|
42
49
|
*/
|
|
43
|
-
async
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
}
|
|
50
|
+
async reachMember(actor, membershipUuid) {
|
|
51
|
+
const m = await this.records.get('company_membership', membershipUuid);
|
|
52
|
+
if (m === null)
|
|
53
|
+
throw new identity_errors_js_1.IdentityNotFoundError('Membership not found.');
|
|
54
|
+
const userUuid = typeof m.fields?.userUuid === 'string' ? m.fields.userUuid : '';
|
|
55
|
+
if (userUuid !== actor.id)
|
|
56
|
+
await this.ceiling.assertDominates(actor, userUuid);
|
|
57
|
+
return m;
|
|
52
58
|
}
|
|
53
59
|
/**
|
|
54
60
|
* Bump the permission version for each DISTINCT tenant in `tenantUuids` (best-effort +
|
|
@@ -77,7 +83,20 @@ let MembershipService = class MembershipService {
|
|
|
77
83
|
* hits the DB's UNIQUE constraint and the engine's error surfaces to the caller (NOT
|
|
78
84
|
* swallowed here). `createdBy` is stamped server-side (actorId-trusted).
|
|
79
85
|
*/
|
|
80
|
-
addMembership(userUuid, companyUuid) {
|
|
86
|
+
async addMembership(actor, userUuid, companyUuid) {
|
|
87
|
+
// D4 (security hardening #4): a non-root actor may attach only a user ALREADY inside its
|
|
88
|
+
// subtree — the user's walled read (a user is in scope iff it has a membership in the
|
|
89
|
+
// actor's subtree) must see it. Pulling a foreign tenant's user in would make them
|
|
90
|
+
// "dominated" by the actor (the #4 + #3 email-takeover chain). A brand-new user joins
|
|
91
|
+
// through `POST /identity/users { companyUuid }` (created + attached in one transaction).
|
|
92
|
+
// Root is data-plane-denied on memberships by the engine anyway.
|
|
93
|
+
if (actor.isRoot !== true) {
|
|
94
|
+
const user = await this.records.get('user', userUuid);
|
|
95
|
+
if (user === null)
|
|
96
|
+
throw new identity_errors_js_1.IdentityNotFoundError('User not found.');
|
|
97
|
+
}
|
|
98
|
+
// The company itself is checked by the engine's ADR-0034 create wall: a company outside
|
|
99
|
+
// the actor's subtree ⇒ AuthorizationDeniedError (→ 403) and the INSERT rolls back.
|
|
81
100
|
return this.records.create('company_membership', {
|
|
82
101
|
fields: { userUuid, companyUuid, isActive: false, status: 'active' },
|
|
83
102
|
});
|
|
@@ -91,10 +110,10 @@ let MembershipService = class MembershipService {
|
|
|
91
110
|
* Flip which of the user's memberships is active — the ONE-ACTIVE invariant. The service
|
|
92
111
|
* is the guard because the DB has no partial-unique on `cm_is_active`.
|
|
93
112
|
*
|
|
94
|
-
* ⚠️ ORDER IS LOAD-BEARING (fail-safe against a LOGIN LOCKOUT).
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
* deactivate the others:
|
|
113
|
+
* ⚠️ ORDER IS LOAD-BEARING (fail-safe against a LOGIN LOCKOUT). Each `update` is its OWN
|
|
114
|
+
* transaction (no cross-call atomicity), and the engine's `list` order (PK-ordered since the
|
|
115
|
+
* Phase 3 tiebreaker) says nothing about which membership is the target. So this MUST
|
|
116
|
+
* activate the TARGET FIRST, then deactivate the others:
|
|
98
117
|
* - Worst case of a mid-loop failure is then a transient TWO-active window, which is
|
|
99
118
|
* RECOVERABLE — the credential resolver reads `is_active=1 LIMIT 1`, so it still
|
|
100
119
|
* resolves a tenant and login works.
|
|
@@ -105,13 +124,17 @@ let MembershipService = class MembershipService {
|
|
|
105
124
|
* Guard: if `membershipUuid` is NOT one of the user's memberships, throw — otherwise the
|
|
106
125
|
* loop would deactivate everything and activate nothing (also a zero-active lockout).
|
|
107
126
|
*/
|
|
108
|
-
async setActive(membershipUuid, userUuid) {
|
|
127
|
+
async setActive(actor, membershipUuid, userUuid) {
|
|
128
|
+
// Flipping activation de-activates the user's OTHER memberships: for a peer, the actor must
|
|
129
|
+
// dominate them (security review). Your own activation stays allowed.
|
|
130
|
+
if (userUuid !== actor.id)
|
|
131
|
+
await this.ceiling.assertDominates(actor, userUuid);
|
|
109
132
|
const page = await this.records.list('company_membership', { where: { userUuid } });
|
|
110
133
|
const target = page.rows.find((m) => m.id === membershipUuid);
|
|
111
134
|
if (!target) {
|
|
112
135
|
// Not this user's membership → refuse rather than leave the user with ZERO active
|
|
113
|
-
// (a login lockout). Fail-closed.
|
|
114
|
-
throw new
|
|
136
|
+
// (a login lockout). Fail-closed. No ids in the message (ADR-0012).
|
|
137
|
+
throw new identity_errors_js_1.IdentityNotFoundError('Membership not found.');
|
|
115
138
|
}
|
|
116
139
|
// 1) TARGET FIRST — guarantees an active membership exists before any deactivation, so
|
|
117
140
|
// a mid-failure below leaves TWO active (recoverable), never ZERO (lockout).
|
|
@@ -142,7 +165,11 @@ let MembershipService = class MembershipService {
|
|
|
142
165
|
* flipped only via `setActive` to preserve the one-active invariant, so `isActive` is
|
|
143
166
|
* intentionally NOT a patch key here.
|
|
144
167
|
*/
|
|
145
|
-
updateMembership(membershipUuid, patch) {
|
|
168
|
+
async updateMembership(actor, membershipUuid, patch) {
|
|
169
|
+
await this.reachMember(actor, membershipUuid); // 404 / dominance over a peer
|
|
170
|
+
const fields = {};
|
|
171
|
+
if (typeof patch?.status === 'string')
|
|
172
|
+
fields.status = patch.status;
|
|
146
173
|
// NO version bump here (ADR-0011): this patches `status` ONLY — `isActive` is
|
|
147
174
|
// deliberately not a patch key (activity flips solely via `setActive`, which bumps),
|
|
148
175
|
// and the controller only ever passes `{ status }`. Coarse-grant resolution gates on
|
|
@@ -150,16 +177,21 @@ let MembershipService = class MembershipService {
|
|
|
150
177
|
// resolve → the warm cache stays correct → no invalidation needed. If a future patch key
|
|
151
178
|
// is ever added here that CAN change which roles/postings resolve, it MUST bump the
|
|
152
179
|
// membership's tenant (mirror `setActive`).
|
|
153
|
-
|
|
180
|
+
await this.records.update('company_membership', membershipUuid, { fields });
|
|
154
181
|
}
|
|
155
|
-
/**
|
|
156
|
-
|
|
182
|
+
/**
|
|
183
|
+
* Remove a membership card (its postings cascade at the DB via FK ON DELETE CASCADE). A peer's
|
|
184
|
+
* membership needs dominance over the peer (security review); your own does not.
|
|
185
|
+
*/
|
|
186
|
+
async removeMembership(actor, membershipUuid) {
|
|
157
187
|
// ADR-0011 STALENESS FIX: resolve the membership's tenant BEFORE the delete (it's
|
|
158
188
|
// unreadable afterwards). If the membership was active, deleting it (postings cascade)
|
|
159
189
|
// removes the user's role grants in that company — a coarse-grant change — so bump that
|
|
160
190
|
// tenant AFTER the delete succeeds. Best-effort/fail-safe (bumpTenants swallows). A
|
|
161
191
|
// membership belongs to exactly one company → one tenant bump.
|
|
162
|
-
const
|
|
192
|
+
const m = await this.reachMember(actor, membershipUuid);
|
|
193
|
+
const c = m.fields?.companyUuid;
|
|
194
|
+
const tenant = typeof c === 'string' && c.length > 0 ? c : null;
|
|
163
195
|
await this.records.delete('company_membership', membershipUuid);
|
|
164
196
|
await this.bumpTenants([tenant]);
|
|
165
197
|
}
|
|
@@ -167,7 +199,8 @@ let MembershipService = class MembershipService {
|
|
|
167
199
|
exports.MembershipService = MembershipService;
|
|
168
200
|
exports.MembershipService = MembershipService = __decorate([
|
|
169
201
|
(0, common_1.Injectable)(),
|
|
170
|
-
__param(
|
|
171
|
-
__param(
|
|
172
|
-
__metadata("design:paramtypes", [engine_1.RecordsService,
|
|
202
|
+
__param(2, (0, common_1.Optional)()),
|
|
203
|
+
__param(2, (0, common_1.Inject)(posting_version_bump_js_1.POSTING_VERSION_BUMP)),
|
|
204
|
+
__metadata("design:paramtypes", [engine_1.RecordsService,
|
|
205
|
+
grant_ceiling_js_1.GrantCeiling, Object])
|
|
173
206
|
], MembershipService);
|
|
@@ -5,6 +5,18 @@
|
|
|
5
5
|
*/
|
|
6
6
|
export interface PostingVersionBump {
|
|
7
7
|
bumpTenant(tenantUuid: string): Promise<void>;
|
|
8
|
+
/**
|
|
9
|
+
* OPTIONAL (security hardening Phase 3): bump every tenant the user has a membership in — after
|
|
10
|
+
* the account itself was disabled or re-enabled. Returns the bumped tenants; throws on failure.
|
|
11
|
+
*/
|
|
12
|
+
bumpForUser?(userUuid: string): Promise<string[]>;
|
|
13
|
+
/**
|
|
14
|
+
* OPTIONAL (Phase 8 #2): the tenants whose cached grants change when the role goes away — every
|
|
15
|
+
* tenant where it is actively posted, plus every service account's tenant holding it. Read
|
|
16
|
+
* BEFORE a role delete (the delete cascades the postings); bump each with `bumpTenant` after the
|
|
17
|
+
* commit. Throws on failure.
|
|
18
|
+
*/
|
|
19
|
+
tenantsForRole?(roleUuid: string): Promise<string[]>;
|
|
8
20
|
}
|
|
9
21
|
export declare const POSTING_VERSION_BUMP: unique symbol;
|
|
10
22
|
//# sourceMappingURL=posting-version-bump.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"posting-version-bump.d.ts","sourceRoot":"","sources":["../../../src/features/membership/posting-version-bump.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"posting-version-bump.d.ts","sourceRoot":"","sources":["../../../src/features/membership/posting-version-bump.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,WAAW,kBAAkB;IACjC,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C;;;OAGG;IACH,WAAW,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAClD;;;;;OAKG;IACH,cAAc,CAAC,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CACtD;AAED,eAAO,MAAM,oBAAoB,eAAiC,CAAC"}
|
|
@@ -6,21 +6,24 @@
|
|
|
6
6
|
* diffs current-vs-desired and applies the minimal change — delete only what's removed,
|
|
7
7
|
* create only what's added, keep the rest untouched.
|
|
8
8
|
*
|
|
9
|
-
* ──
|
|
10
|
-
*
|
|
11
|
-
*
|
|
12
|
-
*
|
|
13
|
-
* the
|
|
14
|
-
*
|
|
15
|
-
*
|
|
16
|
-
*
|
|
17
|
-
*
|
|
18
|
-
*
|
|
19
|
-
*
|
|
20
|
-
*
|
|
9
|
+
* ── Authority (security hardening #11) ─────────────────────────────────────────────────
|
|
10
|
+
* A posting IS a role assignment, so before ANY write the actor (the request principal) must:
|
|
11
|
+
* - reach the membership (a walled `records.get` → null ⇒ 404; the engine's ADR-0034 create
|
|
12
|
+
* wall re-checks the posting's membership company inside the transaction);
|
|
13
|
+
* - for every ADDED role: the role is bound within the actor's subtree or not bound at all
|
|
14
|
+
* (`GrantCeiling.assertRoleAssignable` — a role also used elsewhere is never assignable),
|
|
15
|
+
* and the role's keys are all held by the actor (`assertCanAssignRoles`, ADR-0029 applied to
|
|
16
|
+
* assignment). Removals need no ceiling: self-demotion stays allowed.
|
|
17
|
+
*
|
|
18
|
+
* ── Atomicity (KI #16) ────────────────────────────────────────────────────────────────
|
|
19
|
+
* The diff runs inside ONE `records.transaction` (ADR-0034): creates FIRST, then deletes, so a
|
|
20
|
+
* failure at any point rolls back every posting write of the replace (no partial set, no
|
|
21
|
+
* window where a removed role is gone but its replacement was refused).
|
|
21
22
|
*/
|
|
22
23
|
import { RecordsService, type RecordView } from '@astram/engine';
|
|
24
|
+
import type { Principal } from '@astram/core';
|
|
23
25
|
import { type PostingVersionBump } from './posting-version-bump.js';
|
|
26
|
+
import { GrantCeiling } from '../authz/grant-ceiling.js';
|
|
24
27
|
/**
|
|
25
28
|
* The shape of one desired posting row submitted by the editor. The effective-window
|
|
26
29
|
* bounds arrive from the client as a bare `YYYY-MM-DD` date string (native `<input
|
|
@@ -36,24 +39,17 @@ export interface PostingInput {
|
|
|
36
39
|
}
|
|
37
40
|
export declare class PostingService {
|
|
38
41
|
private readonly records;
|
|
42
|
+
private readonly ceiling;
|
|
39
43
|
private readonly versionBump?;
|
|
40
|
-
constructor(records: RecordsService, versionBump?: (PostingVersionBump | null) | undefined);
|
|
44
|
+
constructor(records: RecordsService, ceiling: GrantCeiling, versionBump?: (PostingVersionBump | null) | undefined);
|
|
41
45
|
/** List a membership's postings (tenant-scoped by the pipe). */
|
|
42
46
|
listPostings(membershipUuid: string): Promise<readonly RecordView[]>;
|
|
43
47
|
/**
|
|
44
48
|
* Replace a membership's full posting set with `desired`, applying the minimal diff.
|
|
45
49
|
* Compares current vs desired by the natural key `roleUuid|departmentUuid|branchUuid`:
|
|
46
|
-
*
|
|
47
|
-
*
|
|
48
|
-
* kept postings are never delete targets, so the membership never lands empty).
|
|
49
|
-
*/
|
|
50
|
-
replacePostings(membershipUuid: string, desired: readonly PostingInput[]): Promise<void>;
|
|
51
|
-
/**
|
|
52
|
-
* Resolve the tenant (company uuid) a membership belongs to — the tenant whose permission
|
|
53
|
-
* version a posting change must bump. Reads the parent `company_membership` through the
|
|
54
|
-
* pipe (tenant-scoped, no raw SQL), returning `companyUuid` or `null` if unresolvable
|
|
55
|
-
* (then no bump — fail-safe; never guesses a tenant).
|
|
50
|
+
* creates added rows, deletes removed rows, leaves kept rows untouched. Every authority check
|
|
51
|
+
* runs BEFORE any write; the writes run in one transaction (see the file header).
|
|
56
52
|
*/
|
|
57
|
-
|
|
53
|
+
replacePostings(actor: Principal, membershipUuid: string, desired: readonly PostingInput[]): Promise<void>;
|
|
58
54
|
}
|
|
59
55
|
//# sourceMappingURL=posting.service.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"posting.service.d.ts","sourceRoot":"","sources":["../../../src/features/membership/posting.service.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"posting.service.d.ts","sourceRoot":"","sources":["../../../src/features/membership/posting.service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAGH,OAAO,EAAE,cAAc,EAAE,KAAK,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAwB,KAAK,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAC1F,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAGzD;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3B,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;IACvC,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;CACzC;AA0ED,qBACa,cAAc;IAEvB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAGxB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAKxB,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBARZ,OAAO,EAAE,cAAc,EAGvB,OAAO,EAAE,YAAY,EAKrB,WAAW,CAAC,GAAE,kBAAkB,GAAG,IAAI,aAAA;IAG1D,gEAAgE;IAC1D,YAAY,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,UAAU,EAAE,CAAC;IAK1E;;;;;OAKG;IACG,eAAe,CACnB,KAAK,EAAE,SAAS,EAChB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,SAAS,YAAY,EAAE,GAC/B,OAAO,CAAC,IAAI,CAAC;CAuGjB"}
|