@shivaedev/admin 0.11.2 → 0.12.1

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 CHANGED
@@ -156,7 +156,7 @@ const changeRole = Client.runtime.fn(users.changeRole.run);
156
156
 
157
157
  `admin.users.list` takes `{ limit, cursor? }` (1–100 users) and returns `{ users, next, canChangeRoles }` ordered by user id. Each user has id, name, email, role and a UTC sign-up time. The page's operations and generated subscription require `ReadUsers` (`users.read`), enforced by `UsersPermission`. Supply `permissionLayer(UsersPermission, sessions)` alongside the application's other handler Layers.
158
158
 
159
- `admin.users.changeRole` takes `{ userId, role }`; its role Schema is the application's declared role union. The handler also requires `AssignRoles` (`roles.assign`). The view shows a role select only to callers with that permission. Role writes serialize in a transaction and return `LastRoleAssigner` if replacing the final holder's role would remove `roles.assign`, regardless of the role's name. A missing user returns `NotFound`. Changes invalidate the list after commit and emit an Effect log with actor id, target id, role and timestamp.
159
+ `admin.users.changeRole` takes `{ userId, role }`; its role Schema is the application's declared role union. The handler also requires `AssignRoles` (`roles.assign`) from `@shivaedev/access/roles.ts`. The view shows a role select only to callers with that permission. Role writes use identity’s `assignRole` verb, serialize in a transaction and return `LastRoleAssigner` (from `@shivaedev/access/roles.ts`) if replacing the final holder's role would remove `roles.assign`, regardless of the role's name. A missing user returns `NotFound`. Changes invalidate the list after commit and emit an Effect log with actor id, target id, role and timestamp.
160
160
 
161
161
  Applications can call `listUsers(AppAccess, input)` and `changeUserRole(AppAccess, input)` from `@shivaedev/admin/server/users.ts` on the server. These enforce their respective domain permissions using `SessionUser`. Decode untrusted role input with `AppAccess.Role` before calling `changeUserRole` directly; native RPC performs that decode at the contract boundary. Identity resolves the caller's stored role through the session policy.
162
162
 
@@ -179,7 +179,25 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
179
179
  readonly JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
180
180
  readonly Forbidden: typeof Forbidden;
181
181
  readonly JobsNotFailed: typeof JobsNotFailed;
182
- }>>], import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
182
+ }>>], import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
183
+ id: Schema.String;
184
+ queue: Schema.String;
185
+ }>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
186
+ readonly attempt: Schema.Number;
187
+ readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
188
+ readonly createdOn: Schema.DateTimeUtcFromString;
189
+ readonly id: Schema.String;
190
+ readonly output: Schema.NullOr<Schema.Struct<{
191
+ readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
192
+ readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
193
+ }>>;
194
+ readonly retryCount: Schema.Number;
195
+ readonly retryLimit: Schema.Number;
196
+ readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
197
+ readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
198
+ readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
199
+ readonly queue: Schema.Literal<string>;
200
+ }>[]>>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.$changes", Schema.Struct<{
183
201
  queries: Schema.$Array<Schema.Union<readonly (Schema.Struct<{
184
202
  query: Schema.Literal<"counts">;
185
203
  payload: Schema.Struct<{
@@ -227,17 +245,28 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
227
245
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
228
246
  }>, Schema.Struct<{
229
247
  readonly _tag: Schema.Literal<"Resync">;
230
- }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>[]]>>, Schema.Never, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
231
- id: Schema.String;
232
- queue: Schema.String;
233
- }>, Schema.Void, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
248
+ }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>[]]>>, Schema.Never, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
234
249
  queue: Schema.String;
