@shivaedev/admin 0.6.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 (52) hide show
  1. package/README.md +21 -12
  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 +4 -3
  7. package/dist/client/UsersView.d.ts.map +1 -1
  8. package/dist/client/UsersView.js +5 -5
  9. package/dist/client/UsersView.js.map +1 -1
  10. package/dist/jobs/page.d.ts +37 -36
  11. package/dist/jobs/page.d.ts.map +1 -1
  12. package/dist/jobs/page.js +2 -0
  13. package/dist/jobs/page.js.map +1 -1
  14. package/dist/jobs/retryPage.d.ts +38 -37
  15. package/dist/jobs/retryPage.d.ts.map +1 -1
  16. package/dist/jobs/retryPage.js +2 -0
  17. package/dist/jobs/retryPage.js.map +1 -1
  18. package/dist/page.d.ts +9 -5
  19. package/dist/page.d.ts.map +1 -1
  20. package/dist/page.js +6 -2
  21. package/dist/page.js.map +1 -1
  22. package/dist/permissions.d.ts +26 -5
  23. package/dist/permissions.d.ts.map +1 -1
  24. package/dist/permissions.js +6 -2
  25. package/dist/permissions.js.map +1 -1
  26. package/dist/server/users.d.ts +32 -10
  27. package/dist/server/users.d.ts.map +1 -1
  28. package/dist/server/users.js +17 -15
  29. package/dist/server/users.js.map +1 -1
  30. package/dist/server/usersHandlers.d.ts +3 -1
  31. package/dist/server/usersHandlers.d.ts.map +1 -1
  32. package/dist/server/usersHandlers.js +10 -9
  33. package/dist/server/usersHandlers.js.map +1 -1
  34. package/dist/users/page.d.ts +16 -15
  35. package/dist/users/page.d.ts.map +1 -1
  36. package/dist/users/page.js +26 -22
  37. package/dist/users/page.js.map +1 -1
  38. package/dist/users/roles.d.ts +8 -19
  39. package/dist/users/roles.d.ts.map +1 -1
  40. package/dist/users/roles.js +2 -6
  41. package/dist/users/roles.js.map +1 -1
  42. package/package.json +9 -9
  43. package/src/client/UsersTable.tsx +48 -51
  44. package/src/client/UsersView.ts +8 -7
  45. package/src/jobs/page.ts +2 -0
  46. package/src/jobs/retryPage.ts +2 -0
  47. package/src/page.ts +13 -5
  48. package/src/permissions.ts +5 -2
  49. package/src/server/users.ts +24 -15
  50. package/src/server/usersHandlers.ts +16 -10
  51. package/src/users/page.ts +27 -22
  52. package/src/users/roles.ts +6 -9
package/dist/page.d.ts CHANGED
@@ -1,9 +1,10 @@
1
- import type { Rpc, RpcGroup } from "effect/rpc";
1
+ import type { Rpc, RpcGroup, RpcMiddleware } from "effect/rpc";
2
+ import type { Permission } from "@shivaedev/access/permission.ts";
2
3
  import type { Contract } from "@shivaedev/contract/contract.ts";
3
4
  import type { CommandShape, QueryShape, StreamShape } from "@shivaedev/contract/operation.ts";
4
- import { AdminPermission } from "#permissions.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,iCAAiC,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AAC9F,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/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> & {
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
2
  import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
