@shivaedev/admin 0.4.0 → 0.6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (59) hide show
  1. package/README.md +18 -13
  2. package/dist/client/UsersTable.d.ts +1 -1
  3. package/dist/client/UsersTable.d.ts.map +1 -1
  4. package/dist/client/UsersTable.js +1 -1
  5. package/dist/client/UsersTable.js.map +1 -1
  6. package/dist/client/UsersView.d.ts +1 -1
  7. package/dist/client/UsersView.d.ts.map +1 -1
  8. package/dist/client/UsersView.js +1 -1
  9. package/dist/client/UsersView.js.map +1 -1
  10. package/dist/jobs/keys.d.ts +5 -5
  11. package/dist/jobs/keys.js +1 -1
  12. package/dist/jobs/keys.js.map +1 -1
  13. package/dist/jobs/page.d.ts +11 -11
  14. package/dist/jobs/page.js +2 -2
  15. package/dist/jobs/page.js.map +1 -1
  16. package/dist/jobs/retryPage.d.ts +13 -13
  17. package/dist/jobs/retryPage.js +2 -2
  18. package/dist/jobs/retryPage.js.map +1 -1
  19. package/dist/page.d.ts +4 -4
  20. package/dist/page.d.ts.map +1 -1
  21. package/dist/page.js +2 -2
  22. package/dist/page.js.map +1 -1
  23. package/dist/permissions.d.ts +15 -0
  24. package/dist/permissions.d.ts.map +1 -0
  25. package/dist/permissions.js +6 -0
  26. package/dist/permissions.js.map +1 -0
  27. package/dist/server/jobsHandlers.d.ts +7 -7
  28. package/dist/server/jobsHandlers.d.ts.map +1 -1
  29. package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
  30. package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
  31. package/dist/server/users.d.ts +24 -0
  32. package/dist/server/users.d.ts.map +1 -0
  33. package/dist/server/users.js +65 -0
  34. package/dist/server/users.js.map +1 -0
  35. package/dist/server/usersHandlers.d.ts.map +1 -1
  36. package/dist/server/usersHandlers.js +5 -4
  37. package/dist/server/usersHandlers.js.map +1 -1
  38. package/dist/users/page.d.ts +7 -7
  39. package/dist/users/page.d.ts.map +1 -1
  40. package/dist/users/page.js +5 -5
  41. package/dist/users/page.js.map +1 -1
  42. package/dist/users/roles.d.ts +44 -0
  43. package/dist/users/roles.d.ts.map +1 -0
  44. package/dist/users/roles.js +20 -0
  45. package/dist/users/roles.js.map +1 -0
  46. package/package.json +12 -8
  47. package/src/client/UsersTable.tsx +1 -1
  48. package/src/client/UsersView.ts +2 -2
  49. package/src/jobs/keys.ts +1 -1
  50. package/src/jobs/page.ts +2 -2
  51. package/src/jobs/retryPage.ts +2 -2
  52. package/src/page.ts +5 -5
  53. package/src/permissions.ts +5 -0
  54. package/src/server/jobsHandlers.ts +2 -2
  55. package/src/server/jobsHandlersWithRetry.ts +1 -1
  56. package/src/server/users.ts +67 -0
  57. package/src/server/usersHandlers.ts +5 -4
  58. package/src/users/page.ts +5 -5
  59. package/src/users/roles.ts +23 -0
@@ -1,6 +1,6 @@
1
1
  import { type Context, DateTime, Effect, Option } from "effect";
2
- import type { PgBossError, PgBossPayloadError } from "@shivaedev/effect-pg-boss/server/error.ts";
3
- import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
2
+ import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
3
+ import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
4
4
  import type { jobsPage } from "#jobs/page.ts";
5
5
  import { JobsPayloadInvalid, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
6
6
  export declare function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError, R>): Effect.Effect<A, JobsPayloadInvalid | JobsUnavailable, R>;
