@shivaedev/admin 0.5.0 → 0.7.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 (62) hide show
  1. package/README.md +27 -16
  2. package/dist/client/UsersTable.d.ts +5 -4
  3. package/dist/client/UsersTable.d.ts.map +1 -1
  4. package/dist/client/UsersTable.js +13 -14
  5. package/dist/client/UsersTable.js.map +1 -1
  6. package/dist/client/UsersView.d.ts +5 -4
  7. package/dist/client/UsersView.d.ts.map +1 -1
  8. package/dist/client/UsersView.js +6 -6
  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 +42 -41
  14. package/dist/jobs/page.d.ts.map +1 -1
  15. package/dist/jobs/page.js +4 -2
  16. package/dist/jobs/page.js.map +1 -1
  17. package/dist/jobs/retryPage.d.ts +14 -13
  18. package/dist/jobs/retryPage.d.ts.map +1 -1
  19. package/dist/jobs/retryPage.js +4 -2
  20. package/dist/jobs/retryPage.js.map +1 -1
  21. package/dist/page.d.ts +11 -7
  22. package/dist/page.d.ts.map +1 -1
  23. package/dist/page.js +6 -2
  24. package/dist/page.js.map +1 -1
  25. package/dist/permissions.d.ts +26 -5
  26. package/dist/permissions.d.ts.map +1 -1
  27. package/dist/permissions.js +7 -3
  28. package/dist/permissions.js.map +1 -1
  29. package/dist/server/jobsHandlers.d.ts +7 -7
  30. package/dist/server/jobsHandlers.d.ts.map +1 -1
  31. package/dist/server/jobsHandlersWithRetry.d.ts +2 -2
  32. package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
  33. package/dist/server/users.d.ts +46 -0
  34. package/dist/server/users.d.ts.map +1 -0
  35. package/dist/server/users.js +67 -0
  36. package/dist/server/users.js.map +1 -0
  37. package/dist/server/usersHandlers.d.ts +3 -1
  38. package/dist/server/usersHandlers.d.ts.map +1 -1
  39. package/dist/server/usersHandlers.js +13 -12
  40. package/dist/server/usersHandlers.js.map +1 -1
  41. package/dist/users/page.d.ts +19 -18
  42. package/dist/users/page.d.ts.map +1 -1
  43. package/dist/users/page.js +30 -26
  44. package/dist/users/page.js.map +1 -1
  45. package/dist/users/roles.d.ts +33 -0
  46. package/dist/users/roles.d.ts.map +1 -0
  47. package/dist/users/roles.js +16 -0
  48. package/dist/users/roles.js.map +1 -0
  49. package/package.json +12 -9
  50. package/src/client/UsersTable.tsx +48 -51
  51. package/src/client/UsersView.ts +10 -9
  52. package/src/jobs/keys.ts +1 -1
  53. package/src/jobs/page.ts +4 -2
  54. package/src/jobs/retryPage.ts +4 -2
  55. package/src/page.ts +15 -7
  56. package/src/permissions.ts +6 -3
  57. package/src/server/jobsHandlers.ts +2 -2
  58. package/src/server/jobsHandlersWithRetry.ts +1 -1
  59. package/src/server/users.ts +76 -0
  60. package/src/server/usersHandlers.ts +19 -13
  61. package/src/users/page.ts +31 -26
  62. package/src/users/roles.ts +20 -0
@@ -1,4 +1,5 @@
1
1
  import { Schema } from "effect";
2
+ import { JobsPermission } from "#permissions.ts";
2
3
  import { type JobsQueue } from "./schemas.ts";
