@shivaedev/identity 0.8.0 → 0.9.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. package/README.md +24 -0
  2. package/dist/server/better-auth/assignRole.d.ts +7 -0
  3. package/dist/server/better-auth/assignRole.d.ts.map +1 -0
  4. package/dist/server/better-auth/assignRole.js +42 -0
  5. package/dist/server/better-auth/assignRole.js.map +1 -0
  6. package/dist/server/better-auth/closeRoleEndpoints.d.ts +3 -0
  7. package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +1 -0
  8. package/dist/server/better-auth/closeRoleEndpoints.js +9 -0
  9. package/dist/server/better-auth/closeRoleEndpoints.js.map +1 -0
  10. package/dist/server/better-auth/mount.d.ts.map +1 -1
  11. package/dist/server/better-auth/mount.js +3 -1
  12. package/dist/server/better-auth/mount.js.map +1 -1
  13. package/dist/server/better-auth/sessionAdministration.d.ts +29 -0
  14. package/dist/server/better-auth/sessionAdministration.d.ts.map +1 -0
  15. package/dist/server/better-auth/sessionAdministration.js +43 -0
  16. package/dist/server/better-auth/sessionAdministration.js.map +1 -0
  17. package/dist/server/better-auth/sessionsHandlers.d.ts +2 -0
  18. package/dist/server/better-auth/sessionsHandlers.d.ts.map +1 -0
  19. package/dist/server/better-auth/sessionsHandlers.js +7 -0
  20. package/dist/server/better-auth/sessionsHandlers.js.map +1 -0
  21. package/dist/sessionPermissions.d.ts +18 -0
  22. package/dist/sessionPermissions.d.ts.map +1 -0
  23. package/dist/sessionPermissions.js +6 -0
  24. package/dist/sessionPermissions.js.map +1 -0
  25. package/dist/sessions.d.ts +128 -0
  26. package/dist/sessions.d.ts.map +1 -0
  27. package/dist/sessions.js +39 -0
  28. package/dist/sessions.js.map +1 -0
  29. package/package.json +10 -9
  30. package/src/server/better-auth/assignRole.ts +48 -0
  31. package/src/server/better-auth/closeRoleEndpoints.ts +10 -0
  32. package/src/server/better-auth/mount.ts +3 -1
  33. package/src/server/better-auth/sessionAdministration.ts +48 -0
  34. package/src/server/better-auth/sessionsHandlers.ts +7 -0
  35. package/src/sessionPermissions.ts +5 -0
  36. package/src/sessions.ts +42 -0
