@dads-framework/tenants 0.1.0 → 0.2.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 +152 -24
- package/dist/index.d.ts +6 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -0
- package/dist/index.js.map +1 -1
- package/dist/install-tenant-schema-v2.d.ts +4 -0
- package/dist/install-tenant-schema-v2.d.ts.map +1 -0
- package/dist/install-tenant-schema-v2.js +10 -0
- package/dist/install-tenant-schema-v2.js.map +1 -0
- package/dist/membership-permissions.d.ts +10 -0
- package/dist/membership-permissions.d.ts.map +1 -0
- package/dist/membership-permissions.js +24 -0
- package/dist/membership-permissions.js.map +1 -0
- package/dist/migrations/20261120080000_tenant_scim.migration.d.ts +5 -0
- package/dist/migrations/20261120080000_tenant_scim.migration.d.ts.map +1 -0
- package/dist/migrations/20261120080000_tenant_scim.migration.js +34 -0
- package/dist/migrations/20261120080000_tenant_scim.migration.js.map +1 -0
- package/dist/migrations/20261120080100_tenant_scim_groups.migration.d.ts +5 -0
- package/dist/migrations/20261120080100_tenant_scim_groups.migration.d.ts.map +1 -0
- package/dist/migrations/20261120080100_tenant_scim_groups.migration.js +34 -0
- package/dist/migrations/20261120080100_tenant_scim_groups.migration.js.map +1 -0
- package/dist/tenant-composition.d.ts.map +1 -1
- package/dist/tenant-composition.js +6 -1
- package/dist/tenant-composition.js.map +1 -1
- package/dist/tenant-invitations.d.ts +7 -2
- package/dist/tenant-invitations.d.ts.map +1 -1
- package/dist/tenant-invitations.js +16 -4
- package/dist/tenant-invitations.js.map +1 -1
- package/dist/tenant-memberships.d.ts +7 -0
- package/dist/tenant-memberships.d.ts.map +1 -1
- package/dist/tenant-memberships.js +9 -7
- package/dist/tenant-memberships.js.map +1 -1
- package/dist/tenant-scim-directory.d.ts +5 -0
- package/dist/tenant-scim-directory.d.ts.map +1 -0
- package/dist/tenant-scim-directory.js +142 -0
- package/dist/tenant-scim-directory.js.map +1 -0
- package/dist/tenant-scim-group-directory.d.ts +5 -0
- package/dist/tenant-scim-group-directory.d.ts.map +1 -0
- package/dist/tenant-scim-group-directory.js +143 -0
- package/dist/tenant-scim-group-directory.js.map +1 -0
- package/dist/tenant-scim-group-members.d.ts +8 -0
- package/dist/tenant-scim-group-members.d.ts.map +1 -0
- package/dist/tenant-scim-group-members.js +47 -0
- package/dist/tenant-scim-group-members.js.map +1 -0
- package/dist/tenant-scim-group-record.d.ts +15 -0
- package/dist/tenant-scim-group-record.d.ts.map +1 -0
- package/dist/tenant-scim-group-record.js +47 -0
- package/dist/tenant-scim-group-record.js.map +1 -0
- package/dist/tenant-scim-group-tables.d.ts +189 -0
- package/dist/tenant-scim-group-tables.d.ts.map +1 -0
- package/dist/tenant-scim-group-tables.js +28 -0
- package/dist/tenant-scim-group-tables.js.map +1 -0
- package/dist/tenant-scim-membership.d.ts +12 -0
- package/dist/tenant-scim-membership.d.ts.map +1 -0
- package/dist/tenant-scim-membership.js +87 -0
- package/dist/tenant-scim-membership.js.map +1 -0
- package/dist/tenant-scim-record.d.ts +19 -0
- package/dist/tenant-scim-record.d.ts.map +1 -0
- package/dist/tenant-scim-record.js +52 -0
- package/dist/tenant-scim-record.js.map +1 -0
- package/dist/tenant-scim-table.d.ts +296 -0
- package/dist/tenant-scim-table.d.ts.map +1 -0
- package/dist/tenant-scim-table.js +29 -0
- package/dist/tenant-scim-table.js.map +1 -0
- package/dist/tenant-tables.d.ts +2 -0
- package/dist/tenant-tables.d.ts.map +1 -1
- package/dist/tenant-tables.js +4 -0
- package/dist/tenant-tables.js.map +1 -1
- package/dist/tenants.d.ts +2 -0
- package/dist/tenants.d.ts.map +1 -1
- package/dist/tenants.js +5 -0
- package/dist/tenants.js.map +1 -1
- package/dist/tenants.tsbuildinfo +1 -1
- package/package.json +8 -7
- package/src/migrations/20261120080000_tenant_scim.migration.ts +39 -0
- package/src/migrations/20261120080100_tenant_scim_groups.migration.ts +39 -0
package/README.md
CHANGED
|
@@ -4,40 +4,89 @@ Manage tenants, memberships, and one-time invitations with relationship authoriz
|
|
|
4
4
|
|
|
5
5
|
## Try it
|
|
6
6
|
|
|
7
|
+
In the generated starter, [`libraries/app-runtime/index.ts`](../../../apps/kit-workbench/libraries/app-runtime/index.ts) declares tenant
|
|
8
|
+
access against the application's account entity. [`assembly/services.ts`](../../../apps/kit-workbench/assembly/services.ts)
|
|
9
|
+
constructs `Tenants` and supplies transaction-bound authorization so membership
|
|
10
|
+
rows and relationship facts commit together.
|
|
11
|
+
|
|
12
|
+
Use Node.js 22 or later and a disposable Postgres database. Install the tuple
|
|
13
|
+
table and complete tenant schema in one migration before running the script below.
|
|
14
|
+
|
|
15
|
+
```sh
|
|
16
|
+
npm install @dads-framework/access @dads-framework/postgres @dads-framework/postgres-access @dads-framework/tenants zod
|
|
17
|
+
npm install -D tsx
|
|
18
|
+
```
|
|
19
|
+
|
|
20
|
+
In your migration runner, pass its builder to
|
|
21
|
+
`pgm.sql(relationshipSchemaMigration.sql)` and `installTenantSchemaV2(pgm)`.
|
|
22
|
+
The first export comes from `@dads-framework/postgres-access` and the second
|
|
23
|
+
from `@dads-framework/tenants`. Set `DATABASE_URL` to connect to the migrated
|
|
24
|
+
database. This script uses fixture account IDs. In an application, resolve
|
|
25
|
+
those IDs from verified sessions before invoking the tenant service.
|
|
26
|
+
|
|
27
|
+
Save as `create-tenant.mts` and run `npx tsx create-tenant.mts`.
|
|
28
|
+
|
|
29
|
+
<!-- dads:check-example -->
|
|
30
|
+
|
|
7
31
|
```ts
|
|
8
|
-
import { accessModel } from "@dads-framework/access";
|
|
32
|
+
import { access, accessModel, entityHandle } from "@dads-framework/access";
|
|
33
|
+
import { createPostgresConnection } from "@dads-framework/postgres";
|
|
9
34
|
import {
|
|
10
35
|
PostgresAuthorization,
|
|
11
36
|
TransactionalAccessChanges,
|
|
12
|
-
relationshipSchemaMigration,
|
|
13
37
|
} from "@dads-framework/postgres-access";
|
|
14
38
|
import {
|
|
15
39
|
createTenantAccess,
|
|
16
|
-
|
|
40
|
+
TenantUnavailableError,
|
|
17
41
|
Tenants,
|
|
18
42
|
} from "@dads-framework/tenants";
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
const
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
const
|
|
37
|
-
|
|
43
|
+
import { z } from "zod";
|
|
44
|
+
|
|
45
|
+
const connectionString = process.env.DATABASE_URL;
|
|
46
|
+
if (!connectionString) throw new Error("Set DATABASE_URL.");
|
|
47
|
+
|
|
48
|
+
const account = entityHandle({ wireName: "account", idSchema: z.string() });
|
|
49
|
+
const tenantAccess = createTenantAccess(account);
|
|
50
|
+
const model = accessModel([
|
|
51
|
+
access(account, { roles: {}, permissions: () => ({}) }),
|
|
52
|
+
tenantAccess.tenant,
|
|
53
|
+
]);
|
|
54
|
+
|
|
55
|
+
const connection = createPostgresConnection(
|
|
56
|
+
{ connectionString, schema: {} },
|
|
57
|
+
console,
|
|
58
|
+
);
|
|
59
|
+
try {
|
|
60
|
+
const backend = new PostgresAuthorization({
|
|
61
|
+
model,
|
|
62
|
+
namespace: "tenant-example",
|
|
63
|
+
executor: connection.pool,
|
|
64
|
+
});
|
|
65
|
+
const tenants = new Tenants({
|
|
66
|
+
database: connection.drizzle,
|
|
67
|
+
access: tenantAccess,
|
|
68
|
+
authorizationAt: (tx) => backend.inDrizzleTransaction(tx),
|
|
69
|
+
changes: new TransactionalAccessChanges(backend, connection.drizzle),
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
const tenant = await tenants.create("alice", "Example workspace");
|
|
73
|
+
const context = await tenants.context("alice", tenant.id);
|
|
74
|
+
console.log(context.tenant.name);
|
|
75
|
+
try {
|
|
76
|
+
await tenants.context("outside-account", tenant.id);
|
|
77
|
+
throw new Error("Expected access to be denied.");
|
|
78
|
+
} catch (error) {
|
|
79
|
+
if (!(error instanceof TenantUnavailableError)) throw error;
|
|
80
|
+
console.log(error.constructor.name);
|
|
81
|
+
}
|
|
82
|
+
} finally {
|
|
83
|
+
await connection.close();
|
|
84
|
+
}
|
|
38
85
|
```
|
|
39
86
|
|
|
40
|
-
The
|
|
87
|
+
The script prints `Example workspace` and `TenantUnavailableError`. The
|
|
88
|
+
creator's owner relationship commits in the same transaction as the tenant
|
|
89
|
+
and its membership row.
|
|
41
90
|
|
|
42
91
|
## Use it
|
|
43
92
|
|
|
@@ -45,8 +94,17 @@ Use the account ID from the application's authenticated session. Pass request te
|
|
|
45
94
|
|
|
46
95
|
`memberships.roster` is available to owners and admins. Owners can promote members and remove admins. Admins can invite and remove ordinary members. The bootstrap owner relationship stays in place.
|
|
47
96
|
|
|
97
|
+
`memberships.permissions(actorId, tenantId, accountId)` returns the selected member's role and checks their effective `view`, `manageMembers`, and `manageTenant` permissions. It requires membership management permission on that tenant. Missing members produce `TenantUnavailableError`.
|
|
98
|
+
|
|
48
99
|
`invitations.issue(accountId, tenantId, recipientEmail)` produces a one-time token and its expiration. Deliver that token to the recipient through the application's invitation link or email. `invitations.accept(token, session.account)` accepts only the intended account with a verified email. The account session supplies `id`, `email`, and `emailVerified`. The token digest, expiry, and redemption state stay in storage. Tenant invitations grant membership and work with identity systems that support verified account emails.
|
|
49
100
|
|
|
101
|
+
Applications with tenant sign-in requirements can pass a
|
|
102
|
+
`TenantInvitationAcceptanceCheck` as the third argument to
|
|
103
|
+
`invitations.accept`. The callback receives the locked invitation's tenant,
|
|
104
|
+
the verified accepting account, and the same Postgres transaction. Return
|
|
105
|
+
`true` to permit redemption. Denial leaves the invitation unconsumed and
|
|
106
|
+
membership unchanged. Use the supplied tenant and account for policy lookup.
|
|
107
|
+
|
|
50
108
|
Use `context.audience` for feature flag evaluation and `context.auditScope` for tenant audit reads. `tenantAuditConfiguration` defines the `tenant_id` dimension for tenant and membership records. It excludes invitation rows. Bind `createTenantDirectory(database)` as the flag manager's platform-authorized tenant directory.
|
|
51
109
|
|
|
52
110
|
## What it refuses to do
|
|
@@ -55,6 +113,76 @@ Membership administration rejects access across tenant boundaries. The service d
|
|
|
55
113
|
|
|
56
114
|
## Contract
|
|
57
115
|
|
|
58
|
-
The data and authorization ports use the same serializable Postgres transaction.
|
|
116
|
+
The data and authorization ports use the same serializable Postgres transaction. On an empty database, install the package's `tenantMigrations` through the
|
|
117
|
+
application's runner or call `installTenantSchemaV2` in an application-owned
|
|
118
|
+
migration. Both options install tenant, membership, invitation, and SCIM
|
|
119
|
+
user and group storage. Choose one path. Invitation acceptance always checks
|
|
120
|
+
directory user storage for a deactivated account binding. The Postgres access adapter has [Trusted experimental status](../postgres-access/README.md#trusted-experimental). Applications can own additional kinds and sub-scopes in their composed access model.
|
|
59
121
|
|
|
60
122
|
Translate `TenantUnavailableError` and `TenantInvitationUnavailableError` at the transport boundary. A database error rejects the transaction and leaves membership state unchanged. When a transaction retries after a PostgreSQL serialization failure, run the whole operation again.
|
|
123
|
+
|
|
124
|
+
## Upgrade an existing tenant schema
|
|
125
|
+
|
|
126
|
+
Keep applied migration files intact. If your application used only
|
|
127
|
+
`installTenantSchemaV1`, add a new forward migration that calls
|
|
128
|
+
`installTenantScimSchemaV1` followed by `installTenantScimGroupSchemaV1`.
|
|
129
|
+
Apply it before serving invitation acceptance. If the SCIM user installer
|
|
130
|
+
already ran, add only the group installer. Databases with both SCIM
|
|
131
|
+
migrations already applied, including the generated starter, have the
|
|
132
|
+
complete schema and need no additional tenant migration. Reserve
|
|
133
|
+
`installTenantSchemaV2` for fresh databases.
|
|
134
|
+
|
|
135
|
+
## SCIM provisioning
|
|
136
|
+
|
|
137
|
+
Use the same tenant options and synchronous Postgres access adapter for the
|
|
138
|
+
tenant service and the SCIM directory.
|
|
139
|
+
|
|
140
|
+
```ts
|
|
141
|
+
import { createScimHandler } from "@dads-framework/identity/scim";
|
|
142
|
+
import {
|
|
143
|
+
createTenantScimDirectory,
|
|
144
|
+
createTenantScimGroupDirectory,
|
|
145
|
+
} from "@dads-framework/tenants";
|
|
146
|
+
|
|
147
|
+
const scim = createScimHandler({
|
|
148
|
+
baseUrl: "https://app.example.com/scim/v2",
|
|
149
|
+
authenticate: resolveTenantFromScimBearer,
|
|
150
|
+
directory: createTenantScimDirectory(tenantOptions),
|
|
151
|
+
groups: createTenantScimGroupDirectory(tenantOptions),
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
// A tenant owner supplies an app-verified mapping to an existing local member.
|
|
155
|
+
await tenants.bindScimUser(
|
|
156
|
+
ownerSession.account.id,
|
|
157
|
+
tenant.id,
|
|
158
|
+
scimUser.id,
|
|
159
|
+
memberAccountId,
|
|
160
|
+
);
|
|
161
|
+
```
|
|
162
|
+
|
|
163
|
+
Mount the handler at its canonical base URL. Resolve each credential to the
|
|
164
|
+
tenant it manages and reject unknown or revoked credentials. SCIM profile
|
|
165
|
+
fields, including email and external ID, are directory data. Account linking
|
|
166
|
+
requires an explicit owner action and an existing non-owner membership in
|
|
167
|
+
that tenant. A local account can link to one SCIM user per tenant.
|
|
168
|
+
|
|
169
|
+
SCIM creation and reactivation leave membership grants to the application.
|
|
170
|
+
Setting `active` to `false` or deleting a linked SCIM user removes its
|
|
171
|
+
membership and relationship in the same transaction. Invitation redemption
|
|
172
|
+
requires an active linked user. Deletion removes the directory profile and
|
|
173
|
+
retains its resource ID and account binding. To onboard that same local
|
|
174
|
+
account again, provision a new active SCIM user, have an owner move the
|
|
175
|
+
verified account binding with `bindScimUser`, and grant membership through an
|
|
176
|
+
invitation. The deleted resource ID stays retired. Back up the table with
|
|
177
|
+
the tenant data. The default tenant audit configuration excludes SCIM
|
|
178
|
+
profile data.
|
|
179
|
+
|
|
180
|
+
SCIM Groups contain references to current SCIM users in the same tenant.
|
|
181
|
+
Deleting a user removes its group memberships in the same transaction.
|
|
182
|
+
Applications authorize tenant resources through their own role model. Group
|
|
183
|
+
membership carries no application authorization or staff role.
|
|
184
|
+
|
|
185
|
+
Authorize each tenant request on the primary database, including requests
|
|
186
|
+
made with existing account sessions. Use `Tenants.context` or the same
|
|
187
|
+
transactional authorization model for tenant resources. Application-owned
|
|
188
|
+
grants outside the tenant role model require their own revocation policy.
|
package/dist/index.d.ts
CHANGED
|
@@ -1,9 +1,14 @@
|
|
|
1
1
|
export { assignableTenantRoleSchema, createTenantAccess, tenantEntity, tenantIdSchema, tenantRoles, type TenantAccess, type TenantId, type TenantRole, } from "./tenant-access.js";
|
|
2
2
|
export { createTenantDirectory, tenantAuditConfiguration, } from "./tenant-composition.js";
|
|
3
|
-
export { type AuthenticatedTenantAccount, TenantInvitationUnavailableError, } from "./tenant-invitations.js";
|
|
3
|
+
export { type AuthenticatedTenantAccount, type TenantInvitationAcceptanceCheck, TenantInvitationUnavailableError, } from "./tenant-invitations.js";
|
|
4
4
|
export type { TenantMembership } from "./tenant-memberships.js";
|
|
5
5
|
export { TenantUnavailableError, type TenantsOptions, type TenantTransaction, } from "./tenant-transaction.js";
|
|
6
6
|
export { Tenants, type TenantContext, type TenantRecord } from "./tenants.js";
|
|
7
7
|
export { tenantMigrations } from "./tenant-migrations.js";
|
|
8
|
+
export { installTenantSchemaV2 } from "./install-tenant-schema-v2.js";
|
|
8
9
|
export { installTenantSchemaV1 } from "./migrations/20261120040000_tenants.migration.js";
|
|
10
|
+
export { createTenantScimDirectory } from "./tenant-scim-directory.js";
|
|
11
|
+
export { installTenantScimSchemaV1 } from "./migrations/20261120080000_tenant_scim.migration.js";
|
|
12
|
+
export { createTenantScimGroupDirectory } from "./tenant-scim-group-directory.js";
|
|
13
|
+
export { installTenantScimGroupSchemaV1 } from "./migrations/20261120080100_tenant_scim_groups.migration.js";
|
|
9
14
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,0BAA0B,EAC/B,gCAAgC,GACjC,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACL,sBAAsB,EACtB,KAAK,cAAc,EACnB,KAAK,iBAAiB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,WAAW,EACX,KAAK,YAAY,EACjB,KAAK,QAAQ,EACb,KAAK,UAAU,GAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EACL,KAAK,0BAA0B,EAC/B,KAAK,+BAA+B,EACpC,gCAAgC,GACjC,MAAM,yBAAyB,CAAC;AACjC,YAAY,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EACL,sBAAsB,EACtB,KAAK,cAAc,EACnB,KAAK,iBAAiB,GACvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAEzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -4,5 +4,10 @@ export { TenantInvitationUnavailableError, } from "./tenant-invitations.js";
|
|
|
4
4
|
export { TenantUnavailableError, } from "./tenant-transaction.js";
|
|
5
5
|
export { Tenants } from "./tenants.js";
|
|
6
6
|
export { tenantMigrations } from "./tenant-migrations.js";
|
|
7
|
+
export { installTenantSchemaV2 } from "./install-tenant-schema-v2.js";
|
|
7
8
|
export { installTenantSchemaV1 } from "./migrations/20261120040000_tenants.migration.js";
|
|
9
|
+
export { createTenantScimDirectory } from "./tenant-scim-directory.js";
|
|
10
|
+
export { installTenantScimSchemaV1 } from "./migrations/20261120080000_tenant_scim.migration.js";
|
|
11
|
+
export { createTenantScimGroupDirectory } from "./tenant-scim-group-directory.js";
|
|
12
|
+
export { installTenantScimGroupSchemaV1 } from "./migrations/20261120080100_tenant_scim_groups.migration.js";
|
|
8
13
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,WAAW,GAIZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,0BAA0B,EAC1B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,WAAW,GAIZ,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,qBAAqB,EACrB,wBAAwB,GACzB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAGL,gCAAgC,GACjC,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EACL,sBAAsB,GAGvB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,OAAO,EAAyC,MAAM,cAAc,CAAC;AAE9E,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAE,qBAAqB,EAAE,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AAEzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,4BAA4B,CAAC;AACvE,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,8BAA8B,EAAE,MAAM,kCAAkC,CAAC;AAClF,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import type { MigrationBuilder } from "node-pg-migrate";
|
|
2
|
+
/** Install the V2 tenant schema on a fresh database, including directory storage. */
|
|
3
|
+
export declare function installTenantSchemaV2(pgm: Pick<MigrationBuilder, "sql">): void;
|
|
4
|
+
//# sourceMappingURL=install-tenant-schema-v2.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install-tenant-schema-v2.d.ts","sourceRoot":"","sources":["../src/install-tenant-schema-v2.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAMxD,qFAAqF;AACrF,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,GACjC,IAAI,CAIN"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { installTenantSchemaV1 } from "./migrations/20261120040000_tenants.migration.js";
|
|
2
|
+
import { installTenantScimSchemaV1 } from "./migrations/20261120080000_tenant_scim.migration.js";
|
|
3
|
+
import { installTenantScimGroupSchemaV1 } from "./migrations/20261120080100_tenant_scim_groups.migration.js";
|
|
4
|
+
/** Install the V2 tenant schema on a fresh database, including directory storage. */
|
|
5
|
+
export function installTenantSchemaV2(pgm) {
|
|
6
|
+
installTenantSchemaV1(pgm);
|
|
7
|
+
installTenantScimSchemaV1(pgm);
|
|
8
|
+
installTenantScimGroupSchemaV1(pgm);
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=install-tenant-schema-v2.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"install-tenant-schema-v2.js","sourceRoot":"","sources":["../src/install-tenant-schema-v2.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,kDAAkD,CAAC;AACzF,OAAO,EAAE,yBAAyB,EAAE,MAAM,sDAAsD,CAAC;AACjG,OAAO,EAAE,8BAA8B,EAAE,MAAM,6DAA6D,CAAC;AAE7G,qFAAqF;AACrF,MAAM,UAAU,qBAAqB,CACnC,GAAkC;IAElC,qBAAqB,CAAC,GAAG,CAAC,CAAC;IAC3B,yBAAyB,CAAC,GAAG,CAAC,CAAC;IAC/B,8BAA8B,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { TenantId } from "./tenant-access.js";
|
|
2
|
+
import { type TenantsOptions } from "./tenant-transaction.js";
|
|
3
|
+
/** Inspect a member of this tenant using a single authorized database snapshot. */
|
|
4
|
+
export declare function inspectMemberPermissions(options: TenantsOptions, actorId: string, tenantId: TenantId, accountId: string): Promise<{
|
|
5
|
+
role: "admin" | "member" | "owner";
|
|
6
|
+
view: boolean;
|
|
7
|
+
manageMembers: boolean;
|
|
8
|
+
manageTenant: boolean;
|
|
9
|
+
}>;
|
|
10
|
+
//# sourceMappingURL=membership-permissions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"membership-permissions.d.ts","sourceRoot":"","sources":["../src/membership-permissions.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAC;AAEjC,mFAAmF;AACnF,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM;;;;;GAmDlB"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { and, eq } from "drizzle-orm";
|
|
2
|
+
import { tenantMembership } from "./tenant-tables.js";
|
|
3
|
+
import { accountSubject, checkTenantPermission, TenantUnavailableError, tenantTransaction, } from "./tenant-transaction.js";
|
|
4
|
+
/** Inspect a member of this tenant using a single authorized database snapshot. */
|
|
5
|
+
export function inspectMemberPermissions(options, actorId, tenantId, accountId) {
|
|
6
|
+
const actor = accountSubject(options, actorId);
|
|
7
|
+
const member = accountSubject(options, accountId);
|
|
8
|
+
return tenantTransaction(options, async (tx) => {
|
|
9
|
+
if (!(await checkTenantPermission(options, tx, actor, tenantId, "manage_members"))) {
|
|
10
|
+
throw new TenantUnavailableError();
|
|
11
|
+
}
|
|
12
|
+
const [membership] = await tx
|
|
13
|
+
.select({ role: tenantMembership.role })
|
|
14
|
+
.from(tenantMembership)
|
|
15
|
+
.where(and(eq(tenantMembership.tenantId, tenantId), eq(tenantMembership.accountId, member.id)));
|
|
16
|
+
if (membership === undefined)
|
|
17
|
+
throw new TenantUnavailableError();
|
|
18
|
+
const view = await checkTenantPermission(options, tx, member, tenantId, "view");
|
|
19
|
+
const manageMembers = await checkTenantPermission(options, tx, member, tenantId, "manage_members");
|
|
20
|
+
const manageTenant = await checkTenantPermission(options, tx, member, tenantId, "manage_tenant");
|
|
21
|
+
return { role: membership.role, view, manageMembers, manageTenant };
|
|
22
|
+
});
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=membership-permissions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"membership-permissions.js","sourceRoot":"","sources":["../src/membership-permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,aAAa,CAAC;AAGtC,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,GAElB,MAAM,yBAAyB,CAAC;AAEjC,mFAAmF;AACnF,MAAM,UAAU,wBAAwB,CACtC,OAAuB,EACvB,OAAe,EACf,QAAkB,EAClB,SAAiB;IAEjB,MAAM,KAAK,GAAG,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAClD,OAAO,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;QAC7C,IACE,CAAC,CAAC,MAAM,qBAAqB,CAC3B,OAAO,EACP,EAAE,EACF,KAAK,EACL,QAAQ,EACR,gBAAgB,CACjB,CAAC,EACF,CAAC;YACD,MAAM,IAAI,sBAAsB,EAAE,CAAC;QACrC,CAAC;QAED,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,EAAE;aAC1B,MAAM,CAAC,EAAE,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,CAAC;aACvC,IAAI,CAAC,gBAAgB,CAAC;aACtB,KAAK,CACJ,GAAG,CACD,EAAE,CAAC,gBAAgB,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACvC,EAAE,CAAC,gBAAgB,CAAC,SAAS,EAAE,MAAM,CAAC,EAAE,CAAC,CAC1C,CACF,CAAC;QACJ,IAAI,UAAU,KAAK,SAAS;YAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;QAEjE,MAAM,IAAI,GAAG,MAAM,qBAAqB,CACtC,OAAO,EACP,EAAE,EACF,MAAM,EACN,QAAQ,EACR,MAAM,CACP,CAAC;QACF,MAAM,aAAa,GAAG,MAAM,qBAAqB,CAC/C,OAAO,EACP,EAAE,EACF,MAAM,EACN,QAAQ,EACR,gBAAgB,CACjB,CAAC;QACF,MAAM,YAAY,GAAG,MAAM,qBAAqB,CAC9C,OAAO,EACP,EAAE,EACF,MAAM,EACN,QAAQ,EACR,eAAe,CAChB,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,aAAa,EAAE,YAAY,EAAE,CAAC;IACtE,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { MigrationBuilder } from "node-pg-migrate";
|
|
2
|
+
export declare function installTenantScimSchemaV1(pgm: Pick<MigrationBuilder, "sql">): void;
|
|
3
|
+
export declare function up(pgm: MigrationBuilder): void;
|
|
4
|
+
export declare function down(pgm: MigrationBuilder): void;
|
|
5
|
+
//# sourceMappingURL=20261120080000_tenant_scim.migration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261120080000_tenant_scim.migration.d.ts","sourceRoot":"","sources":["../../src/migrations/20261120080000_tenant_scim.migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,GACjC,IAAI,CA0BN;AAED,wBAAgB,EAAE,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAE9C;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAEhD"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export function installTenantScimSchemaV1(pgm) {
|
|
2
|
+
pgm.sql(`
|
|
3
|
+
CREATE TABLE tenant_scim_user (
|
|
4
|
+
tenant_id uuid NOT NULL REFERENCES tenant(id),
|
|
5
|
+
id uuid NOT NULL,
|
|
6
|
+
user_name text NOT NULL,
|
|
7
|
+
user_name_key text NOT NULL,
|
|
8
|
+
active boolean NOT NULL,
|
|
9
|
+
external_id text,
|
|
10
|
+
display_name text,
|
|
11
|
+
display_name_key text,
|
|
12
|
+
name jsonb,
|
|
13
|
+
emails jsonb,
|
|
14
|
+
email_keys text[],
|
|
15
|
+
account_id text,
|
|
16
|
+
created_at timestamptz NOT NULL,
|
|
17
|
+
modified_at timestamptz NOT NULL,
|
|
18
|
+
deleted_at timestamptz,
|
|
19
|
+
PRIMARY KEY (tenant_id, id),
|
|
20
|
+
UNIQUE (tenant_id, account_id),
|
|
21
|
+
CHECK (deleted_at IS NULL OR NOT active)
|
|
22
|
+
);
|
|
23
|
+
CREATE UNIQUE INDEX tenant_scim_user_live_name
|
|
24
|
+
ON tenant_scim_user (tenant_id, user_name_key)
|
|
25
|
+
WHERE deleted_at IS NULL;
|
|
26
|
+
`);
|
|
27
|
+
}
|
|
28
|
+
export function up(pgm) {
|
|
29
|
+
installTenantScimSchemaV1(pgm);
|
|
30
|
+
}
|
|
31
|
+
export function down(pgm) {
|
|
32
|
+
pgm.dropTable("tenant_scim_user");
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=20261120080000_tenant_scim.migration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261120080000_tenant_scim.migration.js","sourceRoot":"","sources":["../../src/migrations/20261120080000_tenant_scim.migration.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,yBAAyB,CACvC,GAAkC;IAElC,GAAG,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;GAwBP,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,EAAE,CAAC,GAAqB;IACtC,yBAAyB,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,GAAqB;IACxC,GAAG,CAAC,SAAS,CAAC,kBAAkB,CAAC,CAAC;AACpC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { MigrationBuilder } from "node-pg-migrate";
|
|
2
|
+
export declare function installTenantScimGroupSchemaV1(pgm: Pick<MigrationBuilder, "sql">): void;
|
|
3
|
+
export declare function up(pgm: MigrationBuilder): void;
|
|
4
|
+
export declare function down(pgm: MigrationBuilder): void;
|
|
5
|
+
//# sourceMappingURL=20261120080100_tenant_scim_groups.migration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261120080100_tenant_scim_groups.migration.d.ts","sourceRoot":"","sources":["../../src/migrations/20261120080100_tenant_scim_groups.migration.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAExD,wBAAgB,8BAA8B,CAC5C,GAAG,EAAE,IAAI,CAAC,gBAAgB,EAAE,KAAK,CAAC,GACjC,IAAI,CAyBN;AAED,wBAAgB,EAAE,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAE9C;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,gBAAgB,GAAG,IAAI,CAGhD"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
export function installTenantScimGroupSchemaV1(pgm) {
|
|
2
|
+
pgm.sql(`
|
|
3
|
+
CREATE TABLE tenant_scim_group (
|
|
4
|
+
tenant_id uuid NOT NULL REFERENCES tenant(id),
|
|
5
|
+
id uuid NOT NULL,
|
|
6
|
+
display_name text NOT NULL,
|
|
7
|
+
display_name_key text NOT NULL,
|
|
8
|
+
external_id text,
|
|
9
|
+
created_at timestamptz NOT NULL,
|
|
10
|
+
modified_at timestamptz NOT NULL,
|
|
11
|
+
PRIMARY KEY (tenant_id, id)
|
|
12
|
+
);
|
|
13
|
+
CREATE TABLE tenant_scim_group_member (
|
|
14
|
+
tenant_id uuid NOT NULL,
|
|
15
|
+
group_id uuid NOT NULL,
|
|
16
|
+
user_id uuid NOT NULL,
|
|
17
|
+
PRIMARY KEY (tenant_id, group_id, user_id),
|
|
18
|
+
FOREIGN KEY (tenant_id, group_id)
|
|
19
|
+
REFERENCES tenant_scim_group (tenant_id, id) ON DELETE CASCADE,
|
|
20
|
+
FOREIGN KEY (tenant_id, user_id)
|
|
21
|
+
REFERENCES tenant_scim_user (tenant_id, id)
|
|
22
|
+
);
|
|
23
|
+
CREATE INDEX tenant_scim_group_member_user
|
|
24
|
+
ON tenant_scim_group_member (tenant_id, user_id);
|
|
25
|
+
`);
|
|
26
|
+
}
|
|
27
|
+
export function up(pgm) {
|
|
28
|
+
installTenantScimGroupSchemaV1(pgm);
|
|
29
|
+
}
|
|
30
|
+
export function down(pgm) {
|
|
31
|
+
pgm.dropTable("tenant_scim_group_member");
|
|
32
|
+
pgm.dropTable("tenant_scim_group");
|
|
33
|
+
}
|
|
34
|
+
//# sourceMappingURL=20261120080100_tenant_scim_groups.migration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"20261120080100_tenant_scim_groups.migration.js","sourceRoot":"","sources":["../../src/migrations/20261120080100_tenant_scim_groups.migration.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,8BAA8B,CAC5C,GAAkC;IAElC,GAAG,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;GAuBP,CAAC,CAAC;AACL,CAAC;AAED,MAAM,UAAU,EAAE,CAAC,GAAqB;IACtC,8BAA8B,CAAC,GAAG,CAAC,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,IAAI,CAAC,GAAqB;IACxC,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC,CAAC;IAC1C,GAAG,CAAC,SAAS,CAAC,mBAAmB,CAAC,CAAC;AACrC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-composition.d.ts","sourceRoot":"","sources":["../src/tenant-composition.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,uEAAuE;AACvE,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC;IAGhC,iBAAiB,MAAM,SAAS,MAAM,EAAE;;;;EAcjD;AAED,kFAAkF;AAClF,eAAO,MAAM,wBAAwB;IACnC,MAAM;QACJ,MAAM;YAAI,UAAU;YAAU,YAAY;gBAAI,SAAS;;;QACvD,iBAAiB;YACf,UAAU;YACV,YAAY;gBAAI,SAAS;;;;IAG7B,aAAa;
|
|
1
|
+
{"version":3,"file":"tenant-composition.d.ts","sourceRoot":"","sources":["../src/tenant-composition.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAE9D,uEAAuE;AACvE,wBAAgB,qBAAqB,CACnC,QAAQ,EAAE,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC;IAGhC,iBAAiB,MAAM,SAAS,MAAM,EAAE;;;;EAcjD;AAED,kFAAkF;AAClF,eAAO,MAAM,wBAAwB;IACnC,MAAM;QACJ,MAAM;YAAI,UAAU;YAAU,YAAY;gBAAI,SAAS;;;QACvD,iBAAiB;YACf,UAAU;YACV,YAAY;gBAAI,SAAS;;;;IAG7B,aAAa;CAMd,CAAC"}
|
|
@@ -30,6 +30,11 @@ export const tenantAuditConfiguration = {
|
|
|
30
30
|
scopeColumns: { tenant_id: "tenant_id" },
|
|
31
31
|
},
|
|
32
32
|
},
|
|
33
|
-
excludeTables: [
|
|
33
|
+
excludeTables: [
|
|
34
|
+
"tenant_invitation",
|
|
35
|
+
"tenant_scim_user",
|
|
36
|
+
"tenant_scim_group",
|
|
37
|
+
"tenant_scim_group_member",
|
|
38
|
+
],
|
|
34
39
|
};
|
|
35
40
|
//# sourceMappingURL=tenant-composition.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-composition.js","sourceRoot":"","sources":["../src/tenant-composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,cAAc,EAAiB,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,uEAAuE;AACvE,MAAM,UAAU,qBAAqB,CACnC,QAAwC;IAExC,OAAO;QACL,KAAK,CAAC,iBAAiB,CAAC,GAAsB;YAC5C,MAAM,QAAQ,GAAe,EAAE,CAAC;YAChC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC5C,IAAI,MAAM,CAAC,OAAO;oBAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YACrC,OAAO,QAAQ;iBACZ,MAAM,EAAE;iBACR,IAAI,CAAC,WAAW,CAAC;iBACjB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;iBACxC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,MAAM,EAAE;QACN,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;QACjE,iBAAiB,EAAE;YACjB,UAAU,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC;YACvC,YAAY,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE;SACzC;KACF;IACD,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"tenant-composition.js","sourceRoot":"","sources":["../src/tenant-composition.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAEtC,OAAO,EAAE,cAAc,EAAiB,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,uEAAuE;AACvE,MAAM,UAAU,qBAAqB,CACnC,QAAwC;IAExC,OAAO;QACL,KAAK,CAAC,iBAAiB,CAAC,GAAsB;YAC5C,MAAM,QAAQ,GAAe,EAAE,CAAC;YAChC,KAAK,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC;gBACrB,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBAC5C,IAAI,MAAM,CAAC,OAAO;oBAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACjD,CAAC;YACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YACrC,OAAO,QAAQ;iBACZ,MAAM,EAAE;iBACR,IAAI,CAAC,WAAW,CAAC;iBACjB,KAAK,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC;iBACxC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;QAC7B,CAAC;KACF,CAAC;AACJ,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,wBAAwB,GAAG;IACtC,MAAM,EAAE;QACN,MAAM,EAAE,EAAE,UAAU,EAAE,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE;QACjE,iBAAiB,EAAE;YACjB,UAAU,EAAE,CAAC,WAAW,EAAE,YAAY,CAAC;YACvC,YAAY,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE;SACzC;KACF;IACD,aAAa,EAAE;QACb,mBAAmB;QACnB,kBAAkB;QAClB,mBAAmB;QACnB,0BAA0B;KAC3B;CACF,CAAC"}
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import type { TenantId } from "./tenant-access.js";
|
|
2
|
-
import { type TenantsOptions } from "./tenant-transaction.js";
|
|
2
|
+
import { type TenantsOptions, type TenantTransaction } from "./tenant-transaction.js";
|
|
3
3
|
/** Authenticated session identity supplied by application composition. */
|
|
4
4
|
export type AuthenticatedTenantAccount = {
|
|
5
5
|
readonly id: string;
|
|
6
6
|
readonly email: string;
|
|
7
7
|
readonly emailVerified: boolean;
|
|
8
8
|
};
|
|
9
|
+
/** Application policy over the verified recipient and locked invitation scope. */
|
|
10
|
+
export type TenantInvitationAcceptanceCheck = (recipient: {
|
|
11
|
+
readonly tenantId: TenantId;
|
|
12
|
+
readonly account: AuthenticatedTenantAccount;
|
|
13
|
+
}, transaction: TenantTransaction) => Promise<boolean>;
|
|
9
14
|
export declare class TenantInvitationUnavailableError extends Error {
|
|
10
15
|
constructor();
|
|
11
16
|
}
|
|
@@ -16,7 +21,7 @@ export declare class TenantInvitations {
|
|
|
16
21
|
readonly token: string;
|
|
17
22
|
readonly expiresAt: Date;
|
|
18
23
|
}>;
|
|
19
|
-
accept(token: string, account: AuthenticatedTenantAccount): Promise<TenantId>;
|
|
24
|
+
accept(token: string, account: AuthenticatedTenantAccount, checkAcceptance?: TenantInvitationAcceptanceCheck): Promise<TenantId>;
|
|
20
25
|
private lockInvitation;
|
|
21
26
|
/** Keep the issuer eligible until the grant commits. Role changes lock the same row. */
|
|
22
27
|
private lockIssuerMembership;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-invitations.d.ts","sourceRoot":"","sources":["../src/tenant-invitations.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"tenant-invitations.d.ts","sourceRoot":"","sources":["../src/tenant-invitations.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAOnD,OAAO,EAKL,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACvB,MAAM,yBAAyB,CAAC;AAMjC,0EAA0E;AAC1E,MAAM,MAAM,0BAA0B,GAAG;IACvC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC,CAAC;AAEF,kFAAkF;AAClF,MAAM,MAAM,+BAA+B,GAAG,CAC5C,SAAS,EAAE;IACT,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,0BAA0B,CAAC;CAC9C,EACD,WAAW,EAAE,iBAAiB,KAC3B,OAAO,CAAC,OAAO,CAAC,CAAC;AAEtB,qBAAa,gCAAiC,SAAQ,KAAK;IACzD,cAGC;CACF;AAED,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAApC,YAA6B,OAAO,EAAE,cAAc,EAAI;IAExD,KAAK,CACH,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAA;KAAE,CAAC,CAyB/D;IAED,MAAM,CACJ,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,0BAA0B,EACnC,eAAe,CAAC,EAAE,+BAA+B,GAChD,OAAO,CAAC,QAAQ,CAAC,CAmDnB;YAEa,cAAc;IAqB5B,wFAAwF;YAC1E,oBAAoB;YAapB,gBAAgB;IAqB9B,OAAO,CAAC,GAAG;CAGZ"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { createHash, randomBytes } from "node:crypto";
|
|
2
|
-
import {
|
|
2
|
+
import { eq } from "drizzle-orm";
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import { membershipFact } from "./membership-facts.js";
|
|
5
|
-
import {
|
|
5
|
+
import { lockScimAccountBinding } from "./tenant-scim-membership.js";
|
|
6
|
+
import { tenantInvitation, tenantMembership, tenantMembershipKey, } from "./tenant-tables.js";
|
|
6
7
|
import { accountSubject, checkTenantPermission, TenantUnavailableError, tenantTransaction, } from "./tenant-transaction.js";
|
|
7
8
|
const invitationTtlMs = 7 * 24 * 60 * 60 * 1000;
|
|
8
9
|
const providerEmail = z.string().trim().toLowerCase().pipe(z.email());
|
|
@@ -36,7 +37,7 @@ export class TenantInvitations {
|
|
|
36
37
|
return { token, expiresAt };
|
|
37
38
|
});
|
|
38
39
|
}
|
|
39
|
-
accept(token, account) {
|
|
40
|
+
accept(token, account, checkAcceptance) {
|
|
40
41
|
const email = providerEmail.safeParse(account.email);
|
|
41
42
|
if (!z.literal(true).safeParse(account.emailVerified).success ||
|
|
42
43
|
!email.success ||
|
|
@@ -51,6 +52,13 @@ export class TenantInvitations {
|
|
|
51
52
|
if (!(await checkTenantPermission(this.options, tx, issuer, invitation.tenantId, "manage_members"))) {
|
|
52
53
|
throw new TenantInvitationUnavailableError();
|
|
53
54
|
}
|
|
55
|
+
if (checkAcceptance !== undefined &&
|
|
56
|
+
!(await checkAcceptance({
|
|
57
|
+
tenantId: invitation.tenantId,
|
|
58
|
+
account: { id: actor.id, email: email.data, emailVerified: true },
|
|
59
|
+
}, tx))) {
|
|
60
|
+
throw new TenantInvitationUnavailableError();
|
|
61
|
+
}
|
|
54
62
|
const acceptedAt = this.now();
|
|
55
63
|
if (invitation.expiresAt <= acceptedAt)
|
|
56
64
|
throw new TenantInvitationUnavailableError();
|
|
@@ -81,12 +89,16 @@ export class TenantInvitations {
|
|
|
81
89
|
const [member] = await tx
|
|
82
90
|
.select({ accountId: tenantMembership.accountId })
|
|
83
91
|
.from(tenantMembership)
|
|
84
|
-
.where(
|
|
92
|
+
.where(tenantMembershipKey(tenantId, accountId))
|
|
85
93
|
.for("share");
|
|
86
94
|
if (member === undefined)
|
|
87
95
|
throw new TenantInvitationUnavailableError();
|
|
88
96
|
}
|
|
89
97
|
async acceptMembership(tx, tenantId, accountId) {
|
|
98
|
+
const scimBinding = await lockScimAccountBinding(tx, tenantId, accountId);
|
|
99
|
+
if (scimBinding?.active === false) {
|
|
100
|
+
throw new TenantInvitationUnavailableError();
|
|
101
|
+
}
|
|
90
102
|
const [added] = await tx
|
|
91
103
|
.insert(tenantMembership)
|
|
92
104
|
.values({ tenantId, accountId, role: "member" })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-invitations.js","sourceRoot":"","sources":["../src/tenant-invitations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"tenant-invitations.js","sourceRoot":"","sources":["../src/tenant-invitations.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,13 @@ export declare class TenantMemberships {
|
|
|
6
6
|
private readonly options;
|
|
7
7
|
constructor(options: TenantsOptions);
|
|
8
8
|
roster(actorId: string, tenantId: TenantId): Promise<readonly TenantMembership[]>;
|
|
9
|
+
/** Read the selected member's effective permissions for this tenant. */
|
|
10
|
+
permissions(actorId: string, tenantId: TenantId, accountId: string): Promise<{
|
|
11
|
+
role: "admin" | "member" | "owner";
|
|
12
|
+
view: boolean;
|
|
13
|
+
manageMembers: boolean;
|
|
14
|
+
manageTenant: boolean;
|
|
15
|
+
}>;
|
|
9
16
|
/** Owners may assign admin or member roles. The creating owner remains an owner. */
|
|
10
17
|
changeRole(actorId: string, tenantId: TenantId, accountId: string, role: Exclude<TenantRole, "owner">): Promise<void>;
|
|
11
18
|
removeMember(actorId: string, tenantId: TenantId, accountId: string): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tenant-memberships.d.ts","sourceRoot":"","sources":["../src/tenant-memberships.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"tenant-memberships.d.ts","sourceRoot":"","sources":["../src/tenant-memberships.ts"],"names":[],"mappings":"AAIA,OAAO,EAEL,KAAK,QAAQ,EACb,KAAK,UAAU,EAChB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAuB,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAKL,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,MAAM,gBAAgB,GAAG,OAAO,gBAAgB,CAAC,YAAY,CAAC;AAEpE,qBAAa,iBAAiB;IAChB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAApC,YAA6B,OAAO,EAAE,cAAc,EAAI;IAExD,MAAM,CACJ,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,SAAS,gBAAgB,EAAE,CAAC,CAmBtC;IAED,wEAAwE;IACxE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM;;;;;OAEjE;IAED,oFAAoF;IACpF,UAAU,CACR,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,EACjB,IAAI,EAAE,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,GACjC,OAAO,CAAC,IAAI,CAAC,CAiDf;IAED,YAAY,CACV,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CA8Cf;CACF"}
|