3
4
  declare const JobsNotFailed_base: Schema.Class<JobsNotFailed, Schema.TaggedStruct<"JobsNotFailed", {
4
5
  readonly id: Schema.String;
@@ -8,7 +9,7 @@ export declare class JobsNotFailed extends JobsNotFailed_base {
8
9
  }
9
10
  export declare function jobsPageWithRetry<const TQueues extends readonly JobsQueue[]>(...queues: TQueues): import("#page.ts").AdminPage & {
10
11
  readonly id: "jobs";
11
- readonly contract: import("@shivaedev/effect-contract/contract.ts").Contract<"admin.jobs", readonly [NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"health", Schema.Void, Schema.Struct<{
12
+ readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.jobs", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"health", Schema.Void, Schema.Struct<{
12
13
  readonly activeTotal: Schema.Number;
13
14
  readonly deadLetteredTotal: Schema.Number;
14
15
  readonly failedTotal: Schema.Number;
@@ -26,7 +27,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
26
27
  JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
27
28
  JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
28
29
  JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
29
- }>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"counts", Schema.Struct<{
30
+ }>>, NoInfer<import("@shivaedev/contract/operation.ts").Query<"counts", Schema.Struct<{
30
31
  queue: Schema.String;
31
32
  }>, Schema.Struct<{
32
33
  readonly activeCount: Schema.Number;
@@ -37,7 +38,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
37
38
  JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
38
39
  JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
39
40
  JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
40
- }>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"failed", Schema.Struct<{
41
+ }>>, NoInfer<import("@shivaedev/contract/operation.ts").Query<"failed", Schema.Struct<{
41
42
  cursor: Schema.optionalKey<Schema.String>;
42
43
  limit: Schema.Number;
43
44
  queue: Schema.String;
@@ -60,7 +61,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
60
61
  JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
61
62
  JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
62
63
  JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
63
- }>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"deadLettered", Schema.Struct<{
64
+ }>>, NoInfer<import("@shivaedev/contract/operation.ts").Query<"deadLettered", Schema.Struct<{
64
65
  cursor: Schema.optionalKey<Schema.String>;
65
66
  limit: Schema.Number;
66
67
  queue: Schema.String;
@@ -85,7 +86,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
85
86
  JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
86
87
  JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
87
88
  JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
88
- }>>, NoInfer<import("@shivaedev/effect-contract/operation.ts").Query<"job", Schema.Struct<{
89
+ }>>, NoInfer<import("@shivaedev/contract/operation.ts").Query<"job", Schema.Struct<{
89
90
  id: Schema.String;
90
91
  queue: Schema.String;
91
92
  }>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
@@ -104,7 +105,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
104
105
  JobsPayloadInvalid: typeof import("./schemas.ts").JobsPayloadInvalid;
105
106
  JobsQueueUnregistered: typeof import("./schemas.ts").JobsQueueUnregistered;
106
107
  JobsUnavailable: typeof import("./schemas.ts").JobsUnavailable;
107
- }>>], readonly [NoInfer<import("@shivaedev/effect-contract/operation.ts").Command<"retry", Schema.Struct<{
108
+ }>>], readonly [NoInfer<import("@shivaedev/contract/operation.ts").Command<"retry", Schema.Struct<{
108
109
  id: Schema.String;
109
110
  queue: Schema.String;
110
111
  }>, Schema.Void, {
@@ -154,14 +155,14 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
154
155
  }>]>>;
155
156
  }>, Schema.Struct<{
156
157
  readonly _tag: Schema.Literal<"Resync">;
157
- }>]>, Schema.Never>, Schema.Never, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
158
+ }>]>, Schema.Never>, Schema.Never, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.counts", Schema.Struct<{
158
159
  queue: Schema.String;
159
160
  }>, Schema.Struct<{
160
161
  readonly activeCount: Schema.Number;
161
162
  readonly failedCount: Schema.Number;
162
163
  readonly queuedCount: Schema.Number;
163
164
  readonly totalCount: Schema.Number;
164
- }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
165
+ }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.deadLettered", Schema.Struct<{
165
166
  cursor: Schema.optionalKey<Schema.String>;
166
167
  limit: Schema.Number;
167
168
  queue: Schema.String;
@@ -182,7 +183,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
182
183
  readonly sourceOutput: Schema.Unknown;
183
184
  }>[]>>;
184
185
  readonly next: Schema.OptionFromNullOr<Schema.String>;
185
- }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
186
+ }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.failed", Schema.Struct<{
186
187
  cursor: Schema.optionalKey<Schema.String>;
187
188
  limit: Schema.Number;
188
189
  queue: Schema.String;
@@ -201,7 +202,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
201
202
  readonly queue: Schema.Literal<string>;
202
203
  }>[]>>;
203
204
  readonly next: Schema.OptionFromNullOr<Schema.String>;
204
- }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
205
+ }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.health", Schema.Void, Schema.Struct<{
205
206
  readonly activeTotal: Schema.Number;
206
207
  readonly deadLetteredTotal: Schema.Number;