3
- export const OpenAdmin = permission("admin.open");
4
- export class AdminPermission extends permissionMiddleware()("@shivaedev/admin/Permission", OpenAdmin) {
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,mCAAmC,CAAC;AAEzE,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,9 +1,22 @@
1
- import { DateTime, Effect, Option } from "effect";
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
2
  import { SqlClient } from "effect/sql";
3
3
  import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
4
  import { SessionUser } from "@shivaedev/identity/identity.ts";
5
- import { LastOwner } from "#users/roles.ts";
6
- export declare const listUsers: (input: {
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: {
7
20
  readonly cursor?: string;
8
21
  readonly limit: number;
9
22
  }) => Effect.Effect<{
@@ -13,12 +26,21 @@ export declare const listUsers: (input: {
13
26
  id: string;
14
27
  name: string;
15
28
  createdAt: DateTime.Utc;
16
- roles: string[];
29
+ role: TRole;
17
30
  }[];
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>;
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>;
24
46
  //# sourceMappingURL=users.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;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"}
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"}
@@ -4,36 +4,38 @@ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
4
  import { SessionUser } from "@shivaedev/identity/identity.ts";
5
5
  import { requirePermission } from "@shivaedev/identity/permission.ts";
6
6
  import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
7
- import { ChangeUserRoles, LastOwner } from "#users/roles.ts";
7
+ import { AssignRoles, ReadUsers } from "#permissions.ts";
8
+ import { LastRoleAssigner } from "#users/roles.ts";
8
9
  const StoredUser = Schema.Struct({
9
10
  createdAt: Schema.Date,
10
11
  email: Schema.String,
11
12
  id: Schema.String,
12
13
  name: Schema.String,
13
- role: Schema.NullOr(Schema.String),
14
+ role: Schema.String,
14
15
  });
15
16
  function unavailable() {
16
17
  return new AuthUnavailable({ message: "Could not access app users" });
17
18
  }
18
- export const listUsers = Effect.fn("Platform.listUsers")(function* (input) {
19
+ export const listUsers = Effect.fn("Platform.listUsers")(function* (access, input) {
20
+ yield* requirePermission(ReadUsers);
19
21
  const sql = yield* SqlClient.SqlClient;
20
22
  const read = SqlSchema.findAll({
21
23
  execute: () => sql `select id, name, email, role, "createdAt" from "user"
22
24
  where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
23
25
  Request: Schema.Void,
24
- Result: StoredUser,
26
+ Result: Schema.Struct({ ...StoredUser.fields, role: access.Role }),
25
27
  });
26
28
  const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
27
29
  const users = rows.slice(0, input.limit).map(({ role, createdAt, ...user }) => ({
28
30
  ...user,
29
31
  createdAt: DateTime.makeUnsafe(createdAt),
30
- roles: role?.split(",").filter(Boolean) ?? [],
32
+ role,
31
33
  }));
32
34
  return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none(), users };
33
35
  });
34
- export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (input) {
36
+ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (access, input) {
35
37
  const actor = yield* SessionUser;
36
- yield* requirePermission(ChangeUserRoles);
38
+ yield* requirePermission(AssignRoles);
37
39
  const sql = yield* SqlClient.SqlClient;
38
40
  const changed = yield* Effect.gen(function* () {
39
41
  yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
@@ -42,18 +44,18 @@ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (in
42
44
  if (target === undefined) {
43
45
  return yield* Effect.fail(new NotFound({ message: "User not found" }));
44
46
  }
45
- const roles = target.role?.split(",").filter(Boolean) ?? [];
46
- if (input.grant === roles.includes(input.role)) {
47
+ const next = yield* Schema.decodeUnknownEffect(access.Role)(input.role).pipe(Effect.mapError(unavailable));
48
+ if (target.role === next) {
47
49
  return false;
48
50
  }
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 }));
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 }));
53
56
  }
54
57
  }
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}`;
58
+ yield* sql `update "user" set role = ${next}, "updatedAt" = now() where id = ${input.userId}`;
57
59
  yield* invalidateOnCommit(["admin.users"]);
58
60
  return true;
59
61
  }).pipe(transact({ onSqlError: unavailable }));
@@ -1 +1 @@
1
- {"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"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"}
@@ -1,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
2
  import { SessionUser } from "@shivaedev/identity/identity.ts";
3
3
  import { hasPermission } from "@shivaedev/identity/permission.ts";
4
+ import { AssignRoles } from "#permissions.ts";
4
5
  import { changeUserRole, listUsers } from "#server/users.ts";
5
- import { UsersPage } from "#users/page.ts";
6
- import { ChangeUserRoles } from "#users/roles.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
- });
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,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
+ {"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"}
@@ -1,6 +1,8 @@
1
1
  import { Schema } from "effect";
2
+ import type { roleSet } from "@shivaedev/access/roleSet.ts";
2
3
  import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
3
- import { LastOwner } from "#users/roles.ts";
4
+ import { UsersPermission } from "#permissions.ts";
5
+ import { LastRoleAssigner } from "#users/roles.ts";
4
6
  export declare const UsersList: Schema.Struct<{
5
7
  readonly next: Schema.OptionFromNullOr<Schema.String>;
6
8
  readonly users: Schema.$Array<Schema.Struct<{
@@ -8,11 +10,11 @@ export declare const UsersList: Schema.Struct<{
8
10
  readonly email: Schema.String;
9
11
  readonly id: Schema.String;
10
12
  readonly name: Schema.String;
11
- readonly roles: Schema.$Array<Schema.String>;
13
+ readonly role: Schema.String;
12
14
  }>>;
13
15
  readonly canChangeRoles: Schema.Boolean;
14
16
  }>;
15
- export declare const UsersPage: import("#page.ts").AdminPage & {
17
+ export declare function usersPage<const TRole extends string>(access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">): import("#page.ts").AdminPage & {
16
18
  readonly id: "users";
17
19
  readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.users", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"list", Schema.Struct<{
18
20
  readonly cursor: Schema.optionalKey<Schema.String>;
@@ -24,19 +26,19 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
24
26
  readonly email: Schema.String;
25
27
  readonly id: Schema.String;
26
28
  readonly name: Schema.String;
27
- readonly roles: Schema.$Array<Schema.String>;
29
+ readonly role: Schema.String;
28
30
  }>>;
29
31
  readonly canChangeRoles: Schema.Boolean;
30
32
  }>, {
31
33
  readonly AuthUnavailable: typeof AuthUnavailable;
34
+ readonly Forbidden: typeof Forbidden;
32
35
  }>>], readonly [NoInfer<import("@shivaedev/contract/operation.ts").Command<"changeRole", Schema.Struct<{
33
- readonly grant: Schema.Boolean;
34
- readonly role: Schema.Literals<readonly ["user", "admin", "owner"]>;
35
- readonly userId: Schema.String;
36
+ role: Schema.Literals<TRole[]>;
37
+ userId: Schema.String;
36
38
  }>, Schema.Void, {
37
39
  readonly AuthUnavailable: typeof AuthUnavailable;
38
40
  readonly Forbidden: typeof Forbidden;
39
- readonly LastOwner: typeof LastOwner;
41
+ readonly LastRoleAssigner: typeof LastRoleAssigner;
40
42
  readonly NotFound: typeof NotFound;
41
43
  }>>], import("effect/rpc/Rpc").Rpc<"admin.users.$changes", Schema.Struct<{
42
44
  queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
@@ -58,7 +60,10 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
58
60
  }>]>>;
59
61
  }>, Schema.Struct<{
60
62
  readonly _tag: Schema.Literal<"Resync">;
61
- }>]>, Schema.Never>, Schema.Never, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
63
+ }>]>, Schema.Never>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
64
+ role: Schema.Literals<TRole[]>;
65
+ userId: Schema.String;
66
+ }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
62
67
  readonly cursor: Schema.optionalKey<Schema.String>;
63
68
  readonly limit: Schema.Number;
64
69
  }>, Schema.Struct<{
@@ -68,13 +73,9 @@ export declare const UsersPage: import("#page.ts").AdminPage & {
68
73
  readonly email: Schema.String;
69
74
  readonly id: Schema.String;
70
75
  readonly name: Schema.String;
71
- readonly roles: Schema.$Array<Schema.String>;
76
+ readonly role: Schema.String;
72
77
  }>>;
73
78
  readonly canChangeRoles: Schema.Boolean;
74
- }>, Schema.Union<readonly (typeof AuthUnavailable)[]>, typeof import("../permissions.ts").AdminPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
75
- readonly grant: Schema.Boolean;
76
- readonly role: Schema.Literals<readonly ["user", "admin", "owner"]>;
77
- readonly userId: Schema.String;
78
- }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastOwner)[]>, typeof import("../permissions.ts").AdminPermission, never>, readonly [], undefined>;
79
+ }>, Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof UsersPermission, never>, readonly [], undefined>;
79
80
  };