235
250
  }>, Schema.Struct<{
236
251
  readonly activeCount: Schema.Number;
237
252
  readonly failedCount: Schema.Number;
238
253
  readonly queuedCount: Schema.Number;
239
254
  readonly totalCount: Schema.Number;
240
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
255
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
256
+ readonly activeTotal: Schema.Number;
257
+ readonly deadLetteredTotal: Schema.Number;
258
+ readonly failedTotal: Schema.Number;
259
+ readonly jobs: Schema.$Array<Schema.Struct<{
260
+ readonly activeCount: Schema.Number;
261
+ readonly deadLetteredCount: Schema.Number;
262
+ readonly failedCount: Schema.Number;
263
+ readonly name: Schema.String;
264
+ readonly queuedCount: Schema.Number;
265
+ readonly readyCount: Schema.Number;
266
+ }>>;
267
+ readonly queuedTotal: Schema.Number;
268
+ readonly readyTotal: Schema.Number;
269
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
241
270
  cursor: Schema.optionalKey<Schema.String>;
242
271
  limit: Schema.Number;
243
272
  queue: Schema.String;
@@ -257,14 +286,9 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
257
286
  readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
258
287
  readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
259
288
  readonly queue: Schema.Literal<string>;
260
- readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
261
- readonly sourceOutput: Schema.NullOr<Schema.Struct<{
262
- readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
263
- readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
264
- }>>;
265
289
  }>[]>>;
266
290
  readonly next: Schema.OptionFromNullOr<Schema.String>;
267
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
291
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
268
292
  cursor: Schema.optionalKey<Schema.String>;
269
293
  limit: Schema.Number;
270
294
  queue: Schema.String;
@@ -284,41 +308,17 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsEnt
284
308
  readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
285
309
  readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
286
310
  readonly queue: Schema.Literal<string>;
311
+ readonly sourceId: Schema.OptionFromNullOr<Schema.String>;
312
+ readonly sourceOutput: Schema.NullOr<Schema.Struct<{
313
+ readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
314
+ readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
315
+ }>>;
287
316
  }>[]>>;
288
317
  readonly next: Schema.OptionFromNullOr<Schema.String>;
289
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
290
- readonly activeTotal: Schema.Number;
291
- readonly deadLetteredTotal: Schema.Number;
292
- readonly failedTotal: Schema.Number;
293
- readonly jobs: Schema.$Array<Schema.Struct<{
294
- readonly activeCount: Schema.Number;
295
- readonly deadLetteredCount: Schema.Number;
296
- readonly failedCount: Schema.Number;
297
- readonly name: Schema.String;
298
- readonly queuedCount: Schema.Number;
299
- readonly readyCount: Schema.Number;
300
- }>>;
301
- readonly queuedTotal: Schema.Number;
302
- readonly readyTotal: Schema.Number;
303
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
318
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
304
319
  id: Schema.String;
305
320
  queue: Schema.String;