207
208
  readonly failedTotal: Schema.Number;
@@ -215,7 +216,7 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
215
216
  }>>;
216
217
  readonly queuedTotal: Schema.Number;
217
218
  readonly readyTotal: Schema.Number;
218
- }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
219
+ }>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.job", Schema.Struct<{
219
220
  id: Schema.String;
220
221
  queue: Schema.String;
221
222
  }>, Schema.OptionFromNullOr<Schema.Union<Schema.Struct<{
@@ -230,10 +231,10 @@ export declare function jobsPageWithRetry<const TQueues extends readonly JobsQue
230
231
  readonly state: Schema.Literals<readonly ["created", "retry", "active", "completed", "cancelled", "failed"]>;
231
232
  readonly data: [...TQueues][number]["schema"];
232
233
  readonly queue: Schema.Literal<string>;
233
- }>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
234
+ }>[]>>, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered)[]>, typeof JobsPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.jobs.retry", Schema.Struct<{
234
235
  id: Schema.String;
235
236
  queue: Schema.String;
236
- }>, Schema.Void, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof import("../permissions.ts").AdminPermission, never>, readonly [], undefined>;
237
+ }>, Schema.Void, Schema.Union<readonly (typeof import("./schemas.ts").JobsUnavailable | typeof import("./schemas.ts").JobsPayloadInvalid | typeof import("./schemas.ts").JobsQueueUnregistered | typeof JobsNotFailed)[]>, typeof JobsPermission, never>, readonly [], undefined>;
237
238
  } & {
238
239
  queues: TQueues;
239
240
  };
@@ -1 +1 @@
1
- {"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAMhC,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;AAE5D,qBAAa,aAAc,SAAQ,kBAGjC;CAAG;AAEL,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyB/F"}
1
+ {"version":3,"file":"retryPage.d.ts","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAGjD,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,cAAc,CAAC;;;;;AAE5D,qBAAa,aAAc,SAAQ,kBAGjC;CAAG;AAEL,wBAAgB,iBAAiB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,GAAG,MAAM,EAAE,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0B/F"}
@@ -1,7 +1,8 @@
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
+ import { JobsPermission } from "#permissions.ts";
5
6
  import { jobsKeys } from "./keys.js";
6
7
  import { jobsPage } from "./page.js";
7
8
  import { JobsFailures } from "./schemas.js";
@@ -30,6 +31,7 @@ export function jobsPageWithRetry(...queues) {
30
31
  queries: page.contract.declaration.queries,
31
32
  }),
32
33
  id: page.id,
34
+ permission: JobsPermission,
33
35
  route: page.route,
34
36
  }), { queues });
35
37
  }