package/README.md CHANGED
@@ -118,6 +118,30 @@ The mount reads `BETTER_AUTH_SECRET` unless options supply `secret`. `PUBLIC_URL
118
118
 
119
119
  For email sign-in through `appHost`, the session record's `ipAddress` follows the same rule. With a trusted peer, `AUTH_CLIENT_IP_HEADER=x-real-ip` stores `X-Real-IP` even if `X-Forwarded-For` supplies a different address; the default header selects the rightmost untrusted address in the `X-Forwarded-For` chain, ignoring trusted proxy hops on the right. With an untrusted peer, neither header can supply the stored address. Sign-in attempts from an untrusted peer share one bucket per path; with a trusted peer and `x-real-ip`, changing `X-Forwarded-For` does not change the bucket, while changing `X-Real-IP` does.
120
120
 
121
+ ### Role assignments
122
+
123
+ Pass `{ roles: AppAccess }` as the second argument to `betterAuthMount`. Identity adds `/admin/set-role`, `/admin/update-user` and `/admin/create-user` to the disabled HTTP paths and sets the Better Auth admin plugin's `adminRoles` to `[]`. Existing disabled paths remain in effect. The admin Users page remains the application path for role changes.
124
+
125
+ Seeds and trusted operator commands use the same transactional write and last-role-assigner guard as the Users page:
126
+
127
+ ```ts
128
+ import { assignRole } from "@shivaedev/identity/server/better-auth/assignRole.ts";
129
+
130
+ yield* assignRole(AppAccess, userId, "owner");
131
+ ```
132
+
133
+ Supply the application's `SqlClient` and `Reactivity` Layers. This trusted server verb has no caller authorization check; authorize operator access before calling it. It returns whether the role changed, fails with `NotFound` for a missing user, and refuses to remove the final holder of `AssignRoles` (`roles.assign`) with `LastRoleAssigner`. Both declarations live in `@shivaedev/access/roles.ts`. Writes serialize through the same PostgreSQL transaction lock and invalidate the Users list after commit. The Users page adds its caller permission check and audit log.
134
+
135
+ ### Administer signed-in sessions
136
+
137
+ Merge `Sessions` from `@shivaedev/identity/sessions.ts` into the application's RPC group and provide `sessionsHandlers` from `@shivaedev/identity/server/better-auth/sessionsHandlers.ts`. Install `permissionLayer(SessionsPermission, sessions)` using `SessionsPermission` from `@shivaedev/identity/sessionPermissions.ts` and the mounted session policy. Supply the application's Effect `SqlClient`; the handlers use the default Better Auth PostgreSQL user and session tables.
138
+
139
+ Grant `ManageSessions` (`sessions.manage`) from `sessionPermissions.ts` to the roles that manage sessions. The starter grants it to admin and owner. Both operations use the same permission middleware and `Forbidden` refusal as the admin Users page. They require no Better Auth admin plugin.
140
+
141
+ `identity.sessions.list({ limit, cursor? })` returns `{ sessions, next }`, where `next` is an `Option` containing the next cursor. Limits are 1–100. Pass the returned cursor unchanged to read the next page; removing an earlier session does not shift later pages. Only unexpired sessions appear, ordered by last activity descending, then session id descending. Each session has `id`, `user: { id, name, email }`, and native Effect UTC `startedAt`, `lastActivityAt` and `expiresAt` values. Last activity is the provider's stored session `updatedAt`, so its precision follows the application's Better Auth session-refresh policy. Pages read current storage rather than a frozen snapshot.
142
+
143
+ `identity.sessions.revoke({ id })` deletes just that session and returns `NotFound` when the id is unknown. Its next protected request is unauthorized, and its open live subscriptions end at the configured session revalidation interval. Other sessions for the same user continue working. This uses database-backed sessions and the same storage-removal and revalidation path as `revokeUnadmitted`; secondary session storage is outside this SQL administration path.
144
+
121
145
  ### Bundled native clients
122
146
 
123
147
  For a Capacitor or similar WebView whose page is served from the app bundle, opt in with the auth host mount's `bearerSessions` option. It installs Better Auth's own `bearer({ requireSignature: true })` plugin from the existing dependency; do not add a second bearer plugin. The option is absent by default. List only bundled-client origins here, and include them in Better Auth's `trustedOrigins` as well.
@@ -0,0 +1,7 @@
1
+ import { Effect } from "effect";
2
+ import { SqlClient } from "effect/sql";
3
+ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
4
+ import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
5
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
6
+ export declare const assignRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, userId: string, role: NoInfer<TRole>) => Effect.Effect<boolean, AuthUnavailable | LastRoleAssigner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SqlClient.SqlClient>;
7
+ //# sourceMappingURL=assignRole.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAO1E,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,sPAoCxF,CAAC"}
@@ -0,0 +1,42 @@
1
+ import { Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
4
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
5
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
6
+ function unavailable() {
7
+ return new AuthUnavailable({ message: "Could not access app users" });
8
+ }
9
+ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role) {
10
+ const sql = yield* SqlClient.SqlClient;
11
+ return yield* Effect.gen(function* () {
12
+ yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
13
+ const readTarget = SqlSchema.findOneOption({
14
+ execute: (id) => sql `select id, role from "user" where id = ${id} for update`,
15
+ Request: Schema.String,
16
+ Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
17
+ });
18
+ const target = yield* readTarget(userId).pipe(Effect.mapError(unavailable));
19
+ if (Option.isNone(target)) {
20
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
21
+ }
22
+ if (target.value.role === role) {
23
+ return false;
24
+ }
25
+ const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
26
+ if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
27
+ const readHolders = SqlSchema.findAll({
28
+ execute: () => sql `select id from "user" where role in ${sql.in(assigners)}`,
29
+ Request: Schema.Void,
30
+ Result: Schema.Struct({ id: Schema.String }),
31
+ });
32
+ const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
33
+ if (holders.length === 1) {
34
+ return yield* Effect.fail(new LastRoleAssigner({ userId }));
35
+ }
36
+ }
37
+ yield* sql `update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
38
+ yield* invalidateOnCommit(["admin.users"]);
39
+ return true;
40
+ }).pipe(transact({ onSqlError: unavailable }));
41
+ });
42
+ //# sourceMappingURL=assignRole.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,3 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ export declare function closeRoleEndpoints<TOptions extends BetterAuthOptions>(options: TOptions): TOptions;
3
+ //# sourceMappingURL=closeRoleEndpoints.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"closeRoleEndpoints.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/closeRoleEndpoints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAMlG"}
@@ -0,0 +1,9 @@
1
+ import { admin } from "better-auth/plugins/admin";
2
+ export function closeRoleEndpoints(options) {
3
+ return {
4
+ ...options,
5
+ disabledPaths: [...(options.disabledPaths ?? []), "/admin/set-role", "/admin/update-user", "/admin/create-user"],
6
+ plugins: options.plugins?.map((plugin) => (plugin.id === "admin" ? admin({ ...plugin.options, adminRoles: [] }) : plugin)),
7
+ };
8
+ }
9
+ //# sourceMappingURL=closeRoleEndpoints.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"closeRoleEndpoints.js","sourceRoot":"","sources":["../../../src/server/better-auth/closeRoleEndpoints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,MAAM,UAAU,kBAAkB,CAAqC,OAAiB;IACvF,OAAO;QACN,GAAG,OAAO;QACV,aAAa,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC;QAChH,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;KAC1H,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAmB,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAKtG,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IAC3D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD;AAED,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wDA6DpI,CAAC;AAEH,eAAO,MAAM,YAAY,kKAgCvB,CAAC"}
1
+ {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAmB,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAMtG,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IAC3D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD;AAED,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wDA8DpI,CAAC;AAEH,eAAO,MAAM,YAAY,kKAgCvB,CAAC"}
@@ -9,6 +9,7 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
9
9
  import { signInGate } from "#server/better-auth/signInGate.ts";
10
10
  import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
11
11
  import { admittedSessions } from "./admittedSessions.js";
12
+ import { closeRoleEndpoints } from "./closeRoleEndpoints.js";
12
13
  import { mountedSessions } from "./mountedSessions.js";
13
14
  export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (options, mount = {}) {
14
15
  const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
@@ -27,8 +28,9 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
27
28
  const gated = signInPolicyOptions(options, gate, run, () => auth.$context);
28
29
  const rateLimit = options.rateLimit;
29
30
  const customStorage = rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
31
+ const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
30
32
  const auth = betterAuth({
31
- ...withBearerSessions(options, mount.bearerSessions !== undefined),
33
+ ...withBearerSessions(configured, mount.bearerSessions !== undefined),
32
34
  advanced: {
33
35
  useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
34
36
  ...options.advanced,
@@ -1 +1 @@
1
- {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,29 @@
1
+ import { DateTime, Effect, Option } from "effect";
2
+ import { SqlClient } from "effect/sql";
3
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
4
+ import { SessionUser } from "#identity.ts";
5
+ export declare const listSessions: (input: {
6
+ readonly cursor?: {
7
+ readonly id: string;
8
+ readonly lastActivityAt: DateTime.Utc;
9
+ };
10
+ readonly limit: number;
11
+ }) => Effect.Effect<{
12
+ next: Option.Option<{
13
+ id: string;
14
+ lastActivityAt: DateTime.Utc;
15
+ }>;
16
+ sessions: {
17
+ readonly expiresAt: DateTime.Utc;
18
+ readonly id: string;
19
+ readonly lastActivityAt: DateTime.Utc;
20
+ readonly startedAt: DateTime.Utc;
21
+ readonly user: {
22
+ readonly email: string;
23
+ readonly id: string;
24
+ readonly name: string;
25
+ };
26
+ }[];
27
+ }, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden, SessionUser | SqlClient.SqlClient>;
28
+ export declare const revokeSession: (id: string) => Effect.Effect<undefined, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | NotFound, SessionUser | SqlClient.SqlClient>;
29
+ //# sourceMappingURL=sessionAdministration.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessionAdministration.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAQ3C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;0GAqBvB,CAAC;AAEH,eAAO,MAAM,aAAa,6JAYxB,CAAC"}
@@ -0,0 +1,43 @@
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { requirePermission } from "@shivaedev/access/requirePermission.ts";
4
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
5
+ import { SessionUser } from "#identity.ts";
6
+ import { ManageSessions } from "#sessionPermissions.ts";
7
+ import { SignedInSession } from "#sessions.ts";
8
+ function unavailable() {
9
+ return new AuthUnavailable({ message: "Could not access signed-in sessions" });
10
+ }
11
+ export const listSessions = Effect.fn("Identity.listSessions")(function* (input) {
12
+ yield* requirePermission(yield* SessionUser, ManageSessions);
13
+ const sql = yield* SqlClient.SqlClient;
14
+ const cursor = input.cursor;
15
+ const before = cursor === undefined ? sql `true` : sql `(s."updatedAt", s.id) < (${DateTime.toDateUtc(cursor.lastActivityAt)}, ${cursor.id})`;
16
+ const read = SqlSchema.findAll({
17
+ execute: () => sql `select s.id, s."createdAt" as "startedAt", s."updatedAt" as "lastActivityAt", s."expiresAt",
18
+ json_build_object('id', u.id, 'name', u.name, 'email', u.email) as "user"
19
+ from "session" s join "user" u on u.id = s."userId"
20
+ where s."expiresAt" > now() and ${before}
21
+ order by s."updatedAt" desc, s.id desc limit ${input.limit + 1}`,
22
+ Request: Schema.Void,
23
+ Result: SignedInSession,
24
+ });
25
+ const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
26
+ const sessions = rows.slice(0, input.limit);
27
+ const next = Option.fromUndefinedOr(sessions.at(-1)).pipe(Option.filter(() => rows.length > input.limit), Option.map(({ id, lastActivityAt }) => ({ id, lastActivityAt })));
28
+ return { next, sessions };
29
+ });
30
+ export const revokeSession = Effect.fn("Identity.revokeSession")(function* (id) {
31
+ yield* requirePermission(yield* SessionUser, ManageSessions);
32
+ const sql = yield* SqlClient.SqlClient;
33
+ const remove = SqlSchema.findOneOption({
34
+ execute: (sessionId) => sql `delete from "session" where id = ${sessionId} returning id`,
35
+ Request: Schema.String,
36
+ Result: Schema.Struct({ id: Schema.String }),
37
+ });
38
+ const removed = yield* remove(id).pipe(Effect.mapError(unavailable));
39
+ if (Option.isNone(removed)) {
40
+ return yield* new NotFound({ message: "Session not found" });
41
+ }
42
+ });
43
+ //# sourceMappingURL=sessionAdministration.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessionAdministration.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export declare const sessionsHandlers: import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"identity.sessions.list"> | import("effect/rpc/Rpc").Handler<"identity.sessions.revoke">, never, import("effect/sql/SqlClient").SqlClient>;
2
+ //# sourceMappingURL=sessionsHandlers.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessionsHandlers.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionsHandlers.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,0MAG3B,CAAC"}
@@ -0,0 +1,7 @@
1
+ import { Sessions } from "#sessions.ts";
2
+ import { listSessions, revokeSession } from "./sessionAdministration.js";
3
+ export const sessionsHandlers = Sessions.application.toLayer({
4
+ "identity.sessions.list": listSessions,
5
+ "identity.sessions.revoke": ({ id }) => revokeSession(id),
6
+ });
7
+ //# sourceMappingURL=sessionsHandlers.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessionsHandlers.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAEzE,MAAM,CAAC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;IAC5D,wBAAwB,EAAE,YAAY;IACtC,0BAA0B,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,CAAC;CACzD,CAAC,CAAC"}
@@ -0,0 +1,18 @@
1
+ export declare const ManageSessions: {
2
+ readonly any: {
3
+ readonly name: "sessions.manage";
4
+ readonly strength: "any";
5
+ };
6
+ readonly name: "sessions.manage";
7
+ readonly strength: "own";
8
+ };
9
+ declare const SessionsPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<SessionsPermission, "@shivaedev/identity/SessionsPermission", import("./identity.ts").Identity | import("./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, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, never, never, false> & {
10
+ permission: {
11
+ readonly name: string;
12
+ readonly strength: "any" | "own";
13
+ };
14
+ };
15
+ export declare class SessionsPermission extends SessionsPermission_base {
16
+ }
17
+ export {};
18
+ //# sourceMappingURL=sessionPermissions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessionPermissions.d.ts","sourceRoot":"","sources":["../src/sessionPermissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,cAAc;;;;;;;CAAgC,CAAC;;;;;;;AAC5D,qBAAa,kBAAmB,SAAQ,uBAAoG;CAAG"}
@@ -0,0 +1,6 @@
1
+ import { permission } from "@shivaedev/access/permission.ts";
2
+ import { permissionMiddleware } from "#permission.ts";
3
+ export const ManageSessions = permission("sessions.manage");
4
+ export class SessionsPermission extends permissionMiddleware()("@shivaedev/identity/SessionsPermission", ManageSessions) {
5
+ }
6
+ //# sourceMappingURL=sessionPermissions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessionPermissions.js","sourceRoot":"","sources":["../src/sessionPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAEtD,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,iBAAiB,CAAC,CAAC;AAC5D,MAAM,OAAO,kBAAmB,SAAQ,oBAAoB,EAAsB,CAAC,wCAAwC,EAAE,cAAc,CAAC;CAAG"}
@@ -0,0 +1,128 @@
1
+ import { Schema } from "effect";
2
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
3
+ import { SessionsPermission } from "#sessionPermissions.ts";
4
+ export declare const SignedInSession: Schema.Struct<{
5
+ readonly expiresAt: Schema.DateTimeUtcFromDate;
6
+ readonly id: Schema.String;
7
+ readonly lastActivityAt: Schema.DateTimeUtcFromDate;
8
+ readonly startedAt: Schema.DateTimeUtcFromDate;
9
+ readonly user: Schema.Struct<{
10
+ readonly email: Schema.String;
11
+ readonly id: Schema.String;
12
+ readonly name: Schema.String;
13
+ }>;
14
+ }>;
15
+ export declare const SessionCursor: Schema.Struct<{
16
+ readonly id: Schema.String;
17
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
18
+ }>;
19
+ export declare const SessionListInput: Schema.Struct<{
20
+ readonly cursor: Schema.optionalKey<Schema.Struct<{
21
+ readonly id: Schema.String;
22
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
23
+ }>>;
24
+ readonly limit: Schema.Number;
25
+ }>;
26
+ export declare const SessionList: Schema.Struct<{
27
+ readonly next: Schema.OptionFromNullOr<Schema.Struct<{
28
+ readonly id: Schema.String;
29
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
30
+ }>>;
31
+ readonly sessions: Schema.$Array<Schema.Struct<{
32
+ readonly expiresAt: Schema.DateTimeUtcFromDate;
33
+ readonly id: Schema.String;
34
+ readonly lastActivityAt: Schema.DateTimeUtcFromDate;
35
+ readonly startedAt: Schema.DateTimeUtcFromDate;
36
+ readonly user: Schema.Struct<{
37
+ readonly email: Schema.String;
38
+ readonly id: Schema.String;
39
+ readonly name: Schema.String;
40
+ }>;
41
+ }>>;
42
+ }>;
43
+ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contract<"identity.sessions", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"list", Schema.Struct<{
44
+ readonly cursor: Schema.optionalKey<Schema.Struct<{
45
+ readonly id: Schema.String;
46
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
47
+ }>>;
48
+ readonly limit: Schema.Number;
49
+ }>, Schema.Struct<{
50
+ readonly next: Schema.OptionFromNullOr<Schema.Struct<{
51
+ readonly id: Schema.String;
52
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
53
+ }>>;
54
+ readonly sessions: Schema.$Array<Schema.Struct<{
55
+ readonly expiresAt: Schema.DateTimeUtcFromDate;
56
+ readonly id: Schema.String;
57
+ readonly lastActivityAt: Schema.DateTimeUtcFromDate;
58
+ readonly startedAt: Schema.DateTimeUtcFromDate;
59
+ readonly user: Schema.Struct<{
60
+ readonly email: Schema.String;
61
+ readonly id: Schema.String;
62
+ readonly name: Schema.String;
63
+ }>;
64
+ }>>;
65
+ }>, {
66
+ readonly AuthUnavailable: typeof AuthUnavailable;
67
+ readonly Forbidden: typeof Forbidden;
68
+ }, never, undefined>>], readonly [NoInfer<import("@shivaedev/contract/operation.ts").Command<"revoke", Schema.Struct<{
69
+ id: Schema.String;
70
+ }>, Schema.Void, {
71
+ readonly AuthUnavailable: typeof AuthUnavailable;
72
+ readonly Forbidden: typeof Forbidden;
73
+ readonly NotFound: typeof NotFound;
74
+ }>>], import("effect/rpc/Rpc").Rpc<"identity.sessions.$changes", Schema.Struct<{
75
+ queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
76
+ query: Schema.Literal<"list">;
77
+ payload: Schema.Struct<{
78
+ readonly cursor: Schema.optionalKey<Schema.Struct<{
79
+ readonly id: Schema.String;
80
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
81
+ }>>;
82
+ readonly limit: Schema.Number;
83
+ }>;
84
+ }>[]>>;
85
+ }>, import("effect/rpc/RpcSchema").Stream<Schema.Union<readonly [Schema.Union<readonly [Schema.Struct<{
86
+ readonly _tag: Schema.Literal<"Changed">;
87
+ readonly keys: Schema.$Array<Schema.Union<readonly [Schema.Struct<{
88
+ readonly _tag: Schema.Literal<"Bucket">;
89
+ readonly collection: Schema.String;
90
+ readonly field: Schema.String;
91
+ readonly value: Schema.Union<readonly [Schema.String, Schema.Number]>;
92
+ }>, Schema.Struct<{
93
+ readonly _tag: Schema.Literal<"List">;
94
+ readonly collection: Schema.String;
95
+ }>, Schema.Struct<{
96
+ readonly _tag: Schema.Literal<"Item">;
97
+ readonly collection: Schema.String;
98
+ readonly id: Schema.Union<readonly [Schema.String, Schema.Number]>;
99
+ }>]>>;
100
+ readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
101
+ }>, Schema.Struct<{
102
+ readonly _tag: Schema.Literal<"Resync">;
103
+ }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
104
+ readonly cursor: Schema.optionalKey<Schema.Struct<{
105
+ readonly id: Schema.String;
106
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
107
+ }>>;
108
+ readonly limit: Schema.Number;
109
+ }>, Schema.Struct<{
110
+ readonly next: Schema.OptionFromNullOr<Schema.Struct<{
111
+ readonly id: Schema.String;
112
+ readonly lastActivityAt: Schema.DateTimeUtcFromString;
113
+ }>>;
114
+ readonly sessions: Schema.$Array<Schema.Struct<{
115
+ readonly expiresAt: Schema.DateTimeUtcFromDate;
116
+ readonly id: Schema.String;
117
+ readonly lastActivityAt: Schema.DateTimeUtcFromDate;
118
+ readonly startedAt: Schema.DateTimeUtcFromDate;
119
+ readonly user: Schema.Struct<{
120
+ readonly email: Schema.String;
121
+ readonly id: Schema.String;
122
+ readonly name: Schema.String;
123
+ }>;
124
+ }>>;
125
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", Schema.Struct<{
126
+ id: Schema.String;
127
+ }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never>, readonly [], undefined>;
128
+ //# sourceMappingURL=sessions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mKAiBY,CAAC"}
@@ -0,0 +1,39 @@
1
+ import { Effect, Schema } from "effect";
2
+ import { collection } from "@shivaedev/changes/keys.ts";
3
+ import { contract } from "@shivaedev/contract/contract.ts";
4
+ import { command, query } from "@shivaedev/contract/operation.ts";
5
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
6
+ import { SessionsPermission } from "#sessionPermissions.ts";
7
+ const sessions = collection("identity.sessions", Schema.String);
8
+ export const SignedInSession = Schema.Struct({
9
+ expiresAt: Schema.DateTimeUtcFromDate,
10
+ id: Schema.String,
11
+ lastActivityAt: Schema.DateTimeUtcFromDate,
12
+ startedAt: Schema.DateTimeUtcFromDate,
13
+ user: Schema.Struct({ email: Schema.String, id: Schema.String, name: Schema.String }),
14
+ });
15
+ export const SessionCursor = Schema.Struct({ id: Schema.String, lastActivityAt: Schema.DateTimeUtcFromString });
16
+ export const SessionListInput = Schema.Struct({
17
+ cursor: Schema.optionalKey(SessionCursor),
18
+ limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
19
+ });
20
+ export const SessionList = Schema.Struct({ next: Schema.OptionFromNullOr(SessionCursor), sessions: Schema.Array(SignedInSession) });
21
+ export const Sessions = contract("identity.sessions", {
22
+ commands: [
23
+ command("revoke", {
24
+ invalidates: () => [sessions.list],
25
+ payload: { id: Schema.String },
26
+ rejections: { AuthUnavailable, Forbidden, NotFound },
27
+ }),
28
+ ],
29
+ queries: [
30
+ query("list", {
31
+ payload: SessionListInput.fields,
32
+ readPolicy: () => Effect.succeed(true),
33
+ reads: () => [sessions.list],
34
+ rejections: { AuthUnavailable, Forbidden },
35
+ success: SessionList,
36
+ }),
37
+ ],
38
+ }).middleware(SessionsPermission);
39
+ //# sourceMappingURL=sessions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"sessions.js","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,MAAM,QAAQ,GAAG,UAAU,CAAC,mBAAmB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEhE,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5C,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,cAAc,EAAE,MAAM,CAAC,mBAAmB;IAC1C,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CACrF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,qBAAqB,EAAE,CAAC,CAAC;AAChH,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC7C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,aAAa,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,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;AAEpI,MAAM,CAAC,MAAM,QAAQ,GAAG,QAAQ,CAAC,mBAAmB,EAAE;IACrD,QAAQ,EAAE;QACT,OAAO,CAAC,QAAQ,EAAE;YACjB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAClC,OAAO,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE;YAC9B,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE;SACpD,CAAC;KACF;IACD,OAAO,EAAE;QACR,KAAK,CAAC,MAAM,EAAE;YACb,OAAO,EAAE,gBAAgB,CAAC,MAAM;YAChC,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;YACtC,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC5B,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;YAC1C,OAAO,EAAE,WAAW;SACpB,CAAC;KACF;CACD,CAAC,CAAC,UAAU,CAAC,kBAAkB,CAAC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/identity",
3
- "version": "0.8.0",
3
+ "version": "0.9.1",
4
4
  "description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
5
5
  "keywords": [
6
6
  "effect"
@@ -44,20 +44,21 @@
44
44
  "README.md"
45
45
  ],
46
46
  "dependencies": {
47
- "@shivaedev/access": "0.2.0",
48
- "@shivaedev/changes": "0.5.1",
49
- "@shivaedev/contract": "0.24.0",
47
+ "@shivaedev/access": "0.3.0",
48
+ "@shivaedev/changes": "0.6.0",
49
+ "@shivaedev/contract": "0.25.0",
50
50
  "@shivaedev/errors": "0.1.2",
51
- "@shivaedev/sql": "0.26.1"
51
+ "@shivaedev/sql": "0.27.0"
52
52
  },
53
53
  "devDependencies": {
54
54
  "@effect/platform-node": "4.0.6",
55
55
  "@effect/sql-pg": "4.0.6",
56
- "@shivaedev/quality": "0.47.0",
57
- "@shivaedev/server": "0.9.0",
56
+ "@shivaedev/admin": "0.12.1",
57
+ "@shivaedev/quality": "0.48.1",
58
+ "@shivaedev/server": "0.9.2",
58
59
  "@shivaedev/test": "0.12.0",
59
- "@shivaedev/test-sql": "0.14.0",
60
- "@shivaedev/test-story": "0.26.1",
60
+ "@shivaedev/test-sql": "0.15.0",
61
+ "@shivaedev/test-story": "0.26.3",
61
62
  "@types/node": "24.19.2",
62
63
  "@types/pg": "8.20.0",
63
64
  "better-auth": "1.7.12",
@@ -0,0 +1,48 @@
1
+ import { Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
4
+ import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
5
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
6
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
7
+
8
+ function unavailable() {
9
+ return new AuthUnavailable({ message: "Could not access app users" });
10
+ }
11
+
12
+ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole extends string>(
13
+ access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
14
+ userId: string,
15
+ role: NoInfer<TRole>,
16
+ ) {
17
+ const sql = yield* SqlClient.SqlClient;
18
+ return yield* Effect.gen(function* () {
19
+ yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
20
+ const readTarget = SqlSchema.findOneOption({
21
+ execute: (id) => sql`select id, role from "user" where id = ${id} for update`,
22
+ Request: Schema.String,
23
+ Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
24
+ });
25
+ const target = yield* readTarget(userId).pipe(Effect.mapError(unavailable));
26
+ if (Option.isNone(target)) {
27
+ return yield* Effect.fail(new NotFound({ message: "User not found" }));
28
+ }
29
+ if (target.value.role === role) {
30
+ return false;
31
+ }
32
+ const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
33
+ if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
34
+ const readHolders = SqlSchema.findAll({
35
+ execute: () => sql`select id from "user" where role in ${sql.in(assigners)}`,
36
+ Request: Schema.Void,
37
+ Result: Schema.Struct({ id: Schema.String }),
38
+ });
39
+ const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
40
+ if (holders.length === 1) {
41
+ return yield* Effect.fail(new LastRoleAssigner({ userId }));
42
+ }
43
+ }
44
+ yield* sql`update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
45
+ yield* invalidateOnCommit(["admin.users"]);
46
+ return true;
47
+ }).pipe(transact({ onSqlError: unavailable }));
48
+ });
@@ -0,0 +1,10 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { admin } from "better-auth/plugins/admin";
3
+
4
+ export function closeRoleEndpoints<TOptions extends BetterAuthOptions>(options: TOptions): TOptions {
5
+ return {
6
+ ...options,
7
+ disabledPaths: [...(options.disabledPaths ?? []), "/admin/set-role", "/admin/update-user", "/admin/create-user"],
8
+ plugins: options.plugins?.map((plugin) => (plugin.id === "admin" ? admin({ ...plugin.options, adminRoles: [] }) : plugin)),
9
+ };
10
+ }
@@ -10,6 +10,7 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
10
10
  import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
11
11
  import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
12
12
  import { admittedSessions } from "./admittedSessions.ts";
13
+ import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
13
14
  import { mountedSessions } from "./mountedSessions.ts";
14
15
 
15
16
  export interface BetterAuthMountOptions<E = never, R = never> {
@@ -39,8 +40,9 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
39
40
  const rateLimit = options.rateLimit;
40
41
  const customStorage =
41
42
  rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
43
+ const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
42
44
  const auth = betterAuth({
43
- ...withBearerSessions(options, mount.bearerSessions !== undefined),
45
+ ...withBearerSessions(configured, mount.bearerSessions !== undefined),
44
46
  advanced: {
45
47
  useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
46
48
  ...options.advanced,
@@ -0,0 +1,48 @@
1
+ import { DateTime, Effect, Option, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { requirePermission } from "@shivaedev/access/requirePermission.ts";
4
+ import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
5
+ import { SessionUser } from "#identity.ts";
6
+ import { ManageSessions } from "#sessionPermissions.ts";
7
+ import { type SessionListInput, SignedInSession } from "#sessions.ts";
8
+
9
+ function unavailable() {
10
+ return new AuthUnavailable({ message: "Could not access signed-in sessions" });
11
+ }
12
+
13
+ export const listSessions = Effect.fn("Identity.listSessions")(function* (input: typeof SessionListInput.Type) {
14
+ yield* requirePermission(yield* SessionUser, ManageSessions);
15
+ const sql = yield* SqlClient.SqlClient;
16
+ const cursor = input.cursor;
17
+ const before = cursor === undefined ? sql`true` : sql`(s."updatedAt", s.id) < (${DateTime.toDateUtc(cursor.lastActivityAt)}, ${cursor.id})`;
18
+ const read = SqlSchema.findAll({
19
+ execute: () => sql`select s.id, s."createdAt" as "startedAt", s."updatedAt" as "lastActivityAt", s."expiresAt",
20
+ json_build_object('id', u.id, 'name', u.name, 'email', u.email) as "user"
21
+ from "session" s join "user" u on u.id = s."userId"
22
+ where s."expiresAt" > now() and ${before}
23
+ order by s."updatedAt" desc, s.id desc limit ${input.limit + 1}`,
24
+ Request: Schema.Void,
25
+ Result: SignedInSession,
26
+ });
27
+ const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
28
+ const sessions = rows.slice(0, input.limit);
29
+ const next = Option.fromUndefinedOr(sessions.at(-1)).pipe(
30
+ Option.filter(() => rows.length > input.limit),
31
+ Option.map(({ id, lastActivityAt }) => ({ id, lastActivityAt })),
32
+ );
33
+ return { next, sessions };
34
+ });
35
+
36
+ export const revokeSession = Effect.fn("Identity.revokeSession")(function* (id: string) {
37
+ yield* requirePermission(yield* SessionUser, ManageSessions);
38
+ const sql = yield* SqlClient.SqlClient;
39
+ const remove = SqlSchema.findOneOption({
40
+ execute: (sessionId) => sql`delete from "session" where id = ${sessionId} returning id`,
41
+ Request: Schema.String,
42
+ Result: Schema.Struct({ id: Schema.String }),
43
+ });
44
+ const removed = yield* remove(id).pipe(Effect.mapError(unavailable));
45
+ if (Option.isNone(removed)) {
46
+ return yield* new NotFound({ message: "Session not found" });
47
+ }
48
+ });
@@ -0,0 +1,7 @@
1
+ import { Sessions } from "#sessions.ts";
2
+ import { listSessions, revokeSession } from "./sessionAdministration.ts";
3
+
4
+ export const sessionsHandlers = Sessions.application.toLayer({
5
+ "identity.sessions.list": listSessions,
6
+ "identity.sessions.revoke": ({ id }) => revokeSession(id),
7
+ });
@@ -0,0 +1,5 @@
1
+ import { permission } from "@shivaedev/access/permission.ts";
2
+ import { permissionMiddleware } from "#permission.ts";
3
+
4
+ export const ManageSessions = permission("sessions.manage");
5
+ export class SessionsPermission extends permissionMiddleware<SessionsPermission>()("@shivaedev/identity/SessionsPermission", ManageSessions) {}
@@ -0,0 +1,42 @@
1
+ import { Effect, Schema } from "effect";
2
+ import { collection } from "@shivaedev/changes/keys.ts";
3
+ import { contract } from "@shivaedev/contract/contract.ts";
4
+ import { command, query } from "@shivaedev/contract/operation.ts";
5
+ import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
6
+ import { SessionsPermission } from "#sessionPermissions.ts";
7
+
8
+ const sessions = collection("identity.sessions", Schema.String);
9
+
10
+ export const SignedInSession = Schema.Struct({
11
+ expiresAt: Schema.DateTimeUtcFromDate,
12
+ id: Schema.String,
13
+ lastActivityAt: Schema.DateTimeUtcFromDate,
14
+ startedAt: Schema.DateTimeUtcFromDate,
15
+ user: Schema.Struct({ email: Schema.String, id: Schema.String, name: Schema.String }),
16
+ });
17
+
18
+ export const SessionCursor = Schema.Struct({ id: Schema.String, lastActivityAt: Schema.DateTimeUtcFromString });
19
+ export const SessionListInput = Schema.Struct({
20
+ cursor: Schema.optionalKey(SessionCursor),
21
+ limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
22
+ });
23
+ export const SessionList = Schema.Struct({ next: Schema.OptionFromNullOr(SessionCursor), sessions: Schema.Array(SignedInSession) });
24
+
25
+ export const Sessions = contract("identity.sessions", {
26
+ commands: [
27
+ command("revoke", {
28
+ invalidates: () => [sessions.list],
29
+ payload: { id: Schema.String },
30
+ rejections: { AuthUnavailable, Forbidden, NotFound },
31
+ }),
32
+ ],
33
+ queries: [
34
+ query("list", {
35
+ payload: SessionListInput.fields,
36
+ readPolicy: () => Effect.succeed(true),
37
+ reads: () => [sessions.list],
38
+ rejections: { AuthUnavailable, Forbidden },
39
+ success: SessionList,
40
+ }),
41
+ ],
42
+ }).middleware(SessionsPermission);