@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
@@ -0,0 +1,76 @@
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import type { roleSet } from "@shivaedev/access/roleSet.ts";
4
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
5
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
6
+ import { requirePermission } from "@shivaedev/identity/permission.ts";
7
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
8
+ import { AssignRoles, ReadUsers } from "#permissions.ts";
9
+ import { type ChangeRoleInput, LastRoleAssigner, type UserListInput } from "#users/roles.ts";
10
+
11
+ const StoredUser = Schema.Struct({
12
+ createdAt: Schema.Date,
13
+ email: Schema.String,
14
+ id: Schema.String,
15
+ name: Schema.String,
16
+ role: Schema.String,
17
+ });
18
+ function unavailable() {
19
+ return new AuthUnavailable({ message: "Could not access app users" });
20
+ }
21
+
22
+ export const listUsers = Effect.fn("Platform.listUsers")(function* <TRole extends string>(
23
+ access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">,
24
+ input: typeof UserListInput.Type,
25
+ ) {
26
+ yield* requirePermission(ReadUsers);
27
+ const sql = yield* SqlClient.SqlClient;
28
+ const read = SqlSchema.findAll({
29
+ execute: () => sql`select id, name, email, role, "createdAt" from "user"
30
+ where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
31
+ Request: Schema.Void,
32
+ Result: Schema.Struct({ ...StoredUser.fields, role: access.Role }),
33
+ });
34
+ const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
35
+ const users = rows.slice(0, input.limit).map(({ role, createdAt, ...user }) => ({
36
+ ...user,
37
+ createdAt: DateTime.makeUnsafe(createdAt),
38
+ role,
39
+ }));
40
+ return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
41
+ });
42
+
43
+ export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* <TRole extends string>(
44
+ access: Pick<ReturnType<typeof roleSet<TRole>>, "Role" | "hasPermission">,
45
+ input: ChangeRoleInput<TRole>,
46
+ ) {
47
+ const actor = yield* SessionUser;
48
+ yield* requirePermission(AssignRoles);
49
+ const sql = yield* SqlClient.SqlClient;
50
+ const changed = yield* Effect.gen(function* () {
51
+ yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
52
+ const rows = yield* sql<{ readonly id: string; readonly role: string | null }>`select id, role from "user" where id = ${input.userId} for update`;
53
+ const target = rows[0];
54
+ if (target === undefined) {
55
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
56
+ }
57
+ const next = yield* Schema.decodeUnknownEffect(access.Role)(input.role).pipe(Effect.mapError(unavailable));
58
+ if (target.role === next) {
59
+ return false;
60
+ }
61
+ const assigners = access.Role.literals.filter((role) => access.hasPermission(role, AssignRoles));
62
+ if (assigners.some((role) => role === target.role) && !access.hasPermission(next, AssignRoles)) {
63
+ const holders = yield* sql<{ readonly id: string }>`select id from "user" where role in ${sql.in(assigners)}`;
64
+ if (holders.length === 1) {
65
+ return yield* Effect.fail(new LastRoleAssigner({ userId: input.userId }));
66
+ }
67
+ }
68
+ yield* sql`update "user" set role = ${next}, "updatedAt" = now() where id = ${input.userId}`;
69
+ yield* invalidateOnCommit(["admin.users"]);
70
+ return true;
71
+ }).pipe(transact({ onSqlError: unavailable }));
72
+ if (changed) {
73
+ const changedAt = DateTime.formatIso(yield* DateTime.now);
74
+ yield* Effect.logInfo("User role changed").pipe(Effect.annotateLogs({ actorId: actor.id, changedAt, ...input }));
75
+ }
76
+ });
@@ -1,15 +1,21 @@
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";
2
+ import type { roleSet } from "@shivaedev/access/roleSet.ts";
3
+ import { SessionUser } from "@shivaedev/identity/identity.ts";
4
+ import { hasPermission } from "@shivaedev/identity/permission.ts";
5
+ import { AssignRoles } from "#permissions.ts";
6
+ import { changeUserRole, listUsers } from "#server/users.ts";
7
+ import type { usersPage } from "#users/page.ts";
7
8
 
8
- export const usersHandlers = UsersPage.contract.application.toLayer({
9
- "admin.users.changeRole": changeUserRole,
10
- "admin.users.list": (input) =>
11
- Effect.gen(function* () {
12
- const user = yield* SessionUser;
13
- return { ...(yield* listUsers(input)), canChangeRoles: hasPermission(user, ChangeUserRoles) };
14
- }),
15
- });
9
+ export function usersHandlers<const TRole extends string>(
10
+ page: ReturnType<typeof usersPage<TRole>>,
11
+ access: Pick<ReturnType<typeof roleSet<TRole>>, "Role" | "hasPermission">,
12
+ ) {
13
+ return page.contract.application.toLayer({
14
+ "admin.users.changeRole": (input) => changeUserRole(access, input),
15
+ "admin.users.list": (input) =>
16
+ Effect.gen(function* () {
17
+ const user = yield* SessionUser;
18
+ return { ...(yield* listUsers(access, input)), canChangeRoles: hasPermission(user, AssignRoles) };
19
+ }),
20
+ });
21
+ }
package/src/users/page.ts CHANGED
@@ -1,32 +1,37 @@
1
1
  import { Schema } from "effect";
2
- import { contract } from "@shivaedev/effect-contract/contract.ts";
3
- import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
4
- import { collection } from "@shivaedev/effect-contract/keys.ts";
5
- import { command, query } from "@shivaedev/effect-contract/operation.ts";
6
- import { ChangeRoleInput, LastOwner, UserList, UserListInput } from "@shivaedev/platform/rpc/userRoles.ts";
2
+ import type { roleSet } from "@shivaedev/access/roleSet.ts";
3
+ import { contract } from "@shivaedev/contract/contract.ts";
4
+ import { collection } from "@shivaedev/contract/keys.ts";
5
+ import { command, query } from "@shivaedev/contract/operation.ts";
6
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
7
7
  import { adminPage } from "#page.ts";
8
+ import { UsersPermission } from "#permissions.ts";
9
+ import { LastRoleAssigner, UserList, UserListInput } from "#users/roles.ts";
8
10
 
9
11
  const users = collection("admin.users", Schema.String);
10
12
 
11
13
  export const UsersList = Schema.Struct({ ...UserList.fields, canChangeRoles: Schema.Boolean });
12
- export const UsersPage = adminPage({
13
- contract: contract("admin.users", {
14
- commands: [
15
- command("changeRole", {
16
- invalidates: () => [users.list],
17
- payload: ChangeRoleInput.fields,
18
- rejections: { AuthUnavailable, Forbidden, LastOwner, NotFound },
19
- }),
20
- ],
21
- queries: [
22
- query("list", {
23
- payload: UserListInput.fields,
24
- reads: () => [users.list],
25
- rejections: { AuthUnavailable },
26
- success: UsersList,
27
- }),
28
- ],
29
- }),
30
- id: "users",
31
- route: { path: "/admin/users", title: "Users" },
32
- });
14
+ export function usersPage<const TRole extends string>(access: Pick<ReturnType<typeof roleSet<TRole>>, "Role">) {
15
+ return adminPage({
16
+ contract: contract("admin.users", {
17
+ commands: [
18
+ command("changeRole", {
19
+ invalidates: () => [users.list],
20
+ payload: { role: access.Role, userId: Schema.String },
21
+ rejections: { AuthUnavailable, Forbidden, LastRoleAssigner, NotFound },
22
+ }),
23
+ ],
24
+ queries: [
25
+ query("list", {
26
+ payload: UserListInput.fields,
27
+ reads: () => [users.list],
28
+ rejections: { AuthUnavailable, Forbidden },
29
+ success: UsersList,
30
+ }),
31
+ ],
32
+ }),
33
+ id: "users",
34
+ permission: UsersPermission,
35
+ route: { path: "/admin/users", title: "Users" },
36
+ });
37
+ }
@@ -0,0 +1,20 @@
1
+ import { Schema } from "effect";
2
+
3
+ export const AppUser = Schema.Struct({
4
+ createdAt: Schema.DateTimeUtcFromString,
5
+ email: Schema.String,
6
+ id: Schema.String,
7
+ name: Schema.String,
8
+ role: Schema.String,
9
+ });
10
+
11
+ export const UserListInput = Schema.Struct({
12
+ cursor: Schema.optionalKey(Schema.String),
13
+ limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
14
+ });
15
+ export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(AppUser) });
16
+ export interface ChangeRoleInput<TRole extends string = string> {
17
+ readonly role: TRole;
18
+ readonly userId: string;
19
+ }
20
+ export class LastRoleAssigner extends Schema.TaggedError<LastRoleAssigner>()("LastRoleAssigner", { userId: Schema.String }) {}