@@ -1 +1 @@
1
- {"version":3,"file":"retryPage.js","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,MAAM,yCAAyC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAE5D,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,WAAW,EAAiB,CAAC,eAAe,EAAE;IACvF,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,UAAU,iBAAiB,CAA6C,GAAG,MAAe;IAC/F,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CACnB,SAAS,CAAC;QACT,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE;YAChC,QAAQ,EAAE;gBACT,OAAO,CAAC,OAAO,EAAE;oBAChB,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;wBAC/B,QAAQ,CAAC,MAAM,CAAC,IAAI;wBACpB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;wBACjC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;qBAC5B;oBACD,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;oBACpD,UAAU,EAAE,EAAE,GAAG,YAAY,EAAE,aAAa,EAAE;iBAC9C,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO;SAC1C,CAAC;QACF,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,EACF,EAAE,MAAM,EAAE,CACV,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"retryPage.js","sourceRoot":"","sources":["../../src/jobs/retryPage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AACrC,OAAO,EAAE,YAAY,EAAkB,MAAM,cAAc,CAAC;AAE5D,MAAM,OAAO,aAAc,SAAQ,MAAM,CAAC,WAAW,EAAiB,CAAC,eAAe,EAAE;IACvF,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;CAAG;AAEL,MAAM,UAAU,iBAAiB,CAA6C,GAAG,MAAe;IAC/F,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,MAAM,CAAC,CAAC;IACjC,OAAO,MAAM,CAAC,MAAM,CACnB,SAAS,CAAC;QACT,QAAQ,EAAE,QAAQ,CAAC,YAAY,EAAE;YAChC,QAAQ,EAAE;gBACT,OAAO,CAAC,OAAO,EAAE;oBAChB,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;wBAC/B,QAAQ,CAAC,MAAM,CAAC,IAAI;wBACpB,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;wBAC3B,QAAQ,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC;wBACjC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;qBAC5B;oBACD,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE;oBACpD,UAAU,EAAE,EAAE,GAAG,YAAY,EAAE,aAAa,EAAE;iBAC9C,CAAC;aACF;YACD,OAAO,EAAE,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO;SAC1C,CAAC;QACF,EAAE,EAAE,IAAI,CAAC,EAAE;QACX,UAAU,EAAE,cAAc;QAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;KACjB,CAAC,EACF,EAAE,MAAM,EAAE,CACV,CAAC;AACH,CAAC"}
package/dist/page.d.ts CHANGED
@@ -1,9 +1,10 @@
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 { AdminPermission } from "#permissions.ts";
1
+ import type { Rpc, RpcGroup, RpcMiddleware } from "effect/rpc";
2
+ import type { Permission } from "@shivaedev/access/permission.ts";
3
+ import type { Contract } from "@shivaedev/contract/contract.ts";
4
+ import type { CommandShape, QueryShape, StreamShape } from "@shivaedev/contract/operation.ts";
5
5
  export interface AdminRoute {
6
6
  readonly path: string;
7
+ readonly permission: Permission;
7
8
  readonly title: string;
8
9
  }
9
10
  declare const AdminPageTypeId: unique symbol;
@@ -16,13 +17,16 @@ export interface AdminPage {
16
17
  readonly route: AdminRoute;
17
18
  readonly [AdminPageTypeId]: true;
18
19
  }
19
- export declare function adminPage<const TId extends string, const TName extends string, const TQueries extends readonly QueryShape[], const TCommands extends readonly CommandShape[], TRpcs extends Rpc.Any, const TStreams extends readonly StreamShape[]>(page: {
20
+ export declare function adminPage<const TId extends string, const TName extends string, const TQueries extends readonly QueryShape[], const TCommands extends readonly CommandShape[], TRpcs extends Rpc.Any, const TStreams extends readonly StreamShape[], TMiddleware extends RpcMiddleware.AnyService & {
21
+ readonly permission: Permission;
22
+ }>(page: {
20
23
  readonly id: TId;
21
- readonly route: AdminRoute;
24
+ readonly route: Omit<AdminRoute, "permission">;
25
+ readonly permission: TMiddleware;
22
26
  readonly contract: Contract<TName, TQueries, TCommands, TRpcs, TStreams>;
23
27
  }): AdminPage & {
24
28
  readonly id: TId;
25
- readonly contract: Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs, typeof AdminPermission>, TStreams>;
29
+ readonly contract: Contract<TName, TQueries, TCommands, Rpc.AddMiddleware<TRpcs, TMiddleware>, TStreams>;
26
30
  };
27
31
  export {};
28
32
  //# sourceMappingURL=page.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAElD,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,QAAA,MAAM,eAAe,eAAsC,CAAC;AAE5D,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,GAAG;QACjC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC;QACnC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;KAChD,CAAC;IACF,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CACjC;AAED,wBAAgB,SAAS,CACxB,KAAK,CAAC,GAAG,SAAS,MAAM,EACxB,KAAK,CAAC,KAAK,SAAS,MAAM,EAC1B,KAAK,CAAC,QAAQ,SAAS,SAAS,UAAU,EAAE,EAC5C,KAAK,CAAC,SAAS,SAAS,SAAS,YAAY,EAAE,EAC/C,KAAK,SAAS,GAAG,CAAC,GAAG,EACrB,KAAK,CAAC,QAAQ,SAAS,SAAS,WAAW,EAAE,EAC5C,IAAI,EAAE;IACP,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;IACjB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;CACzE,GAAG,SAAS,GAAG;IACf,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,OAAO,eAAe,CAAC,EAAE,QAAQ,CAAC,CAAC;CACpH,CAEA"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAE9F,MAAM,WAAW,UAAU;IAC1B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;CACvB;AAED,QAAA,MAAM,eAAe,eAAsC,CAAC;AAE5D,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,GAAG;QACjC,QAAQ,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,CAAC;QACnC,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC;KAChD,CAAC;IACF,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC;IAC3B,QAAQ,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,CAAC;CACjC;AAED,wBAAgB,SAAS,CACxB,KAAK,CAAC,GAAG,SAAS,MAAM,EACxB,KAAK,CAAC,KAAK,SAAS,MAAM,EAC1B,KAAK,CAAC,QAAQ,SAAS,SAAS,UAAU,EAAE,EAC5C,KAAK,CAAC,SAAS,SAAS,SAAS,YAAY,EAAE,EAC/C,KAAK,SAAS,GAAG,CAAC,GAAG,EACrB,KAAK,CAAC,QAAQ,SAAS,SAAS,WAAW,EAAE,EAC7C,WAAW,SAAS,aAAa,CAAC,UAAU,GAAG;IAAE,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAA;CAAE,EACjF,IAAI,EAAE;IACP,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;IACjB,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAC/C,QAAQ,CAAC,UAAU,EAAE,WAAW,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;CACzE,GAAG,SAAS,GAAG;IACf,QAAQ,CAAC,EAAE,EAAE,GAAG,CAAC;IACjB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC;CACzG,CAOA"}
package/dist/page.js CHANGED
@@ -1,6 +1,10 @@
1
- import { AdminPermission } from "#permissions.ts";
2
1
  const AdminPageTypeId = Symbol.for("@shivaedev/admin/Page");
3
2
  export function adminPage(page) {
4
- return { ...page, [AdminPageTypeId]: true, contract: page.contract.middleware(AdminPermission) };
3
+ return {
4
+ ...page,
5
+ route: { ...page.route, permission: page.permission.permission },
6
+ [AdminPageTypeId]: true,
7
+ contract: page.contract.middleware(page.permission),
8
+ };
5
9
  }
6
10
  //# sourceMappingURL=page.js.map
package/dist/page.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAOlD,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAY5D,MAAM,UAAU,SAAS,CAOvB,IAID;IAIA,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC,eAAe,CAAC,EAAE,IAAa,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;AAC3G,CAAC"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../src/page.ts"],"names":[],"mappings":"AAWA,MAAM,eAAe,GAAG,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;AAY5D,MAAM,UAAU,SAAS,CAQvB,IAKD;IAIA,OAAO;QACN,GAAG,IAAI;QACP,KAAK,EAAE,EAAE,GAAG,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE;QAChE,CAAC,eAAe,CAAC,EAAE,IAAa;QAChC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC;KACnD,CAAC;AACH,CAAC"}
@@ -1,15 +1,36 @@
1
- export declare const OpenAdmin: {
1
+ export declare const ReadUsers: {
2
2
  readonly any: {
3
- readonly name: "admin.open";
3
+ readonly name: "users.read";
4
4
  readonly strength: "any";
5
5
  };
6
- readonly name: "admin.open";
6
+ readonly name: "users.read";
7
7
  readonly strength: "own";
8
8
  };
9
- declare const AdminPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<AdminPermission, "@shivaedev/admin/Permission", import("@shivaedev/platform/rpc/identity.ts").Identity | import("@shivaedev/platform/rpc/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/effect-contract/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/effect-contract/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/effect-contract/errors/taxonomy.ts").Forbidden]>, never, never, false> & {
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
+ export declare const ReadJobs: {
18
+ readonly any: {
19
+ readonly name: "jobs.read";
20
+ readonly strength: "any";
21
+ };
22
+ readonly name: "jobs.read";
23
+ readonly strength: "own";
24
+ };
25
+ declare const UsersPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<UsersPermission, "@shivaedev/admin/UsersPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden]>, never, never, false> & {
26
+ permission: import("@shivaedev/access/permission.ts").Permission;
27
+ };
28
+ export declare class UsersPermission extends UsersPermission_base {
29
+ }
30
+ declare const JobsPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<JobsPermission, "@shivaedev/admin/JobsPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden]>, never, never, false> & {
10
31
  permission: import("@shivaedev/access/permission.ts").Permission;
11
32
  };