@@ -9,22 +9,22 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsQueu
9
9
  }, service: Context.Service<TService, PgBossService>): {
10
10
  "admin.jobs.counts": ({ queue }: {
11
11
  readonly queue: string;
12
- }) => Effect.Effect<import("@shivaedev/effect-pg-boss/server/health.ts").QueueCounts, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService>;
12
+ }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService>;
13
13
  "admin.jobs.deadLettered": ({ queue, ...options }: {
14
14
  readonly queue: string;
15
15
  readonly limit: number;
16
16
  readonly cursor?: string;
17
- }) => Effect.Effect<import("@shivaedev/effect-pg-boss/server/health.ts").JobPage<import("@shivaedev/effect-pg-boss/server/health.ts").DeadLetteredJob<TQueues[number]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
17
+ }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<TQueues[number]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
18
18
  "admin.jobs.failed": ({ queue, ...options }: {
19
19
  readonly queue: string;
20
20
  readonly limit: number;
21
21
  readonly cursor?: string;
22
- }) => Effect.Effect<import("@shivaedev/effect-pg-boss/server/health.ts").JobPage<import("@shivaedev/effect-pg-boss/server/health.ts").ListedJob<TQueues[number]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
22
+ }) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<TQueues[number]["schema"]["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
23
23
  "admin.jobs.health": () => Effect.Effect<{
24
24
  activeTotal: number;
25
25
  deadLetteredTotal: number;
26
26
  failedTotal: number;
27
- jobs: import("@shivaedev/effect-pg-boss/server/health.ts").QueueHealth[];
27
+ jobs: import("@shivaedev/jobs/server/health.ts").QueueHealth[];
28
28
  queuedTotal: number;
29
29
  readyTotal: number;
30
30
  }, JobsPayloadInvalid | JobsUnavailable, TService>;
@@ -45,5 +45,5 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsQueu
45
45
  state: "active" | "cancelled" | "completed" | "created" | "failed" | "retry";
46
46
  }>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | TQueues[number]["schema"]["DecodingServices"]>;
47
47
  };
48
- export declare function jobsHandlers<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job">, never, Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
48
+ export declare function jobsHandlers<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
49
49
  //# sourceMappingURL=jobsHandlers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AACjG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9G,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,kBAAkB,EAAE,CAAC,CAAC,6DAM/F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACpF,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;IAQhD,mBAAmB,cAAc;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,yBAAyB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAM/H,mBAAmB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMzH,mBAAmB;;;;;;;;IAcnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;EAmBlF;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EAChF,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,k3BAGjD"}
1
+ {"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChE,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,KAAK,SAAS,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9G,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,kBAAkB,EAAE,CAAC,CAAC,6DAM/F;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACpF,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;IAQhD,mBAAmB,cAAc;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,yBAAyB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAM/H,mBAAmB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMzH,mBAAmB;;;;;;;;IAcnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;EAmBlF;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EAChF,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,01BAGjD"}
@@ -1,6 +1,6 @@
1
1
  import { type Context } from "effect";
2
- import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
2
+ import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
3
3
  import { type jobsPageWithRetry } from "#jobs/retryPage.ts";
4
4
  import { type JobsQueue } from "#jobs/schemas.ts";