80
81
  //# 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;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
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAI5D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuB5G"}
@@ -4,28 +4,32 @@ import { collection } from "@shivaedev/contract/keys.ts";
4
4
  import { command, query } from "@shivaedev/contract/operation.ts";
5
5
  import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
6
6
  import { adminPage } from "#page.ts";
7
- import { ChangeRoleInput, LastOwner, UserList, UserListInput } from "#users/roles.ts";
7
+ import { UsersPermission } from "#permissions.ts";
8
+ import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
8
9
  const users = collection("admin.users", Schema.String);
9
10
  export const UsersList = Schema.Struct({ ...UserList.fields, canChangeRoles: Schema.Boolean });
10
- export const UsersPage = adminPage({
11
- contract: contract("admin.users", {
12
- commands: [
13
- command("changeRole", {
14
- invalidates: () => [users.list],
15
- payload: ChangeRoleInput.fields,
16
- rejections: { AuthUnavailable, Forbidden, LastOwner, NotFound },
17
- }),
18
- ],
19
- queries: [
20
- query("list", {
21
- payload: UserListInput.fields,
22
- reads: () => [users.list],
23
- rejections: { AuthUnavailable },
24
- success: UsersList,
25
- }),
26
- ],
27
- }),
28
- id: "users",
29
- route: { path: "/admin/users", title: "Users" },
30
- });
11
+ export function usersPage(access) {
12
+ return adminPage({
13
+ contract: contract("admin.users", {
14
+ commands: [
15
+ command("changeRole", {
16
+ invalidates: () => [users.list],
17
+ payload: { role: access.Role, userId: Schema.String },
18
+ rejections: { AuthUnavailable, Forbidden, LastRoleAssigner, NotFound },
19
+ }),
20
+ ],
21
+ queries: [
22
+ query("list", {
23
+ payload: UserListInput.fields,
24
+ reads: () => [users.list],
25
+ rejections: { AuthUnavailable, Forbidden },
26
+ success: UsersList,
27
+ }),
28
+ ],
29
+ }),
30
+ id: "users",
31
+ permission: UsersPermission,
32
+ route: { path: "/admin/users", title: "Users" },
33
+ });
34
+ }
31
35
  //# sourceMappingURL=page.js.map