12
- export declare class AdminPermission extends AdminPermission_base {
33
+ export declare class JobsPermission extends JobsPermission_base {
13
34
  }
14
35
  export {};
15
36
  //# sourceMappingURL=permissions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;;;;AAClD,qBAAa,eAAgB,SAAQ,oBAAiF;CAAG"}
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,qBAAa,eAAgB,SAAQ,oBAAsF;CAAG;;;;AAC9H,qBAAa,cAAe,SAAQ,mBAAmF;CAAG"}
@@ -1,6 +1,10 @@
1
1
  import { permission } from "@shivaedev/access/permission.ts";
2
- import { permissionMiddleware } from "@shivaedev/platform/rpc/permission.ts";
3
- export const OpenAdmin = permission("admin.open");
4
- export class AdminPermission extends permissionMiddleware()("@shivaedev/admin/Permission", OpenAdmin) {
2
+ import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
3
+ export const ReadUsers = permission("users.read");
4
+ export const AssignRoles = permission("roles.assign");
5
+ export const ReadJobs = permission("jobs.read");
6
+ export class UsersPermission extends permissionMiddleware()("@shivaedev/admin/UsersPermission", ReadUsers) {
7
+ }
8
+ export class JobsPermission extends permissionMiddleware()("@shivaedev/admin/JobsPermission", ReadJobs) {
5
9
  }
6
10
  //# sourceMappingURL=permissions.js.map
@@ -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,uCAAuC,CAAC;AAE7E,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,OAAO,eAAgB,SAAQ,oBAAoB,EAAmB,CAAC,6BAA6B,EAAE,SAAS,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,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAChD,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,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,46 @@
1
+ import { DateTime, Effect, Option, Schema } 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 { type ChangeRoleInput, LastRoleAssigner } from "#users/roles.ts";
6
+ export declare const listUsers: <TRole extends string>(access: Pick<{
7
+ canAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => boolean;
8
+ hasPermission: (name: TRole, permission: import("@shivaedev/access/permission.ts").Permission) => boolean;
9
+ Role: Schema.Literals<TRole[]>;
10
+ requireAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
11
+ requirePermission: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").Permission) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
12
+ resolve: (stored: unknown) => Effect.Effect<{
13
+ permissions: {
14
+ name: string;
15
+ strength: "any" | "own";
16
+ }[];
17
+ role: TRole;
18
+ }, Schema.SchemaError, never>;
19
+ }, "Role">, input: {
20
+ readonly cursor?: string;
21
+ readonly limit: number;
22
+ }) => Effect.Effect<{
23
+ next: Option.Option<string>;
24
+ users: {
25
+ email: string;
26
+ id: string;
27
+ name: string;
28
+ createdAt: DateTime.Utc;
29
+ role: TRole;
30
+ }[];
31
+ }, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden, SessionUser | SqlClient.SqlClient>;
32
+ export declare const changeUserRole: <TRole extends string>(access: Pick<{
33
+ canAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => boolean;
34
+ hasPermission: (name: TRole, permission: import("@shivaedev/access/permission.ts").Permission) => boolean;
35
+ Role: Schema.Literals<TRole[]>;
36
+ requireAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
37
+ requirePermission: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").Permission) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
38
+ resolve: (stored: unknown) => Effect.Effect<{
39
+ permissions: {
40
+ name: string;
41
+ strength: "any" | "own";
42
+ }[];
43
+ role: TRole;
44
+ }, Schema.SchemaError, never>;
45
+ }, "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>;
46
+ //# 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,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAI9D,OAAO,EAAE,KAAK,eAAe,EAAE,gBAAgB,EAAsB,MAAM,iBAAiB,CAAC;AAa7F,eAAO,MAAM,SAAS,GAA8C,KAAK,SAAS,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;0GAmBtF,CAAC;AAEH,eAAO,MAAM,cAAc,GAAmD,KAAK,SAAS,MAAM;;;;;;;;;;;;;6QAiChG,CAAC"}
@@ -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 { AssignRoles, ReadUsers } from "#permissions.ts";
8
+ import { LastRoleAssigner } from "#users/roles.ts";
9
+ const StoredUser = Schema.Struct({
10
+ createdAt: Schema.Date,
11
+ email: Schema.String,
12
+ id: Schema.String,
13
+ name: Schema.String,
14
+ role: Schema.String,
15
+ });
16
+ function unavailable() {
17
+ return new AuthUnavailable({ message: "Could not access app users" });
18
+ }
19
+ export const listUsers = Effect.fn("Platform.listUsers")(function* (access, input) {
20
+ yield* requirePermission(ReadUsers);
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: Schema.Struct({ ...StoredUser.fields, role: access.Role }),
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
+ role,
33
+ }));
34
+ return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none(), users };
35
+ });
36
+ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (access, input) {
37
+ const actor = yield* SessionUser;
38
+ yield* requirePermission(AssignRoles);
39
+ const sql = yield* SqlClient.SqlClient;
40
+ const changed = yield* Effect.gen(function* () {
41
+ yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
42
+ const rows = yield* sql `select id, role from "user" where id = ${input.userId} for update`;
43
+ const target = rows[0];
44
+ if (target === undefined) {
45
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
46
+ }
47
+ const next = yield* Schema.decodeUnknownEffect(access.Role)(input.role).pipe(Effect.mapError(unavailable));
48
+ if (target.role === next) {
49
+ return false;
50
+ }
51
+ const assigners = access.Role.literals.filter((role) => access.hasPermission(role, AssignRoles));
52
+ if (assigners.some((role) => role === target.role) && !access.hasPermission(next, AssignRoles)) {
53
+ const holders = yield* sql `select id from "user" where role in ${sql.in(assigners)}`;
54
+ if (holders.length === 1) {
55
+ return yield* Effect.fail(new LastRoleAssigner({ userId: input.userId }));
56
+ }
57
+ }
58
+ yield* sql `update "user" set role = ${next}, "updatedAt" = now() where id = ${input.userId}`;
59
+ yield* invalidateOnCommit(["admin.users"]);
60
+ return true;
61
+ }).pipe(transact({ onSqlError: unavailable }));
62
+ if (changed) {
63
+ const changedAt = DateTime.formatIso(yield* DateTime.now);
64
+ yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
65
+ }
66
+ });
67
+ //# 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,2 +1,4 @@
1
- export declare const usersHandlers: import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.users.changeRole"> | import("effect/rpc/Rpc").Handler<"admin.users.list">, never, import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>;
1
+ import type { roleSet } from "@shivaedev/access/roleSet.ts";
2
+ import type { usersPage } from "#users/page.ts";
3
+ export declare function usersHandlers<const TRole extends string>(page: ReturnType<typeof usersPage<TRole>>, access: Pick<ReturnType<typeof roleSet<TRole>>, "Role" | "hasPermission">): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.users.changeRole"> | import("effect/rpc/Rpc").Handler<"admin.users.list">, never, import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>;
2
4
  //# sourceMappingURL=usersHandlers.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"usersHandlers.d.ts","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,aAAa,sPAOxB,CAAC"}