306
- }>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
307
- readonly attempt: Schema.Number;
308
- readonly completedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
309
- readonly createdOn: Schema.DateTimeUtcFromString;
310
- readonly id: Schema.String;
311
- readonly output: Schema.NullOr<Schema.Struct<{
312
- readonly _tag: Schema.withDecodingDefaultKey<Schema.String, never>;
313
- readonly message: Schema.decodeTo<Schema.String, Schema.String, never, never>;
314
- }>>;
315
- readonly retryCount: Schema.Number;
316
- readonly retryLimit: Schema.Number;
317
- readonly startedOn: Schema.OptionFromNullOr<Schema.DateTimeUtcFromString>;
318
- readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
319
- readonly data: import("./entry.ts").JobsPayload<[...TQueues][number]>;
320
- readonly queue: Schema.Literal<string>;
321
- }>[]>>, Schema.Union<readonly [Schema.Union<readonly (typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof JobsPermission, never>, readonly [], undefined>;
321
+ }>, Schema.Void, Schema.Union<readonly (typeof Forbidden | typeof import("@shivaedev/errors/taxonomy.ts").BadRequest | typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof JobsPermission, never>, readonly [], undefined>;
322
322
  } & {
323
323
  queues: TQueues;
324
324
  };
@@ -6,14 +6,6 @@ export declare const ReadUsers: {
6
6
  readonly name: "users.read";
7
7
  readonly strength: "own";
8
8
  };
9
- export declare const AssignRoles: {
10
- readonly any: {
11
- readonly name: "roles.assign";
12
- readonly strength: "any";
13
- };
14
- readonly name: "roles.assign";
15
- readonly strength: "own";
16
- };
17
9
  export declare const ReadJobs: {
18
10
  readonly any: {
19
11
  readonly name: "jobs.read";
@@ -1 +1 @@
1
- {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;AAClD,eAAO,MAAM,WAAW;;;;;;;CAA6B,CAAC;AACtD,eAAO,MAAM,QAAQ;;;;;;;CAA0B,CAAC;AAChD,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;;;;;;;AAClD,qBAAa,eAAgB,SAAQ,oBAAsF;CAAG;;;;;;;AAC9H,qBAAa,cAAe,SAAQ,mBAAmF;CAAG"}
1
+ {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;AAClD,eAAO,MAAM,QAAQ;;;;;;;CAA0B,CAAC;AAChD,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;;;;;;;AAClD,qBAAa,eAAgB,SAAQ,oBAAsF;CAAG;;;;;;;AAC9H,qBAAa,cAAe,SAAQ,mBAAmF;CAAG"}
@@ -1,7 +1,6 @@
1
1
  import { permission } from "@shivaedev/access/permission.ts";
2
2
  import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
3
3
  export const ReadUsers = permission("users.read");
4
- export const AssignRoles = permission("roles.assign");
5
4
  export const ReadJobs = permission("jobs.read");
6
5
  export const RetryJobs = permission("jobs.retry");
7
6
  export class UsersPermission extends permissionMiddleware()("@shivaedev/admin/UsersPermission", ReadUsers) {
@@ -1 +1 @@
1
- {"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,OAAO,eAAgB,SAAQ,oBAAoB,EAAmB,CAAC,kCAAkC,EAAE,SAAS,CAAC;CAAG;AAC9H,MAAM,OAAO,cAAe,SAAQ,oBAAoB,EAAkB,CAAC,iCAAiC,EAAE,QAAQ,CAAC;CAAG"}
1
+ {"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,OAAO,eAAgB,SAAQ,oBAAoB,EAAmB,CAAC,kCAAkC,EAAE,SAAS,CAAC;CAAG;AAC9H,MAAM,OAAO,cAAe,SAAQ,oBAAoB,EAAkB,CAAC,iCAAiC,EAAE,QAAQ,CAAC;CAAG"}
@@ -1,9 +1,9 @@
1
1
  import { DateTime, Effect, Option } from "effect";
2
2
  import { SqlClient } from "effect/sql";
3
3
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
4
- import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
5
5
  import { SessionUser } from "@shivaedev/identity/identity.ts";
6
- import { type ChangeRoleInput, LastRoleAssigner } from "#users/roles.ts";
6
+ import { type ChangeRoleInput } from "#users/roles.ts";
7
7
  export declare const listUsers: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">, input: {
8
8
  readonly cursor?: string;
9
9
  readonly limit: number;
@@ -17,5 +17,5 @@ export declare const listUsers: <TRole extends string>(access: Pick<AccessPolicy
17
17
  readonly role: TRole;
18
18
  }[];
19
19
  }, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden, SessionUser | SqlClient.SqlClient>;
20
- export declare const changeUserRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, input: ChangeRoleInput<TRole>) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | LastRoleAssigner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SessionUser | SqlClient.SqlClient>;
20
+ export declare const changeUserRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, input: ChangeRoleInput<TRole>) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/access/roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound, import("effect/reactivity/Reactivity").Reactivity | SessionUser | SqlClient.SqlClient>;
21
21
  //# sourceMappingURL=users.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAAW,KAAK,eAAe,EAAE,gBAAgB,EAAsB,MAAM,iBAAiB,CAAC;AAMtG,eAAO,MAAM,SAAS,GAA2C,KAAK,SAAS,MAAM;;;;;;;;;;;;0GAenF,CAAC;AAEH,eAAO,MAAM,cAAc,GAAgD,KAAK,SAAS,MAAM,8SAyC7F,CAAC"}
1
+ {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAAW,KAAK,eAAe,EAAsB,MAAM,iBAAiB,CAAC;AAMpF,eAAO,MAAM,SAAS,GAA2C,KAAK,SAAS,MAAM;;;;;;;;;;;;0GAenF,CAAC;AAEH,eAAO,MAAM,cAAc,GAAgD,KAAK,SAAS,MAAM,2XAW7F,CAAC"}
@@ -1,11 +1,12 @@
1
1
  import { DateTime, Effect, Option, Schema } from "effect";
2
2
  import { SqlClient, SqlSchema } from "effect/sql";
3
3
  import { requirePermission } from "@shivaedev/access/requirePermission.ts";
4
- import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
+ import { AssignRoles } from "@shivaedev/access/roles.ts";
5
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
5
6
  import { SessionUser } from "@shivaedev/identity/identity.ts";
6
- import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
7
- import { AssignRoles, ReadUsers } from "#permissions.ts";
8
- import { AppUser, LastRoleAssigner } from "#users/roles.ts";
7
+ import { assignRole } from "@shivaedev/identity/server/better-auth/assignRole.ts";
8
+ import { ReadUsers } from "#permissions.ts";
9
+ import { AppUser } from "#users/roles.ts";
9
10
  function unavailable() {
10
11
  return new AuthUnavailable({ message: "Could not access app users" });
11
12
  }
@@ -25,37 +26,7 @@ export const listUsers = Effect.fn("Admin.listUsers")(function* (access, input)
25
26
  export const changeUserRole = Effect.fn("Admin.changeUserRole")(function* (access, input) {
26
27
  const actor = yield* SessionUser;
27
28
  yield* requirePermission(actor, AssignRoles);
28
- const sql = yield* SqlClient.SqlClient;
29
- const changed = yield* Effect.gen(function* () {
30
- yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
31
- const readTarget = SqlSchema.findOneOption({
32
- execute: (id) => sql `select id, role from "user" where id = ${id} for update`,
33
- Request: AppUser.fields.id,
34
- Result: Schema.Struct({ id: AppUser.fields.id, role: Schema.NullOr(AppUser.fields.role) }),
35
- });
36
- const target = yield* readTarget(input.userId).pipe(Effect.mapError(unavailable));
37
- if (Option.isNone(target)) {
38
- return yield* Effect.fail(new NotFound({ message: "User not found" }));
39
- }
40
- if (target.value.role === input.role) {
41
- return false;
42
- }
43
- const assigners = access.Role.literals.filter((role) => access.hasPermission(role, AssignRoles));
44
- if (assigners.some((role) => role === target.value.role) && !access.hasPermission(input.role, AssignRoles)) {
45
- const readHolders = SqlSchema.findAll({
46
- execute: () => sql `select id from "user" where role in ${sql.in(assigners)}`,
47
- Request: Schema.Void,
48
- Result: Schema.Struct({ id: AppUser.fields.id }),
49
- });
50
- const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
51
- if (holders.length === 1) {
52
- return yield* Effect.fail(new LastRoleAssigner({ userId: input.userId }));
53
- }
54
- }
55
- yield* sql `update "user" set role = ${input.role}, "updatedAt" = now() where id = ${input.userId}`;
56
- yield* invalidateOnCommit(["admin.users"]);
57
- return true;
58
- }).pipe(transact({ onSqlError: unavailable }));
29
+ const changed = yield* assignRole(access, input.userId, input.role);
59
30
  if (changed) {
60
31
  const changedAt = DateTime.formatIso(yield* DateTime.now);
61
32
  yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
@@ -1 +1 @@
1
- {"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"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"}
@@ -1,7 +1,7 @@
1
1
  import { Effect } from "effect";
2
+ import { AssignRoles } from "@shivaedev/access/roles.ts";
2
3
  import { SessionUser } from "@shivaedev/identity/identity.ts";
3
4
  import { hasPermission } from "@shivaedev/identity/permission.ts";
4
- import { AssignRoles } from "#permissions.ts";
5
5
  import { changeUserRole, listUsers } from "#server/users.ts";
6
6
  export function usersHandlers(page, access) {
7
7
  return page.contract.application.toLayer({
@@ -1 +1 @@
1
- {"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,aAAa,CAC5B,IAAyC,EACzC,MAA2D;IAE3D,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,wBAAwB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC;QAClE,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,aAAa,CAC5B,IAAyC,EACzC,MAA2D;IAE3D,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,wBAAwB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC;QAClE,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
@@ -1,8 +1,8 @@
1
1
  import { Schema } from "effect";
2
2
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
3
+ import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
3
4
  import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
5
  import { UsersPermission } from "#permissions.ts";
5
- import { LastRoleAssigner } from "#users/roles.ts";
6
6
  export declare const UsersList: Schema.Struct<{
7
7
  readonly next: Schema.OptionFromNullOr<Schema.String>;
8
8
  readonly users: Schema.$Array<Schema.Struct<{
@@ -71,10 +71,7 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
71
71
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
72
72
  }>, Schema.Struct<{
73
73
  readonly _tag: Schema.Literal<"Resync">;
74
- }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
75
- role: Schema.Literals<TRole[]>;
76
- userId: Schema.String;
77
- }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
74
+ }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
78
75
  readonly cursor: Schema.optionalKey<Schema.String>;
79
76
  readonly limit: Schema.Number;
80
77
  }>, Schema.Struct<{
@@ -87,6 +84,9 @@ export declare function usersPage<const TRole extends string>(access: Pick<Acces
87
84
  readonly role: Schema.String;
88
85
  }>>;
89
86
  readonly canChangeRoles: Schema.Boolean;
90
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never>, readonly [], undefined>;
87
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
88
+ role: Schema.Literals<TRole[]>;
89
+ userId: Schema.String;
90
+ }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never>, readonly [], undefined>;
91
91
  };
92
92
  //# sourceMappingURL=page.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIjE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB9F"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAI9D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAKlD,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB9F"}
@@ -1,11 +1,12 @@
1
1
  import { Schema } from "effect";
2
+ import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
2
3
  import { collection } from "@shivaedev/changes/keys.ts";
3
4
  import { contract } from "@shivaedev/contract/contract.ts";
4
5
  import { command, query } from "@shivaedev/contract/operation.ts";
5
6
  import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
6
7
  import { adminPage } from "#page.ts";
7
8
  import { UsersPermission } from "#permissions.ts";
8
- import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
9
+ import { UserList, UserListInput } from "#users/roles.ts";
9
10
  const users = collection("admin.users", Schema.String);
10
11
  export const UsersList = Schema.Struct({ ...UserList.fields, canChangeRoles: Schema.Boolean });
11
12
  export function usersPage(access) {
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAyC;IAC9F,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE1D,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAyC;IAC9F,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
@@ -24,10 +24,4 @@ export interface ChangeRoleInput<TRole extends string = string> {
24
24
  readonly role: TRole;
25
25
  readonly userId: string;
26
26
  }
27
- declare const LastRoleAssigner_base: Schema.Class<LastRoleAssigner, Schema.TaggedStruct<"LastRoleAssigner", {
28
- readonly userId: Schema.String;
29
- }>, import("effect/Cause").YieldableError>;
30
- export declare class LastRoleAssigner extends LastRoleAssigner_base {
31
- }
32
- export {};
33
27
  //# sourceMappingURL=roles.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,OAAO;;;;;;EAMlB,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAgG,CAAC;AACtH,MAAM,WAAW,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAC7D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;;;;AACD,qBAAa,gBAAiB,SAAQ,qBAAqF;CAAG"}
1
+ {"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,OAAO;;;;;;EAMlB,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAgG,CAAC;AACtH,MAAM,WAAW,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAC7D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB"}
@@ -11,6 +11,4 @@ export const UserListInput = Schema.Struct({
11
11
  limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
12
12
  });
13
13
  export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(AppUser) });
14
- export class LastRoleAssigner extends Schema.TaggedError()("LastRoleAssigner", { userId: Schema.String }) {
15
- }
16
14
  //# sourceMappingURL=roles.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAKtH,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}
1
+ {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/admin",
3
- "version": "0.11.2",
3
+ "version": "0.12.1",
4
4
  "description": "Explicit admin page contracts and a protected native Effect RPC registry",
5
5
  "homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/admin#readme",
6
6
  "bugs": {
@@ -41,21 +41,20 @@
41
41
  "README.md"
42
42
  ],
43
43
  "dependencies": {
44
- "@shivaedev/access": "0.2.0",
45
- "@shivaedev/changes": "0.5.1",
46
- "@shivaedev/contract": "0.24.0",
44
+ "@shivaedev/access": "0.3.0",
45
+ "@shivaedev/changes": "0.6.0",
46
+ "@shivaedev/contract": "0.25.0",
47
47
  "@shivaedev/errors": "0.1.2",
48
- "@shivaedev/identity": "0.8.0",
49
- "@shivaedev/jobs": "0.23.1",
50
- "@shivaedev/react": "0.23.2",
51
- "@shivaedev/sql": "0.26.1"
48
+ "@shivaedev/identity": "0.9.1",
49
+ "@shivaedev/jobs": "0.23.2",
50
+ "@shivaedev/react": "0.25.0"
52
51
  },
53
52
  "devDependencies": {
54
53
  "@effect/atom-react": "4.0.6",
55
- "@shivaedev/quality": "0.47.0",
56
- "@shivaedev/server": "0.9.0",
57
- "@shivaedev/test-sql": "0.14.0",
58
- "@shivaedev/test-story": "0.26.1",
54
+ "@shivaedev/quality": "0.48.1",
55
+ "@shivaedev/server": "0.9.2",
56
+ "@shivaedev/test-sql": "0.15.0",
57
+ "@shivaedev/test-story": "0.26.3",
59
58
  "@types/node": "24.19.2",
60
59
  "@types/react": "19.3.0",
61
60
  "@types/react-dom": "19.3.0",
@@ -2,7 +2,6 @@ import { permission } from "@shivaedev/access/permission.ts";
2
2
  import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
3
3
 
4
4
  export const ReadUsers = permission("users.read");
5
- export const AssignRoles = permission("roles.assign");
6
5
  export const ReadJobs = permission("jobs.read");
7
6
  export const RetryJobs = permission("jobs.retry");
8
7
  export class UsersPermission extends permissionMiddleware<UsersPermission>()("@shivaedev/admin/UsersPermission", ReadUsers) {}
@@ -2,11 +2,12 @@ import { DateTime, Effect, Option, Schema } from "effect";
2
2
  import { SqlClient, SqlSchema } from "effect/sql";
3
3
  import { requirePermission } from "@shivaedev/access/requirePermission.ts";
4
4
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
5
- import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
5
+ import { AssignRoles } from "@shivaedev/access/roles.ts";
6
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
6
7
  import { SessionUser } from "@shivaedev/identity/identity.ts";
7
- import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
8
- import { AssignRoles, ReadUsers } from "#permissions.ts";
9
- import { AppUser, type ChangeRoleInput, LastRoleAssigner, type UserListInput } from "#users/roles.ts";
8
+ import { assignRole } from "@shivaedev/identity/server/better-auth/assignRole.ts";
9
+ import { ReadUsers } from "#permissions.ts";
10
+ import { AppUser, type ChangeRoleInput, type UserListInput } from "#users/roles.ts";
10
11
 
11
12
  function unavailable() {
12
13
  return new AuthUnavailable({ message: "Could not access app users" });
@@ -35,37 +36,7 @@ export const changeUserRole = Effect.fn("Admin.changeUserRole")(function* <TRole
35
36
  ) {
36
37
  const actor = yield* SessionUser;
37
38
  yield* requirePermission(actor, AssignRoles);
38
- const sql = yield* SqlClient.SqlClient;
39
- const changed = yield* Effect.gen(function* () {
40
- yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
41
- const readTarget = SqlSchema.findOneOption({
42
- execute: (id) => sql`select id, role from "user" where id = ${id} for update`,
43
- Request: AppUser.fields.id,
44
- Result: Schema.Struct({ id: AppUser.fields.id, role: Schema.NullOr(AppUser.fields.role) }),
45
- });
46
- const target = yield* readTarget(input.userId).pipe(Effect.mapError(unavailable));
47
- if (Option.isNone(target)) {
48
- return yield* Effect.fail(new NotFound({ message: "User not found" }));
49
- }
50
- if (target.value.role === input.role) {
51
- return false;
52
- }
53
- const assigners = access.Role.literals.filter((role) => access.hasPermission(role, AssignRoles));
54
- if (assigners.some((role) => role === target.value.role) && !access.hasPermission(input.role, AssignRoles)) {
55
- const readHolders = SqlSchema.findAll({
56
- execute: () => sql`select id from "user" where role in ${sql.in(assigners)}`,
57
- Request: Schema.Void,
58
- Result: Schema.Struct({ id: AppUser.fields.id }),
59
- });
60
- const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
61
- if (holders.length === 1) {
62
- return yield* Effect.fail(new LastRoleAssigner({ userId: input.userId }));
63
- }
64
- }
65
- yield* sql`update "user" set role = ${input.role}, "updatedAt" = now() where id = ${input.userId}`;
66
- yield* invalidateOnCommit(["admin.users"]);
67
- return true;
68
- }).pipe(transact({ onSqlError: unavailable }));
39
+ const changed = yield* assignRole(access, input.userId, input.role);
69
40
  if (changed) {
70
41
  const changedAt = DateTime.formatIso(yield* DateTime.now);
71
42
  yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
@@ -1,8 +1,8 @@
1
1
  import { Effect } from "effect";
2
2
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
3
+ import { AssignRoles } from "@shivaedev/access/roles.ts";
3
4
  import { SessionUser } from "@shivaedev/identity/identity.ts";
4
5
  import { hasPermission } from "@shivaedev/identity/permission.ts";
5
- import { AssignRoles } from "#permissions.ts";
6
6
  import { changeUserRole, listUsers } from "#server/users.ts";
7
7
  import type { usersPage } from "#users/page.ts";
8
8
 
package/src/users/page.ts CHANGED
@@ -1,12 +1,13 @@
1
1
  import { Schema } from "effect";
2
2
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
3
+ import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
3
4
  import { collection } from "@shivaedev/changes/keys.ts";
4
5
  import { contract } from "@shivaedev/contract/contract.ts";
5
6
  import { command, query } from "@shivaedev/contract/operation.ts";
6
7
  import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
7
8
  import { adminPage } from "#page.ts";
8
9
  import { UsersPermission } from "#permissions.ts";
9
- import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
10
+ import { UserList, UserListInput } from "#users/roles.ts";
10
11
 
11
12
  const users = collection("admin.users", Schema.String);
12
13
 
@@ -17,4 +17,3 @@ export interface ChangeRoleInput<TRole extends string = string> {
17
17
  readonly role: TRole;
18
18
  readonly userId: string;
19
19
  }
20
- export class LastRoleAssigner extends Schema.TaggedError<LastRoleAssigner>()("LastRoleAssigner", { userId: Schema.String }) {}