@@ -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,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"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,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,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAuD;IAC5G,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
@@ -1,12 +1,10 @@
1
1
  import { Schema } from "effect";
2
- export declare const UserRole: Schema.Literals<readonly ["user", "admin", "owner"]>;
3
- export type UserRole = typeof UserRole.Type;
4
2
  export declare const AppUser: Schema.Struct<{
5
3
  readonly createdAt: Schema.DateTimeUtcFromString;
6
4
  readonly email: Schema.String;
7
5
  readonly id: Schema.String;
8
6
  readonly name: Schema.String;
9
- readonly roles: Schema.$Array<Schema.String>;
7
+ readonly role: Schema.String;
10
8
  }>;
11
9
  export declare const UserListInput: Schema.Struct<{
12
10
  readonly cursor: Schema.optionalKey<Schema.String>;
@@ -19,26 +17,17 @@ export declare const UserList: Schema.Struct<{
19
17
  readonly email: Schema.String;
20
18
  readonly id: Schema.String;
21
19
  readonly name: Schema.String;
22
- readonly roles: Schema.$Array<Schema.String>;
20
+ readonly role: Schema.String;
23
21
  }>>;
24
22
  }>;
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", {
23
+ export interface ChangeRoleInput<TRole extends string = string> {
24
+ readonly role: TRole;
25
+ readonly userId: string;
26
+ }
27
+ declare const LastRoleAssigner_base: Schema.Class<LastRoleAssigner, Schema.TaggedStruct<"LastRoleAssigner", {
31
28
  readonly userId: Schema.String;
32
29
  }>, import("effect/Cause").YieldableError>;
33
- export declare class LastOwner extends LastOwner_base {
30
+ export declare class LastRoleAssigner extends LastRoleAssigner_base {
34
31
  }
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
32
  export {};
44
33
  //# sourceMappingURL=roles.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;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"}
1
+ {"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,eAAO,MAAM,OAAO;;;;;;EAMlB,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAgG,CAAC;AACtH,MAAM,WAAW,eAAe,CAAC,KAAK,SAAS,MAAM,GAAG,MAAM;IAC7D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACxB;;;;AACD,qBAAa,gBAAiB,SAAQ,qBAAqF;CAAG"}
@@ -1,20 +1,16 @@
1
1
  import { Schema } from "effect";
2
- import { permission } from "@shivaedev/access/permission.ts";
3
- export const UserRole = Schema.Literals(["user", "admin", "owner"]);
4
2
  export const AppUser = Schema.Struct({
5
3
  createdAt: Schema.DateTimeUtcFromString,
6
4
  email: Schema.String,
7
5
  id: Schema.String,
8
6
  name: Schema.String,
9
- roles: Schema.Array(Schema.String),
7
+ role: Schema.String,
10
8
  });
11
9
  export const UserListInput = Schema.Struct({
12
10
  cursor: Schema.optionalKey(Schema.String),
13
11
  limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
14
12
  });
15
13
  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 }) {
14
+ export class LastRoleAssigner extends Schema.TaggedError()("LastRoleAssigner", { userId: Schema.String }) {
18
15
  }
19
- export const ChangeUserRoles = permission("users.roles.change");
20
16
  //# sourceMappingURL=roles.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;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"}
1
+ {"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,qBAAqB;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAKtH,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}