1
+ {"version":3,"file":"usersHandlers.d.ts","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAK5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,wBAAgB,aAAa,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EACvD,IAAI,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EACzC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,wPAUzE"}
@@ -1,14 +1,15 @@
1
1
  import { Effect } from "effect";
2
- import { SessionUser } from "@shivaedev/platform/rpc/identity.ts";
3
- import { hasPermission } from "@shivaedev/platform/rpc/permission.ts";
4
- import { ChangeUserRoles } from "@shivaedev/platform/rpc/userRoles.ts";
5
- import { changeUserRole, listUsers } from "@shivaedev/platform/server/better-auth/users.ts";
6
- import { UsersPage } from "#users/page.ts";
7
- export const usersHandlers = UsersPage.contract.application.toLayer({
8
- "admin.users.changeRole": changeUserRole,
9
- "admin.users.list": (input) => Effect.gen(function* () {
10
- const user = yield* SessionUser;
11
- return { ...(yield* listUsers(input)), canChangeRoles: hasPermission(user, ChangeUserRoles) };
12
- }),
13
- });
2
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
3
+ import { hasPermission } from "@shivaedev/identity/permission.ts";
4
+ import { AssignRoles } from "#permissions.ts";
5
+ import { changeUserRole, listUsers } from "#server/users.ts";
6
+ export function usersHandlers(page, access) {
7
+ return page.contract.application.toLayer({
8
+ "admin.users.changeRole": (input) => changeUserRole(access, input),
9
+ "admin.users.list": (input) => Effect.gen(function* () {
10
+ const user = yield* SessionUser;
11
+ return { ...(yield* listUsers(access, input)), canChangeRoles: hasPermission(user, AssignRoles) };
12
+ }),
13
+ });
14
+ }
14
15
  //# 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,WAAW,EAAE,MAAM,qCAAqC,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AACtE,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,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,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,EAAE,CAAC;IAC/F,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;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,MAAyE;IAEzE,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"}