5
- export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
5
+ export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsQueue[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TQueues[number]["schema"]["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
6
6
  //# sourceMappingURL=jobsHandlersWithRetry.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,kBAAkB,CAAC;AAGzE,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACzF,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,EACnD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,y6BAkBjD"}
1
+ {"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;AACtD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,KAAK,SAAS,EAAyB,MAAM,kBAAkB,CAAC;AAGzE,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACzF,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,EACnD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,i5BAkBjD"}
@@ -0,0 +1,24 @@
1
+ import { DateTime, Effect, Option } from "effect";
2
+ import { SqlClient } from "effect/sql";
3
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
5
+ import { LastOwner } from "#users/roles.ts";
6
+ export declare const listUsers: (input: {
7
+ readonly cursor?: string;
8
+ readonly limit: number;
9
+ }) => Effect.Effect<{
10
+ next: Option.Option<string>;
11
+ users: {
12
+ email: string;
13
+ id: string;
14
+ name: string;
15
+ createdAt: DateTime.Utc;
16
+ roles: string[];
17
+ }[];
18
+ }, AuthUnavailable, SqlClient.SqlClient>;
19
+ export declare const changeUserRole: (input: {
20
+ readonly grant: boolean;
21
+ readonly role: "admin" | "owner" | "user";
22
+ readonly userId: string;
23
+ }) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | LastOwner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SessionUser | SqlClient.SqlClient>;
24
+ //# sourceMappingURL=users.d.ts.map
@@ -0,0 +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;AAClD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAAyC,SAAS,EAAsB,MAAM,iBAAiB,CAAC;AAavG,eAAO,MAAM,SAAS;;;;;;;;;;;;wCAepB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;4MA8BzB,CAAC"}
@@ -0,0 +1,65 @@
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
5
+ import { requirePermission } from "@shivaedev/identity/permission.ts";
6
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
7
+ import { ChangeUserRoles, LastOwner } from "#users/roles.ts";
8
+ const StoredUser = Schema.Struct({
9
+ createdAt: Schema.Date,
10
+ email: Schema.String,
11
+ id: Schema.String,
12
+ name: Schema.String,
13
+ role: Schema.NullOr(Schema.String),
14
+ });
15
+ function unavailable() {
16
+ return new AuthUnavailable({ message: "Could not access app users" });
17
+ }
18
+ export const listUsers = Effect.fn("Platform.listUsers")(function* (input) {
19
+ const sql = yield* SqlClient.SqlClient;
20
+ const read = SqlSchema.findAll({
21
+ execute: () => sql `select id, name, email, role, "createdAt" from "user"
22
+ where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
23
+ Request: Schema.Void,
24
+ Result: StoredUser,
25
+ });
26
+ const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
27
+ const users = rows.slice(0, input.limit).map(({ role, createdAt, ...user }) => ({
28
+ ...user,
29
+ createdAt: DateTime.makeUnsafe(createdAt),
30
+ roles: role?.split(",").filter(Boolean) ?? [],
31
+ }));
32
+ return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none(), users };
33
+ });
34
+ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (input) {
35
+ const actor = yield* SessionUser;
36
+ yield* requirePermission(ChangeUserRoles);
37
+ const sql = yield* SqlClient.SqlClient;
38
+ const changed = yield* Effect.gen(function* () {
39
+ yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
40
+ const rows = yield* sql `select id, role from "user" where id = ${input.userId} for update`;
41
+ const target = rows[0];
42
+ if (target === undefined) {
43
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
44
+ }
45
+ const roles = target.role?.split(",").filter(Boolean) ?? [];
46
+ if (input.grant === roles.includes(input.role)) {
47
+ return false;
48
+ }
49
+ if (!input.grant && input.role === "owner") {
50
+ const owners = yield* sql `select id from "user" where 'owner' = any(string_to_array(role, ','))`;
51
+ if (owners.length === 1) {
52
+ return yield* Effect.fail(new LastOwner({ userId: input.userId }));
53
+ }
54
+ }
55
+ const next = input.grant ? [...roles, input.role] : roles.filter((role) => role !== input.role);
56
+ yield* sql `update "user" set role = ${next.join(",")}, "updatedAt" = now() where id = ${input.userId}`;
57
+ yield* invalidateOnCommit(["admin.users"]);
58
+ return true;
59
+ }).pipe(transact({ onSqlError: unavailable }));
60
+ if (changed) {
61
+ const changedAt = DateTime.formatIso(yield* DateTime.now);
62
+ yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
63
+ }
64
+ });
65
+ //# sourceMappingURL=users.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"usersHandlers.d.ts","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAMA,eAAO,MAAM,aAAa,sPAOxB,CAAC"}
1
+ {"version":3,"file":"usersHandlers.d.ts","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,aAAa,sPAOxB,CAAC"}
@@ -1,13 +1,14 @@
1
1
  import { Effect } from "effect";
2
- import { hasRole } from "@shivaedev/platform/rpc/hasRole.ts";
3
- import { SessionUser } from "@shivaedev/platform/rpc/identity.ts";
4
- import { changeUserRole, listUsers } from "@shivaedev/platform/server/better-auth/users.ts";
2
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
3
+ import { hasPermission } from "@shivaedev/identity/permission.ts";
4
+ import { changeUserRole, listUsers } from "#server/users.ts";
5
5
  import { UsersPage } from "#users/page.ts";
6
+ import { ChangeUserRoles } from "#users/roles.ts";
6
7
  export const usersHandlers = UsersPage.contract.application.toLayer({
7
8
  "admin.users.changeRole": changeUserRole,
8
9
  "admin.users.list": (input) => Effect.gen(function* () {
9
10
  const user = yield* SessionUser;
10
- return { ...(yield* listUsers(input)), canChangeRoles: hasRole(user, "owner") };
11
+ return { ...(yield* listUsers(input)), canChangeRoles: hasPermission(user, ChangeUserRoles) };
11
12
  }),
12
13
  });
13
14
  //# sourceMappingURL=usersHandlers.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAC7D,OAAO,EAAE,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,iDAAiD,CAAC;AAC5F,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3C,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;IACnE,wBAAwB,EAAE,cAAc;IACxC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;QAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;IACjF,CAAC,CAAC;CACH,CAAC,CAAC"}
1
+ {"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,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;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,CAAC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;IACnE,wBAAwB,EAAE,cAAc;IACxC,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;QAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;IAC/F,CAAC,CAAC;CACH,CAAC,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { Schema } from "effect";
2
- import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
3
- import { LastOwner } from "@shivaedev/platform/rpc/userRoles.ts";
2
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
3
+ import { LastOwner } from "#users/roles.ts";
4
4
  export declare const UsersList: Schema.Struct<{
5
5
  readonly next: Schema.OptionFromNullOr<Schema.String>;
6
6
  readonly users: Schema.$Array<Schema.Struct<{
@@ -14,7 +14,7 @@ export declare const UsersList: Schema.Struct<{
14
14
  }>;
15
15
  export declare const UsersPage: import("#page.ts").AdminPage & {
16
16
  readonly id: "users";
17
- readonly contract: import("@shivaedev/effect-contract/contract.ts").Contract<"admin.users", readonly [NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"list", Schema.Struct<{
17
+ readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.users", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"list", Schema.Struct<{
18
18
  readonly cursor: Schema.optionalKey<Schema.String>;
19
19
  readonly limit: Schema.Number;
20
20
  }>, Schema.Struct<{
@@ -29,7 +29,7 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
29
29
  readonly canChangeRoles: Schema.Boolean;
30
30
  }>, {
31
31
  readonly AuthUnavailable: typeof AuthUnavailable;
32
- }>>], readonly [NoInfer<import("@shivaedev/effect-contract/operation.ts").Command<"changeRole", Schema.Struct<{
32
+ }>>], readonly [NoInfer<import("@shivaedev/contract/operation.ts").Command<"changeRole", Schema.Struct<{
33
33
  readonly grant: Schema.Boolean;
34
34
  readonly role: Schema.Literals<readonly ["user", "admin", "owner"]>;
35
35
  readonly userId: Schema.String;
@@ -58,7 +58,7 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
58
58
  }>]>>;
59
59
  }>, Schema.Struct<{
60
60
  readonly _tag: Schema.Literal<"Resync">;
61
- }>]>, Schema.Never>, Schema.Never, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
61
+ }>]>, Schema.Never>, Schema.Never, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
62
62
  readonly cursor: Schema.optionalKey<Schema.String>;
63
63
  readonly limit: Schema.Number;
64
64
  }>, Schema.Struct<{
@@ -71,10 +71,10 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
71
71
  readonly roles: Schema.$Array<Schema.String>;
72
72
  }>>;
73
73
  readonly canChangeRoles: Schema.Boolean;
74
- }>, Schema.Union<readonly (typeof AuthUnavailable)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
74
+ }>, Schema.Union<readonly (typeof AuthUnavailable)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
75
75
  readonly grant: Schema.Boolean;
76
76
  readonly role: Schema.Literals<readonly ["user", "admin", "owner"]>;
77
77
  readonly userId: Schema.String;
78
- }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastOwner)[]>, typeof import("@shivaedev/platform/rpc/middleware.ts").AuthenticatedAdmin, never>, readonly [], undefined>;
78
+ }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastOwner)[]>, typeof import("../permissions.ts").AdminPermission, never>, readonly [], undefined>;
79
79
  };
80
80
  //# 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;AAEhC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAGrG,OAAO,EAAmB,SAAS,EAA2B,MAAM,sCAAsC,CAAC;AAK3G,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoBpB,CAAC"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAmB,SAAS,EAA2B,MAAM,iBAAiB,CAAC;AAItF,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,eAAO,MAAM,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoBpB,CAAC"}
@@ -1,10 +1,10 @@
1
1
  import { Schema } from "effect";
2
- import { contract } from "@shivaedev/effect-contract/contract.ts";
3
- import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
- import { collection } from "@shivaedev/effect-contract/keys.ts";
5
- import { command, query } from "@shivaedev/effect-contract/operation.ts";
6
- import { ChangeRoleInput, LastOwner, UserList, UserListInput } from "@shivaedev/platform/rpc/userRoles.ts";
2
+ import { contract } from "@shivaedev/contract/contract.ts";
3
+ import { collection } from "@shivaedev/contract/keys.ts";
4
+ import { command, query } from "@shivaedev/contract/operation.ts";
5
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
7
6
  import { adminPage } from "#page.ts";
7
+ import { ChangeRoleInput, LastOwner, UserList, UserListInput } from "#users/roles.ts";
8
8
  const users = collection("admin.users", Schema.String);
9
9
  export const UsersList = Schema.Struct({ ...UserList.fields, canChangeRoles: Schema.Boolean });
10
10
  export const UsersPage = adminPage({
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AACrG,OAAO,EAAE,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sCAAsC,CAAC;AAC3G,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,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,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;QACjC,QAAQ,EAAE;YACT,OAAO,CAAC,YAAY,EAAE;gBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC/B,OAAO,EAAE,eAAe,CAAC,MAAM;gBAC/B,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE;aAC/D,CAAC;SACF;QACD,OAAO,EAAE;YACR,KAAK,CAAC,MAAM,EAAE;gBACb,OAAO,EAAE,aAAa,CAAC,MAAM;gBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACzB,UAAU,EAAE,EAAE,eAAe,EAAE;gBAC/B,OAAO,EAAE,SAAS;aAClB,CAAC;SACF;KACD,CAAC;IACF,EAAE,EAAE,OAAO;IACX,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;CAC/C,CAAC,CAAC"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AACzD,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,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEtF,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,CAAC,MAAM,SAAS,GAAG,SAAS,CAAC;IAClC,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;QACjC,QAAQ,EAAE;YACT,OAAO,CAAC,YAAY,EAAE;gBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBAC/B,OAAO,EAAE,eAAe,CAAC,MAAM;gBAC/B,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE;aAC/D,CAAC;SACF;QACD,OAAO,EAAE;YACR,KAAK,CAAC,MAAM,EAAE;gBACb,OAAO,EAAE,aAAa,CAAC,MAAM;gBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;gBACzB,UAAU,EAAE,EAAE,eAAe,EAAE;gBAC/B,OAAO,EAAE,SAAS;aAClB,CAAC;SACF;KACD,CAAC;IACF,EAAE,EAAE,OAAO;IACX,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;CAC/C,CAAC,CAAC"}
@@ -0,0 +1,44 @@
1
+ import { Schema } from "effect";
2
+ export declare const UserRole: Schema.Literals<readonly ["user", "admin", "owner"]>;
3
+ export type UserRole = typeof UserRole.Type;
4
+ export declare const AppUser: Schema.Struct<{
5
+ readonly createdAt: Schema.DateTimeUtcFromString;
6
+ readonly email: Schema.String;
7
+ readonly id: Schema.String;
8
+ readonly name: Schema.String;
9
+ readonly roles: Schema.$Array<Schema.String>;
10
+ }>;
11
+ export declare const UserListInput: Schema.Struct<{
12
+ readonly cursor: Schema.optionalKey<Schema.String>;
13
+ readonly limit: Schema.Number;
14
+ }>;
15
+ export declare const UserList: Schema.Struct<{
16
+ readonly next: Schema.OptionFromNullOr<Schema.String>;
17
+ readonly users: Schema.$Array<Schema.Struct<{
18
+ readonly createdAt: Schema.DateTimeUtcFromString;
19
+ readonly email: Schema.String;
20
+ readonly id: Schema.String;
21
+ readonly name: Schema.String;
22
+ readonly roles: Schema.$Array<Schema.String>;
23
+ }>>;
24
+ }>;
25
+ export declare const ChangeRoleInput: Schema.Struct<{
26
+ readonly grant: Schema.Boolean;
27
+ readonly role: Schema.Literals<readonly ["user", "admin", "owner"]>;
28
+ readonly userId: Schema.String;
29
+ }>;
30
+ declare const LastOwner_base: Schema.Class<LastOwner, Schema.TaggedStruct<"LastOwner", {
31
+ readonly userId: Schema.String;
32
+ }>, import("effect/Cause").YieldableError>;
33
+ export declare class LastOwner extends LastOwner_base {
34
+ }
35
+ export declare const ChangeUserRoles: {
36
+ readonly any: {
37
+ readonly name: "users.roles.change";
38
+ readonly strength: "any";
39
+ };
40
+ readonly name: "users.roles.change";
41
+ readonly strength: "own";
42
+ };
43
+ export {};
44
+ //# sourceMappingURL=roles.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,QAAQ,sDAA8C,CAAC;AACpE,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAE5C,eAAO,MAAM,OAAO;;;;;;EAMlB,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAgG,CAAC;AACtH,eAAO,MAAM,eAAe;;;;EAAkF,CAAC;;;;AAC/G,qBAAa,SAAU,SAAQ,cAAuE;CAAG;AAEzG,eAAO,MAAM,eAAe;;;;;;;CAAmC,CAAC"}
@@ -0,0 +1,20 @@
1
+ import { Schema } from "effect";
2
+ import { permission } from "@shivaedev/access/permission.ts";
3
+ export const UserRole = Schema.Literals(["user", "admin", "owner"]);
4
+ export const AppUser = Schema.Struct({
5
+ createdAt: Schema.DateTimeUtcFromString,
6
+ email: Schema.String,
7
+ id: Schema.String,
8
+ name: Schema.String,
9
+ roles: Schema.Array(Schema.String),
10
+ });
11
+ export const UserListInput = Schema.Struct({
12
+ cursor: Schema.optionalKey(Schema.String),
13
+ limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
14
+ });
15
+ export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(AppUser) });
16
+ export const ChangeRoleInput = Schema.Struct({ grant: Schema.Boolean, role: UserRole, userId: Schema.String });
17
+ export class LastOwner extends Schema.TaggedError()("LastOwner", { userId: Schema.String }) {
18
+ }
19
+ export const ChangeUserRoles = permission("users.roles.change");
20
+ //# sourceMappingURL=roles.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAGpE,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,qBAAqB;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;CAClC,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;AACtH,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAC/G,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,WAAW,EAAa,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG;AAEzG,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/admin",
3
- "version": "0.4.0",
3
+ "version": "0.6.0",
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,16 +41,20 @@
41
41
  "README.md"
42
42
  ],
43
43
  "dependencies": {
44
- "@shivaedev/effect-contract": "0.16.0",
45
- "@shivaedev/effect-pg-boss": "0.19.0",
46
- "@shivaedev/effect-react": "0.18.1",
47
- "@shivaedev/platform": "0.33.0"
44
+ "@shivaedev/access": "0.1.1",
45
+ "@shivaedev/contract": "0.17.0",
46
+ "@shivaedev/errors": "0.1.0",
47
+ "@shivaedev/identity": "0.1.0",
48
+ "@shivaedev/jobs": "0.20.0",
49
+ "@shivaedev/react": "0.19.0",
50
+ "@shivaedev/sql": "0.22.0"
48
51
  },
49
52
  "devDependencies": {
50
53
  "@effect/atom-react": "4.0.5",
51
- "@shivaedev/effect-test-sql": "0.9.3",
52
- "@shivaedev/quality": "0.41.1",
53
- "@shivaedev/test-story": "0.20.1",
54
+ "@shivaedev/quality": "0.42.0",
55
+ "@shivaedev/server": "0.1.0",
56
+ "@shivaedev/test-sql": "0.10.0",
57
+ "@shivaedev/test-story": "0.21.0",
54
58
  "@types/node": "24.19.2",
55
59
  "@types/react": "19.3.0",
56
60
  "@types/react-dom": "19.3.0",
@@ -1,6 +1,6 @@
1
1
  import { DateTime } from "effect";
2
- import { type AppUser, type ChangeRoleInput, UserRole } from "@shivaedev/platform/rpc/userRoles.ts";
3
2
  import type { UsersList } from "#users/page.ts";
3
+ import { type AppUser, type ChangeRoleInput, UserRole } from "#users/roles.ts";
4
4
 
5
5
  interface RoleControls {
6
6
  readonly dispatch: (input: typeof ChangeRoleInput.Type) => void;
@@ -2,9 +2,9 @@ import { Cause, Option, Predicate } from "effect";
2
2
  import type * as AsyncResult from "effect/reactivity/AsyncResult";
3
3
  import type * as Atom from "effect/reactivity/Atom";
4
4
  import { createElement, useState } from "react";
5
- import { useAction, useQuery } from "@shivaedev/effect-react/client/resultState.ts";
6
- import type { ChangeRoleInput, UserListInput } from "@shivaedev/platform/rpc/userRoles.ts";
5
+ import { useAction, useQuery } from "@shivaedev/react/client/resultState.ts";
7
6
  import type { UsersList } from "#users/page.ts";
7
+ import type { ChangeRoleInput, UserListInput } from "#users/roles.ts";
8
8
  import { UsersTable } from "./UsersTable.tsx";
9
9
 
10
10
  export interface UsersViewProps {
package/src/jobs/keys.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import { Schema } from "effect";
2
- import { collection } from "@shivaedev/effect-contract/keys.ts";
2
+ import { collection } from "@shivaedev/contract/keys.ts";
3
3
 
4
4
  export const jobsKeys = {
5
5
  counts: collection("admin.jobs.counts", Schema.String),
package/src/jobs/page.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Schema } from "effect";
2
- import { contract } from "@shivaedev/effect-contract/contract.ts";
3
- import { query } from "@shivaedev/effect-contract/operation.ts";
2
+ import { contract } from "@shivaedev/contract/contract.ts";
3
+ import { query } from "@shivaedev/contract/operation.ts";
4
4
  import { adminPage } from "#page.ts";
5
5
  import { jobsKeys } from "./keys.ts";
6
6
  import { deadLetteredSchema, JobsFailures, JobsHealth, type JobsQueue, jobPage, jobSchema, PageFields, QueueCounts } from "./schemas.ts";
@@ -1,6 +1,6 @@
1
1
  import { Schema } from "effect";
2
- import { contract } from "@shivaedev/effect-contract/contract.ts";
3
- import { command } from "@shivaedev/effect-contract/operation.ts";
2
+ import { contract } from "@shivaedev/contract/contract.ts";
3
+ import { command } from "@shivaedev/contract/operation.ts";
4
4
  import { adminPage } from "#page.ts";
5
5
  import { jobsKeys } from "./keys.ts";
6
6
  import { jobsPage } from "./page.ts";
package/src/page.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import type { Rpc, RpcGroup } from "effect/rpc";
2
- import type { Contract } from "@shivaedev/effect-contract/contract.ts";
3
- import type { CommandShape, QueryShape, StreamShape } from "@shivaedev/effect-contract/operation.ts";
4
- import { AuthenticatedAdmin } from "@shivaedev/platform/rpc/middleware.ts";
2
+ import type { Contract } from "@shivaedev/contract/contract.ts";
3
+ import type { CommandShape, QueryShape, StreamShape } from "@shivaedev/contract/operation.ts";
4
+ import { AdminPermission } from "#permissions.ts";
5
5
 
6
6
  export interface AdminRoute {
7
7
  readonly path: string;
@@ -33,7 +33,7 @@ export function adminPage<
33
33
  readonly contract: Contract<TName, TQueries, TCommands, TRpcs, TStreams>;
34
34
  }): AdminPage & {
35
35
  readonly id: TId;
36
- readonly contract: Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs, typeof AuthenticatedAdmin>, TStreams>;
36
+ readonly contract: Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs, typeof AdminPermission>, TStreams>;
37
37
  } {
38
- return { ...page, [AdminPageTypeId]: true as const, contract: page.contract.middleware(AuthenticatedAdmin) };
38
+ return { ...page, [AdminPageTypeId]: true as const, contract: page.contract.middleware(AdminPermission) };
39
39
  }
@@ -0,0 +1,5 @@
1
+ import { permission } from "@shivaedev/access/permission.ts";
2
+ import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
3
+
4
+ export const OpenAdmin = permission("admin.open");
5
+ export class AdminPermission extends permissionMiddleware<AdminPermission>()("@shivaedev/admin/Permission", OpenAdmin) {}
@@ -1,6 +1,6 @@
1
1
  import { type Context, DateTime, Effect, Option } from "effect";
2
- import type { PgBossError, PgBossPayloadError } from "@shivaedev/effect-pg-boss/server/error.ts";
3
- import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
2
+ import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
3
+ import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
4
4
  import type { jobsPage } from "#jobs/page.ts";
5
5
  import { JobsPayloadInvalid, type JobsQueue, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
6
6
 
@@ -1,5 +1,5 @@
1
1
  import { type Context, Effect, Option } from "effect";
2
- import type { PgBossService } from "@shivaedev/effect-pg-boss/server/service.ts";
2
+ import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
3
3
  import { JobsNotFailed, type jobsPageWithRetry } from "#jobs/retryPage.ts";
4
4
  import { type JobsQueue, JobsQueueUnregistered } from "#jobs/schemas.ts";
5
5
  import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.ts";
@@ -0,0 +1,67 @@
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
5
+ import { requirePermission } from "@shivaedev/identity/permission.ts";
6
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
7
+ import { type ChangeRoleInput, ChangeUserRoles, LastOwner, type UserListInput } from "#users/roles.ts";
8
+
9
+ const StoredUser = Schema.Struct({
10
+ createdAt: Schema.Date,
11
+ email: Schema.String,
12
+ id: Schema.String,
13
+ name: Schema.String,
14
+ role: Schema.NullOr(Schema.String),
15
+ });
16
+ function unavailable() {
17
+ return new AuthUnavailable({ message: "Could not access app users" });
18
+ }
19
+
20
+ export const listUsers = Effect.fn("Platform.listUsers")(function* (input: typeof UserListInput.Type) {
21
+ const sql = yield* SqlClient.SqlClient;
22
+ const read = SqlSchema.findAll({
23
+ execute: () => sql`select id, name, email, role, "createdAt" from "user"
24
+ where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
25
+ Request: Schema.Void,
26
+ Result: StoredUser,
27
+ });
28
+ const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
29
+ const users = rows.slice(0, input.limit).map(({ role, createdAt, ...user }) => ({
30
+ ...user,
31
+ createdAt: DateTime.makeUnsafe(createdAt),
32
+ roles: role?.split(",").filter(Boolean) ?? [],
33
+ }));
34
+ return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
35
+ });
36
+
37
+ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (input: typeof ChangeRoleInput.Type) {
38
+ const actor = yield* SessionUser;
39
+ yield* requirePermission(ChangeUserRoles);
40
+ const sql = yield* SqlClient.SqlClient;
41
+ const changed = yield* Effect.gen(function* () {
42
+ yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
43
+ const rows = yield* sql<{ readonly id: string; readonly role: string | null }>`select id, role from "user" where id = ${input.userId} for update`;
44
+ const target = rows[0];
45
+ if (target === undefined) {
46
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
47
+ }
48
+ const roles = target.role?.split(",").filter(Boolean) ?? [];
49
+ if (input.grant === roles.includes(input.role)) {
50
+ return false;
51
+ }
52
+ if (!input.grant && input.role === "owner") {
53
+ const owners = yield* sql<{ readonly id: string }>`select id from "user" where 'owner' = any(string_to_array(role, ','))`;
54
+ if (owners.length === 1) {
55
+ return yield* Effect.fail(new LastOwner({ userId: input.userId }));
56
+ }
57
+ }
58
+ const next = input.grant ? [...roles, input.role] : roles.filter((role) => role !== input.role);
59
+ yield* sql`update "user" set role = ${next.join(",")}, "updatedAt" = now() where id = ${input.userId}`;
60
+ yield* invalidateOnCommit(["admin.users"]);
61
+ return true;
62
+ }).pipe(transact({ onSqlError: unavailable }));
63
+ if (changed) {
64
+ const changedAt = DateTime.formatIso(yield* DateTime.now);
65
+ yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
66
+ }
67
+ });
@@ -1,14 +1,15 @@
1
1
  import { Effect } from "effect";
2
- import { hasRole } from "@shivaedev/platform/rpc/hasRole.ts";
3
- import { SessionUser } from "@shivaedev/platform/rpc/identity.ts";
4
- import { changeUserRole, listUsers } from "@shivaedev/platform/server/better-auth/users.ts";
2
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
3
+ import { hasPermission } from "@shivaedev/identity/permission.ts";
4
+ import { changeUserRole, listUsers } from "#server/users.ts";
5
5
  import { UsersPage } from "#users/page.ts";
6
+ import { ChangeUserRoles } from "#users/roles.ts";
6
7
 
7
8
  export const usersHandlers = UsersPage.contract.application.toLayer({
8
9
  "admin.users.changeRole": changeUserRole,
9
10
  "admin.users.list": (input) =>
10
11
  Effect.gen(function* () {
11
12
  const user = yield* SessionUser;
12
- return { ...(yield* listUsers(input)), canChangeRoles: hasRole(user, "owner") };
13
+ return { ...(yield* listUsers(input)), canChangeRoles: hasPermission(user, ChangeUserRoles) };
13
14
  }),
14
15
  });