@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
|
@@ -0,0 +1,189 @@
|
|
|
1
|
+
export declare const tenantScimGroup: import("drizzle-orm/pg-core").PgTableWithColumns<{
|
|
2
|
+
name: "tenant_scim_group";
|
|
3
|
+
schema: undefined;
|
|
4
|
+
columns: {
|
|
5
|
+
tenantId: import("drizzle-orm/pg-core").PgColumn<{
|
|
6
|
+
name: "tenant_id";
|
|
7
|
+
tableName: "tenant_scim_group";
|
|
8
|
+
dataType: "string";
|
|
9
|
+
columnType: "PgUUID";
|
|
10
|
+
data: string & import("zod").$brand<"TenantId">;
|
|
11
|
+
driverParam: string;
|
|
12
|
+
notNull: true;
|
|
13
|
+
hasDefault: false;
|
|
14
|
+
isPrimaryKey: false;
|
|
15
|
+
isAutoincrement: false;
|
|
16
|
+
hasRuntimeDefault: false;
|
|
17
|
+
enumValues: undefined;
|
|
18
|
+
baseColumn: never;
|
|
19
|
+
identity: undefined;
|
|
20
|
+
generated: undefined;
|
|
21
|
+
}, {}, {
|
|
22
|
+
$type: string & import("zod").$brand<"TenantId">;
|
|
23
|
+
}>;
|
|
24
|
+
id: import("drizzle-orm/pg-core").PgColumn<{
|
|
25
|
+
name: "id";
|
|
26
|
+
tableName: "tenant_scim_group";
|
|
27
|
+
dataType: "string";
|
|
28
|
+
columnType: "PgUUID";
|
|
29
|
+
data: string;
|
|
30
|
+
driverParam: string;
|
|
31
|
+
notNull: true;
|
|
32
|
+
hasDefault: false;
|
|
33
|
+
isPrimaryKey: false;
|
|
34
|
+
isAutoincrement: false;
|
|
35
|
+
hasRuntimeDefault: false;
|
|
36
|
+
enumValues: undefined;
|
|
37
|
+
baseColumn: never;
|
|
38
|
+
identity: undefined;
|
|
39
|
+
generated: undefined;
|
|
40
|
+
}, {}, {}>;
|
|
41
|
+
displayName: import("drizzle-orm/pg-core").PgColumn<{
|
|
42
|
+
name: "display_name";
|
|
43
|
+
tableName: "tenant_scim_group";
|
|
44
|
+
dataType: "string";
|
|
45
|
+
columnType: "PgText";
|
|
46
|
+
data: string;
|
|
47
|
+
driverParam: string;
|
|
48
|
+
notNull: true;
|
|
49
|
+
hasDefault: false;
|
|
50
|
+
isPrimaryKey: false;
|
|
51
|
+
isAutoincrement: false;
|
|
52
|
+
hasRuntimeDefault: false;
|
|
53
|
+
enumValues: [string, ...string[]];
|
|
54
|
+
baseColumn: never;
|
|
55
|
+
identity: undefined;
|
|
56
|
+
generated: undefined;
|
|
57
|
+
}, {}, {}>;
|
|
58
|
+
displayNameKey: import("drizzle-orm/pg-core").PgColumn<{
|
|
59
|
+
name: "display_name_key";
|
|
60
|
+
tableName: "tenant_scim_group";
|
|
61
|
+
dataType: "string";
|
|
62
|
+
columnType: "PgText";
|
|
63
|
+
data: string;
|
|
64
|
+
driverParam: string;
|
|
65
|
+
notNull: true;
|
|
66
|
+
hasDefault: false;
|
|
67
|
+
isPrimaryKey: false;
|
|
68
|
+
isAutoincrement: false;
|
|
69
|
+
hasRuntimeDefault: false;
|
|
70
|
+
enumValues: [string, ...string[]];
|
|
71
|
+
baseColumn: never;
|
|
72
|
+
identity: undefined;
|
|
73
|
+
generated: undefined;
|
|
74
|
+
}, {}, {}>;
|
|
75
|
+
externalId: import("drizzle-orm/pg-core").PgColumn<{
|
|
76
|
+
name: "external_id";
|
|
77
|
+
tableName: "tenant_scim_group";
|
|
78
|
+
dataType: "string";
|
|
79
|
+
columnType: "PgText";
|
|
80
|
+
data: string;
|
|
81
|
+
driverParam: string;
|
|
82
|
+
notNull: false;
|
|
83
|
+
hasDefault: false;
|
|
84
|
+
isPrimaryKey: false;
|
|
85
|
+
isAutoincrement: false;
|
|
86
|
+
hasRuntimeDefault: false;
|
|
87
|
+
enumValues: [string, ...string[]];
|
|
88
|
+
baseColumn: never;
|
|
89
|
+
identity: undefined;
|
|
90
|
+
generated: undefined;
|
|
91
|
+
}, {}, {}>;
|
|
92
|
+
createdAt: import("drizzle-orm/pg-core").PgColumn<{
|
|
93
|
+
name: "created_at";
|
|
94
|
+
tableName: "tenant_scim_group";
|
|
95
|
+
dataType: "date";
|
|
96
|
+
columnType: "PgTimestamp";
|
|
97
|
+
data: Date;
|
|
98
|
+
driverParam: string;
|
|
99
|
+
notNull: true;
|
|
100
|
+
hasDefault: false;
|
|
101
|
+
isPrimaryKey: false;
|
|
102
|
+
isAutoincrement: false;
|
|
103
|
+
hasRuntimeDefault: false;
|
|
104
|
+
enumValues: undefined;
|
|
105
|
+
baseColumn: never;
|
|
106
|
+
identity: undefined;
|
|
107
|
+
generated: undefined;
|
|
108
|
+
}, {}, {}>;
|
|
109
|
+
modifiedAt: import("drizzle-orm/pg-core").PgColumn<{
|
|
110
|
+
name: "modified_at";
|
|
111
|
+
tableName: "tenant_scim_group";
|
|
112
|
+
dataType: "date";
|
|
113
|
+
columnType: "PgTimestamp";
|
|
114
|
+
data: Date;
|
|
115
|
+
driverParam: string;
|
|
116
|
+
notNull: true;
|
|
117
|
+
hasDefault: false;
|
|
118
|
+
isPrimaryKey: false;
|
|
119
|
+
isAutoincrement: false;
|
|
120
|
+
hasRuntimeDefault: false;
|
|
121
|
+
enumValues: undefined;
|
|
122
|
+
baseColumn: never;
|
|
123
|
+
identity: undefined;
|
|
124
|
+
generated: undefined;
|
|
125
|
+
}, {}, {}>;
|
|
126
|
+
};
|
|
127
|
+
dialect: 'pg';
|
|
128
|
+
}>;
|
|
129
|
+
export declare const tenantScimGroupMember: import("drizzle-orm/pg-core").PgTableWithColumns<{
|
|
130
|
+
name: "tenant_scim_group_member";
|
|
131
|
+
schema: undefined;
|
|
132
|
+
columns: {
|
|
133
|
+
tenantId: import("drizzle-orm/pg-core").PgColumn<{
|
|
134
|
+
name: "tenant_id";
|
|
135
|
+
tableName: "tenant_scim_group_member";
|
|
136
|
+
dataType: "string";
|
|
137
|
+
columnType: "PgUUID";
|
|
138
|
+
data: string & import("zod").$brand<"TenantId">;
|
|
139
|
+
driverParam: string;
|
|
140
|
+
notNull: true;
|
|
141
|
+
hasDefault: false;
|
|
142
|
+
isPrimaryKey: false;
|
|
143
|
+
isAutoincrement: false;
|
|
144
|
+
hasRuntimeDefault: false;
|
|
145
|
+
enumValues: undefined;
|
|
146
|
+
baseColumn: never;
|
|
147
|
+
identity: undefined;
|
|
148
|
+
generated: undefined;
|
|
149
|
+
}, {}, {
|
|
150
|
+
$type: string & import("zod").$brand<"TenantId">;
|
|
151
|
+
}>;
|
|
152
|
+
groupId: import("drizzle-orm/pg-core").PgColumn<{
|
|
153
|
+
name: "group_id";
|
|
154
|
+
tableName: "tenant_scim_group_member";
|
|
155
|
+
dataType: "string";
|
|
156
|
+
columnType: "PgUUID";
|
|
157
|
+
data: string;
|
|
158
|
+
driverParam: string;
|
|
159
|
+
notNull: true;
|
|
160
|
+
hasDefault: false;
|
|
161
|
+
isPrimaryKey: false;
|
|
162
|
+
isAutoincrement: false;
|
|
163
|
+
hasRuntimeDefault: false;
|
|
164
|
+
enumValues: undefined;
|
|
165
|
+
baseColumn: never;
|
|
166
|
+
identity: undefined;
|
|
167
|
+
generated: undefined;
|
|
168
|
+
}, {}, {}>;
|
|
169
|
+
userId: import("drizzle-orm/pg-core").PgColumn<{
|
|
170
|
+
name: "user_id";
|
|
171
|
+
tableName: "tenant_scim_group_member";
|
|
172
|
+
dataType: "string";
|
|
173
|
+
columnType: "PgUUID";
|
|
174
|
+
data: string;
|
|
175
|
+
driverParam: string;
|
|
176
|
+
notNull: true;
|
|
177
|
+
hasDefault: false;
|
|
178
|
+
isPrimaryKey: false;
|
|
179
|
+
isAutoincrement: false;
|
|
180
|
+
hasRuntimeDefault: false;
|
|
181
|
+
enumValues: undefined;
|
|
182
|
+
baseColumn: never;
|
|
183
|
+
identity: undefined;
|
|
184
|
+
generated: undefined;
|
|
185
|
+
}, {}, {}>;
|
|
186
|
+
};
|
|
187
|
+
dialect: 'pg';
|
|
188
|
+
}>;
|
|
189
|
+
//# sourceMappingURL=tenant-scim-group-tables.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant-scim-group-tables.d.ts","sourceRoot":"","sources":["../src/tenant-scim-group-tables.ts"],"names":[],"mappings":"AAWA,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqB3B,CAAC;AAEF,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAUjC,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { pgTable, primaryKey, text, timestamp, uuid, } from "drizzle-orm/pg-core";
|
|
2
|
+
import { tenantTable } from "./tenant-tables.js";
|
|
3
|
+
export const tenantScimGroup = pgTable("tenant_scim_group", {
|
|
4
|
+
tenantId: uuid("tenant_id")
|
|
5
|
+
.$type()
|
|
6
|
+
.notNull()
|
|
7
|
+
.references(() => tenantTable.id),
|
|
8
|
+
id: uuid("id").notNull(),
|
|
9
|
+
displayName: text("display_name").notNull(),
|
|
10
|
+
displayNameKey: text("display_name_key").notNull(),
|
|
11
|
+
externalId: text("external_id"),
|
|
12
|
+
createdAt: timestamp("created_at", {
|
|
13
|
+
mode: "date",
|
|
14
|
+
withTimezone: true,
|
|
15
|
+
}).notNull(),
|
|
16
|
+
modifiedAt: timestamp("modified_at", {
|
|
17
|
+
mode: "date",
|
|
18
|
+
withTimezone: true,
|
|
19
|
+
}).notNull(),
|
|
20
|
+
}, (table) => [primaryKey({ columns: [table.tenantId, table.id] })]);
|
|
21
|
+
export const tenantScimGroupMember = pgTable("tenant_scim_group_member", {
|
|
22
|
+
tenantId: uuid("tenant_id").$type().notNull(),
|
|
23
|
+
groupId: uuid("group_id").notNull(),
|
|
24
|
+
userId: uuid("user_id").notNull(),
|
|
25
|
+
}, (table) => [
|
|
26
|
+
primaryKey({ columns: [table.tenantId, table.groupId, table.userId] }),
|
|
27
|
+
]);
|
|
28
|
+
//# sourceMappingURL=tenant-scim-group-tables.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant-scim-group-tables.js","sourceRoot":"","sources":["../src/tenant-scim-group-tables.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EACP,UAAU,EACV,IAAI,EACJ,SAAS,EACT,IAAI,GACL,MAAM,qBAAqB,CAAC;AAG7B,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,MAAM,eAAe,GAAG,OAAO,CACpC,mBAAmB,EACnB;IACE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC;SACxB,KAAK,EAAY;SACjB,OAAO,EAAE;SACT,UAAU,CAAC,GAAG,EAAE,CAAC,WAAW,CAAC,EAAE,CAAC;IACnC,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE;IACxB,WAAW,EAAE,IAAI,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE;IAC3C,cAAc,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,EAAE;IAClD,UAAU,EAAE,IAAI,CAAC,aAAa,CAAC;IAC/B,SAAS,EAAE,SAAS,CAAC,YAAY,EAAE;QACjC,IAAI,EAAE,MAAM;QACZ,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC,OAAO,EAAE;IACZ,UAAU,EAAE,SAAS,CAAC,aAAa,EAAE;QACnC,IAAI,EAAE,MAAM;QACZ,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC,OAAO,EAAE;CACb,EACD,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACjE,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,OAAO,CAC1C,0BAA0B,EAC1B;IACE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,KAAK,EAAY,CAAC,OAAO,EAAE;IACvD,OAAO,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,EAAE;IACnC,MAAM,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE;CAClC,EACD,CAAC,KAAK,EAAE,EAAE,CAAC;IACT,UAAU,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;CACvE,CACF,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { type TenantId } from "./tenant-access.js";
|
|
3
|
+
import { type TenantTransaction, type TenantsOptions } from "./tenant-transaction.js";
|
|
4
|
+
export declare const scimIdSchema: z.ZodUUID;
|
|
5
|
+
export declare function liveScimUser(tenantId: TenantId, id?: string): import("drizzle-orm").SQL<unknown> | undefined;
|
|
6
|
+
export declare function bindTenantScimUser(options: TenantsOptions, actorId: string, tenantId: TenantId, userId: string, accountId: string): Promise<void>;
|
|
7
|
+
/** Hold the directory row through the invitation's membership write. */
|
|
8
|
+
export declare function lockScimAccountBinding(tx: TenantTransaction, tenantId: TenantId, accountId: string): Promise<{
|
|
9
|
+
active: boolean;
|
|
10
|
+
} | undefined>;
|
|
11
|
+
export declare function revokeScimManagedMembership(options: TenantsOptions, tx: TenantTransaction, tenantId: TenantId, accountId: string | null): Promise<void>;
|
|
12
|
+
//# sourceMappingURL=tenant-scim-membership.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant-scim-membership.d.ts","sourceRoot":"","sources":["../src/tenant-scim-membership.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAGnE,OAAO,EAKL,KAAK,iBAAiB,EACtB,KAAK,cAAc,EACpB,MAAM,yBAAyB,CAAC;AAEjC,eAAO,MAAM,YAAY,WAAmD,CAAC;AAE7E,wBAAgB,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,EAAE,CAAC,EAAE,MAAM,kDAM3D;AAED,wBAAsB,kBAAkB,CACtC,OAAO,EAAE,cAAc,EACvB,OAAO,EAAE,MAAM,EACf,QAAQ,EAAE,QAAQ,EAClB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,IAAI,CAAC,CA8Cf;AAoBD,wEAAwE;AACxE,wBAAsB,sBAAsB,CAC1C,EAAE,EAAE,iBAAiB,EACrB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM;;eAQlB;AAED,wBAAsB,2BAA2B,CAC/C,OAAO,EAAE,cAAc,EACvB,EAAE,EAAE,iBAAiB,EACrB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,MAAM,GAAG,IAAI,GACvB,OAAO,CAAC,IAAI,CAAC,CAYf"}
|
|
@@ -0,0 +1,87 @@
|
|
|
1
|
+
import { isUniqueViolation } from "@dads-framework/postgres";
|
|
2
|
+
import { and, eq, isNotNull, isNull } from "drizzle-orm";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
import { membershipFact } from "./membership-facts.js";
|
|
5
|
+
import { tenantIdSchema } from "./tenant-access.js";
|
|
6
|
+
import { tenantScimUser } from "./tenant-scim-table.js";
|
|
7
|
+
import { tenantMembership, tenantMembershipKey } from "./tenant-tables.js";
|
|
8
|
+
import { accountSubject, checkTenantPermission, TenantUnavailableError, tenantTransaction, } from "./tenant-transaction.js";
|
|
9
|
+
export const scimIdSchema = z.uuid().refine((id) => id === id.toLowerCase());
|
|
10
|
+
export function liveScimUser(tenantId, id) {
|
|
11
|
+
return and(eq(tenantScimUser.tenantId, tenantId), isNull(tenantScimUser.deletedAt), id === undefined ? undefined : eq(tenantScimUser.id, id));
|
|
12
|
+
}
|
|
13
|
+
export async function bindTenantScimUser(options, actorId, tenantId, userId, accountId) {
|
|
14
|
+
const actor = accountSubject(options, actorId);
|
|
15
|
+
const target = accountSubject(options, accountId);
|
|
16
|
+
const tenant = tenantIdSchema.parse(tenantId);
|
|
17
|
+
const id = scimIdSchema.parse(userId);
|
|
18
|
+
try {
|
|
19
|
+
await tenantTransaction(options, async (tx) => {
|
|
20
|
+
if (!(await checkTenantPermission(options, tx, actor, tenant, "manage_tenant")))
|
|
21
|
+
throw new TenantUnavailableError();
|
|
22
|
+
const userKey = liveScimUser(tenant, id);
|
|
23
|
+
const [user] = await tx
|
|
24
|
+
.select()
|
|
25
|
+
.from(tenantScimUser)
|
|
26
|
+
.where(userKey)
|
|
27
|
+
.for("update");
|
|
28
|
+
if (user === undefined ||
|
|
29
|
+
!user.active ||
|
|
30
|
+
(user.accountId !== null && user.accountId !== target.id))
|
|
31
|
+
throw new TenantUnavailableError();
|
|
32
|
+
const [member] = await tx
|
|
33
|
+
.select()
|
|
34
|
+
.from(tenantMembership)
|
|
35
|
+
.where(tenantMembershipKey(tenant, target.id))
|
|
36
|
+
.for("update");
|
|
37
|
+
if (member?.role === "owner")
|
|
38
|
+
throw new TenantUnavailableError();
|
|
39
|
+
if (member === undefined)
|
|
40
|
+
await releaseDeletedScimBinding(tx, tenant, target.id);
|
|
41
|
+
await tx
|
|
42
|
+
.update(tenantScimUser)
|
|
43
|
+
.set({ accountId: target.id })
|
|
44
|
+
.where(userKey);
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
catch (error) {
|
|
48
|
+
if (isUniqueViolation(error))
|
|
49
|
+
throw new TenantUnavailableError();
|
|
50
|
+
throw error;
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
async function releaseDeletedScimBinding(tx, tenantId, accountId) {
|
|
54
|
+
const [previous] = await tx
|
|
55
|
+
.update(tenantScimUser)
|
|
56
|
+
.set({ accountId: null })
|
|
57
|
+
.where(and(scimAccountKey(tenantId, accountId), isNotNull(tenantScimUser.deletedAt)))
|
|
58
|
+
.returning({ id: tenantScimUser.id });
|
|
59
|
+
if (previous === undefined)
|
|
60
|
+
throw new TenantUnavailableError();
|
|
61
|
+
}
|
|
62
|
+
/** Hold the directory row through the invitation's membership write. */
|
|
63
|
+
export async function lockScimAccountBinding(tx, tenantId, accountId) {
|
|
64
|
+
const [user] = await tx
|
|
65
|
+
.select({ active: tenantScimUser.active })
|
|
66
|
+
.from(tenantScimUser)
|
|
67
|
+
.where(scimAccountKey(tenantId, accountId))
|
|
68
|
+
.for("update");
|
|
69
|
+
return user;
|
|
70
|
+
}
|
|
71
|
+
export async function revokeScimManagedMembership(options, tx, tenantId, accountId) {
|
|
72
|
+
if (accountId === null)
|
|
73
|
+
return;
|
|
74
|
+
const [member] = await tx
|
|
75
|
+
.delete(tenantMembership)
|
|
76
|
+
.where(tenantMembershipKey(tenantId, accountId))
|
|
77
|
+
.returning();
|
|
78
|
+
if (member === undefined)
|
|
79
|
+
return;
|
|
80
|
+
if (member.role === "owner")
|
|
81
|
+
throw new TenantUnavailableError();
|
|
82
|
+
await options.changes.enqueue([membershipFact(options, tenantId, accountId, member.role, "DELETE")], tx);
|
|
83
|
+
}
|
|
84
|
+
function scimAccountKey(tenantId, accountId) {
|
|
85
|
+
return and(eq(tenantScimUser.tenantId, tenantId), eq(tenantScimUser.accountId, accountId));
|
|
86
|
+
}
|
|
87
|
+
//# sourceMappingURL=tenant-scim-membership.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant-scim-membership.js","sourceRoot":"","sources":["../src/tenant-scim-membership.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,cAAc,EAAiB,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EACL,cAAc,EACd,qBAAqB,EACrB,sBAAsB,EACtB,iBAAiB,GAGlB,MAAM,yBAAyB,CAAC;AAEjC,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,WAAW,EAAE,CAAC,CAAC;AAE7E,MAAM,UAAU,YAAY,CAAC,QAAkB,EAAE,EAAW;IAC1D,OAAO,GAAG,CACR,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACrC,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,EAChC,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,EAAE,EAAE,EAAE,CAAC,CACzD,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAAuB,EACvB,OAAe,EACf,QAAkB,EAClB,MAAc,EACd,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,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,EAAE,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACtC,IAAI,CAAC;QACH,MAAM,iBAAiB,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAC5C,IACE,CAAC,CAAC,MAAM,qBAAqB,CAC3B,OAAO,EACP,EAAE,EACF,KAAK,EACL,MAAM,EACN,eAAe,CAChB,CAAC;gBAEF,MAAM,IAAI,sBAAsB,EAAE,CAAC;YACrC,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YACzC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE;iBACpB,MAAM,EAAE;iBACR,IAAI,CAAC,cAAc,CAAC;iBACpB,KAAK,CAAC,OAAO,CAAC;iBACd,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjB,IACE,IAAI,KAAK,SAAS;gBAClB,CAAC,IAAI,CAAC,MAAM;gBACZ,CAAC,IAAI,CAAC,SAAS,KAAK,IAAI,IAAI,IAAI,CAAC,SAAS,KAAK,MAAM,CAAC,EAAE,CAAC;gBAEzD,MAAM,IAAI,sBAAsB,EAAE,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE;iBACtB,MAAM,EAAE;iBACR,IAAI,CAAC,gBAAgB,CAAC;iBACtB,KAAK,CAAC,mBAAmB,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;iBAC7C,GAAG,CAAC,QAAQ,CAAC,CAAC;YACjB,IAAI,MAAM,EAAE,IAAI,KAAK,OAAO;gBAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;YACjE,IAAI,MAAM,KAAK,SAAS;gBACtB,MAAM,yBAAyB,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;YACzD,MAAM,EAAE;iBACL,MAAM,CAAC,cAAc,CAAC;iBACtB,GAAG,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,EAAE,CAAC;iBAC7B,KAAK,CAAC,OAAO,CAAC,CAAC;QACpB,CAAC,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,iBAAiB,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;QACjE,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC;AAED,KAAK,UAAU,yBAAyB,CACtC,EAAqB,EACrB,QAAkB,EAClB,SAAiB;IAEjB,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,EAAE;SACxB,MAAM,CAAC,cAAc,CAAC;SACtB,GAAG,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;SACxB,KAAK,CACJ,GAAG,CACD,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,EACnC,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,CACpC,CACF;SACA,SAAS,CAAC,EAAE,EAAE,EAAE,cAAc,CAAC,EAAE,EAAE,CAAC,CAAC;IACxC,IAAI,QAAQ,KAAK,SAAS;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;AACjE,CAAC;AAED,wEAAwE;AACxE,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,EAAqB,EACrB,QAAkB,EAClB,SAAiB;IAEjB,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,EAAE;SACpB,MAAM,CAAC,EAAE,MAAM,EAAE,cAAc,CAAC,MAAM,EAAE,CAAC;SACzC,IAAI,CAAC,cAAc,CAAC;SACpB,KAAK,CAAC,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;SAC1C,GAAG,CAAC,QAAQ,CAAC,CAAC;IACjB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,2BAA2B,CAC/C,OAAuB,EACvB,EAAqB,EACrB,QAAkB,EAClB,SAAwB;IAExB,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO;IAC/B,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,EAAE;SACtB,MAAM,CAAC,gBAAgB,CAAC;SACxB,KAAK,CAAC,mBAAmB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;SAC/C,SAAS,EAAE,CAAC;IACf,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO;IACjC,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO;QAAE,MAAM,IAAI,sBAAsB,EAAE,CAAC;IAChE,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAC3B,CAAC,cAAc,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EACrE,EAAE,CACH,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CAAC,QAAkB,EAAE,SAAiB;IAC3D,OAAO,GAAG,CACR,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,EACrC,EAAE,CAAC,cAAc,CAAC,SAAS,EAAE,SAAS,CAAC,CACxC,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { ScimUser, ScimUserData, ScimUserFilter } from "@dads-framework/identity/scim";
|
|
2
|
+
import { tenantScimUser } from "./tenant-scim-table.js";
|
|
3
|
+
type DirectoryRow = typeof tenantScimUser.$inferSelect;
|
|
4
|
+
export declare function scimUserValues(data: ScimUserData): {
|
|
5
|
+
userName: string;
|
|
6
|
+
userNameKey: string;
|
|
7
|
+
active: boolean;
|
|
8
|
+
externalId: string | null;
|
|
9
|
+
displayName: string | null;
|
|
10
|
+
displayNameKey: string | null;
|
|
11
|
+
name: import("@dads-framework/identity/scim").ScimName | null;
|
|
12
|
+
emails: readonly import("@dads-framework/identity/scim").ScimEmail[] | null;
|
|
13
|
+
emailKeys: string[] | null;
|
|
14
|
+
};
|
|
15
|
+
export declare function scimUserData(row: DirectoryRow): ScimUserData;
|
|
16
|
+
export declare function scimUserRecord(row: DirectoryRow): ScimUser;
|
|
17
|
+
export declare function scimUserFilter(filter: ScimUserFilter | undefined): import("drizzle-orm").SQL<unknown> | undefined;
|
|
18
|
+
export {};
|
|
19
|
+
//# sourceMappingURL=tenant-scim-record.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant-scim-record.d.ts","sourceRoot":"","sources":["../src/tenant-scim-record.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,QAAQ,EACR,YAAY,EACZ,cAAc,EACf,MAAM,+BAA+B,CAAC;AAGvC,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAExD,KAAK,YAAY,GAAG,OAAO,cAAc,CAAC,YAAY,CAAC;AAEvD,wBAAgB,cAAc,CAAC,IAAI,EAAE,YAAY;IAE7C,QAAQ;IACR,WAAW;IACX,MAAM;IACN,UAAU;IACV,WAAW;IACX,cAAc;IACd,IAAI;IACJ,MAAM;IACN,SAAS;EAEZ;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,YAAY,GAAG,YAAY,CAS5D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,YAAY,GAAG,QAAQ,CAO1D;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,SAAS,kDAgBhE"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { eq, sql } from "drizzle-orm";
|
|
2
|
+
import { tenantScimUser } from "./tenant-scim-table.js";
|
|
3
|
+
export function scimUserValues(data) {
|
|
4
|
+
return {
|
|
5
|
+
userName: data.userName,
|
|
6
|
+
userNameKey: data.userName.toLowerCase(),
|
|
7
|
+
active: data.active,
|
|
8
|
+
externalId: data.externalId ?? null,
|
|
9
|
+
displayName: data.displayName ?? null,
|
|
10
|
+
displayNameKey: data.displayName?.toLowerCase() ?? null,
|
|
11
|
+
name: data.name ?? null,
|
|
12
|
+
emails: data.emails ?? null,
|
|
13
|
+
emailKeys: data.emails?.map((email) => email.value.toLowerCase()) ?? null,
|
|
14
|
+
};
|
|
15
|
+
}
|
|
16
|
+
export function scimUserData(row) {
|
|
17
|
+
return {
|
|
18
|
+
userName: row.userName,
|
|
19
|
+
active: row.active,
|
|
20
|
+
...(row.externalId === null ? {} : { externalId: row.externalId }),
|
|
21
|
+
...(row.displayName === null ? {} : { displayName: row.displayName }),
|
|
22
|
+
...(row.name === null ? {} : { name: row.name }),
|
|
23
|
+
...(row.emails === null ? {} : { emails: row.emails }),
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
export function scimUserRecord(row) {
|
|
27
|
+
return {
|
|
28
|
+
...scimUserData(row),
|
|
29
|
+
id: row.id,
|
|
30
|
+
created: row.createdAt.toISOString(),
|
|
31
|
+
lastModified: row.modifiedAt.toISOString(),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
export function scimUserFilter(filter) {
|
|
35
|
+
if (filter === undefined)
|
|
36
|
+
return undefined;
|
|
37
|
+
switch (filter.attribute) {
|
|
38
|
+
case "id":
|
|
39
|
+
return sql `${tenantScimUser.id}::text = ${filter.value}`;
|
|
40
|
+
case "userName":
|
|
41
|
+
return eq(tenantScimUser.userNameKey, filter.value.toLowerCase());
|
|
42
|
+
case "externalId":
|
|
43
|
+
return eq(tenantScimUser.externalId, filter.value);
|
|
44
|
+
case "displayName":
|
|
45
|
+
return eq(tenantScimUser.displayNameKey, filter.value.toLowerCase());
|
|
46
|
+
case "emails.value":
|
|
47
|
+
return sql `${filter.value.toLowerCase()} = ANY(${tenantScimUser.emailKeys})`;
|
|
48
|
+
case "active":
|
|
49
|
+
return eq(tenantScimUser.active, filter.value);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
//# sourceMappingURL=tenant-scim-record.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tenant-scim-record.js","sourceRoot":"","sources":["../src/tenant-scim-record.ts"],"names":[],"mappings":"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"}
|