@shivaedev/identity 0.11.1 → 0.13.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 (84) hide show
  1. package/CHANGELOG.md +49 -0
  2. package/README.md +100 -9
  3. package/dist/server/better-auth/accountRoleSeed.d.ts +12 -0
  4. package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -0
  5. package/dist/server/better-auth/accountRoleSeed.js +28 -0
  6. package/dist/server/better-auth/accountRoleSeed.js.map +1 -0
  7. package/dist/server/better-auth/adapters/roleSeedOptions.d.ts +4 -0
  8. package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -0
  9. package/dist/server/better-auth/adapters/roleSeedOptions.js +34 -0
  10. package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -0
  11. package/dist/server/better-auth/adapters/storedRoleOptions.d.ts +6 -0
  12. package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -0
  13. package/dist/server/better-auth/adapters/storedRoleOptions.js +16 -0
  14. package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -0
  15. package/dist/server/better-auth/allowedAccounts.d.ts +4 -0
  16. package/dist/server/better-auth/allowedAccounts.d.ts.map +1 -1
  17. package/dist/server/better-auth/allowedAccounts.js +2 -1
  18. package/dist/server/better-auth/allowedAccounts.js.map +1 -1
  19. package/dist/server/better-auth/assertSchema.d.ts +12 -0
  20. package/dist/server/better-auth/assertSchema.d.ts.map +1 -0
  21. package/dist/server/better-auth/assertSchema.js +19 -0
  22. package/dist/server/better-auth/assertSchema.js.map +1 -0
  23. package/dist/server/better-auth/assignRole.d.ts +1 -1
  24. package/dist/server/better-auth/assignRole.d.ts.map +1 -1
  25. package/dist/server/better-auth/assignRole.js +4 -1
  26. package/dist/server/better-auth/assignRole.js.map +1 -1
  27. package/dist/server/better-auth/columnDrift.d.ts +6 -0
  28. package/dist/server/better-auth/columnDrift.d.ts.map +1 -0
  29. package/dist/server/better-auth/columnDrift.js +54 -0
  30. package/dist/server/better-auth/columnDrift.js.map +1 -0
  31. package/dist/server/better-auth/migrate.d.ts +6 -0
  32. package/dist/server/better-auth/migrate.d.ts.map +1 -0
  33. package/dist/server/better-auth/migrate.js +9 -0
  34. package/dist/server/better-auth/migrate.js.map +1 -0
  35. package/dist/server/better-auth/migrationPlan.d.ts +12 -0
  36. package/dist/server/better-auth/migrationPlan.d.ts.map +1 -0
  37. package/dist/server/better-auth/migrationPlan.js +37 -0
  38. package/dist/server/better-auth/migrationPlan.js.map +1 -0
  39. package/dist/server/better-auth/migrations/generate.d.ts +5 -0
  40. package/dist/server/better-auth/migrations/generate.d.ts.map +1 -0
  41. package/dist/server/better-auth/migrations/generate.js +8 -0
  42. package/dist/server/better-auth/migrations/generate.js.map +1 -0
  43. package/dist/server/better-auth/mount.d.ts +11 -4
  44. package/dist/server/better-auth/mount.d.ts.map +1 -1
  45. package/dist/server/better-auth/mount.js +8 -4
  46. package/dist/server/better-auth/mount.js.map +1 -1
  47. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
  48. package/dist/server/better-auth/mountRoutes.js +1 -1
  49. package/dist/server/better-auth/mountRoutes.js.map +1 -1
  50. package/dist/server/better-auth/sessionPermissions.d.ts +2 -1
  51. package/dist/server/better-auth/sessionPermissions.d.ts.map +1 -1
  52. package/dist/server/better-auth/sessionPermissions.js.map +1 -1
  53. package/dist/server/better-auth/testDatabase.d.ts +11 -0
  54. package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
  55. package/dist/server/better-auth/testDatabase.js +10 -0
  56. package/dist/server/better-auth/testDatabase.js.map +1 -1
  57. package/dist/server/lookupSession.d.ts +2 -2
  58. package/dist/server/lookupSession.d.ts.map +1 -1
  59. package/dist/server/permissions.d.ts +6 -3
  60. package/dist/server/permissions.d.ts.map +1 -1
  61. package/dist/server/permissions.js.map +1 -1
  62. package/dist/server/resolveRole.d.ts +2 -1
  63. package/dist/server/resolveRole.d.ts.map +1 -1
  64. package/dist/server/resolveRole.js +4 -0
  65. package/dist/server/resolveRole.js.map +1 -1
  66. package/dist/sessions.d.ts +4 -4
  67. package/dist/sessions.d.ts.map +1 -1
  68. package/package.json +10 -10
  69. package/src/server/better-auth/accountRoleSeed.ts +40 -0
  70. package/src/server/better-auth/adapters/roleSeedOptions.ts +39 -0
  71. package/src/server/better-auth/adapters/storedRoleOptions.ts +21 -0
  72. package/src/server/better-auth/allowedAccounts.ts +4 -2
  73. package/src/server/better-auth/assertSchema.ts +24 -0
  74. package/src/server/better-auth/assignRole.ts +4 -1
  75. package/src/server/better-auth/columnDrift.ts +67 -0
  76. package/src/server/better-auth/migrate.ts +14 -0
  77. package/src/server/better-auth/migrationPlan.ts +43 -0
  78. package/src/server/better-auth/migrations/generate.ts +13 -0
  79. package/src/server/better-auth/mount.ts +14 -7
  80. package/src/server/better-auth/mountRoutes.ts +8 -1
  81. package/src/server/better-auth/sessionPermissions.ts +2 -1
  82. package/src/server/better-auth/testDatabase.ts +11 -0
  83. package/src/server/permissions.ts +5 -3
  84. package/src/server/resolveRole.ts +9 -0
@@ -0,0 +1,39 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { APIError } from "better-auth/api";
3
+ import { Effect, Exit } from "effect";
4
+ import { redact } from "@shivaedev/errors/redact.ts";
5
+ import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
6
+
7
+ export function roleSeedOptions<E>(options: BetterAuthOptions, seed: AccountRoleSeed<E> | undefined): BetterAuthOptions {
8
+ if (seed === undefined) {
9
+ return options;
10
+ }
11
+ const own = options.databaseHooks?.session?.create?.before;
12
+ return {
13
+ ...options,
14
+ databaseHooks: {
15
+ ...options.databaseHooks,
16
+ session: {
17
+ ...options.databaseHooks?.session,
18
+ create: {
19
+ ...options.databaseHooks?.session?.create,
20
+ before: async (session, endpoint) => {
21
+ const result = await own?.(session, endpoint);
22
+ if (result === false) {
23
+ return result;
24
+ }
25
+ const userId = typeof result === "object" && typeof result.data.userId === "string" ? result.data.userId : session.userId;
26
+ const exit = await Effect.runPromise(
27
+ Effect.exit(seed.onSignIn(userId).pipe(Effect.tapCause((cause) => Effect.logError("Account role seed failed", redact(cause))))),
28
+ { signal: endpoint?.request?.signal },
29
+ );
30
+ if (Exit.isFailure(exit)) {
31
+ throw new APIError("SERVICE_UNAVAILABLE", { code: "role_seed_failed", message: "Sign-in is temporarily unavailable" });
32
+ }
33
+ return result;
34
+ },
35
+ },
36
+ },
37
+ },
38
+ };
39
+ }
@@ -0,0 +1,21 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+
3
+ export interface StoredRoleOptions {
4
+ readonly defaultRole: string;
5
+ }
6
+
7
+ export function storedRoleOptions<TOptions extends BetterAuthOptions>(options: TOptions, role?: StoredRoleOptions): TOptions {
8
+ if (role === undefined) {
9
+ return options;
10
+ }
11
+ return {
12
+ ...options,
13
+ user: {
14
+ ...options.user,
15
+ additionalFields: {
16
+ ...options.user?.additionalFields,
17
+ role: { defaultValue: role.defaultRole, input: false, required: true, type: "string" },
18
+ },
19
+ },
20
+ };
21
+ }
@@ -22,8 +22,8 @@ const AccountEntry = Schema.String.pipe(
22
22
  }),
23
23
  );
24
24
 
25
- export const AllowedAccounts = Schema.String.pipe(
26
- Schema.decodeTo(Schema.Array(AccountEntry).check(Schema.isMinLength(1)), {
25
+ export const ProviderAccounts = Schema.String.pipe(
26
+ Schema.decodeTo(Schema.Array(AccountEntry), {
27
27
  decode: SchemaGetter.transform((value) =>
28
28
  value
29
29
  .split(",")
@@ -34,4 +34,6 @@ export const AllowedAccounts = Schema.String.pipe(
34
34
  }),
35
35
  );
36
36
 
37
+ export const AllowedAccounts = ProviderAccounts.check(Schema.isMinLength(1));
38
+
37
39
  export const allowedAccounts = Config.schema(AllowedAccounts, "AUTH_ALLOWED_ACCOUNTS");
@@ -0,0 +1,24 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { Effect, Schema } from "effect";
3
+ import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
4
+ import { authColumnDrift } from "./columnDrift.ts";
5
+ import { betterAuthMigrationPlan } from "./migrationPlan.ts";
6
+
7
+ export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDrift>()("BetterAuthSchemaDrift", {
8
+ missing: Schema.Array(Schema.String),
9
+ }) {
10
+ override get message() {
11
+ return `Auth schema needs a new migration:\n${this.missing.join("\n")}`;
12
+ }
13
+ }
14
+
15
+ export const assertBetterAuthSchema = Effect.fn("Identity.assertBetterAuthSchema")(function* (
16
+ options: Omit<BetterAuthOptions, "database">,
17
+ role?: StoredRoleOptions,
18
+ ) {
19
+ const { missing } = yield* betterAuthMigrationPlan(options, role, { throwOnUnsafe: false });
20
+ missing.push(...(yield* authColumnDrift(storedRoleOptions(options, role), role)));
21
+ if (missing.length > 0) {
22
+ return yield* new BetterAuthSchemaDrift({ missing });
23
+ }
24
+ });
@@ -1,4 +1,5 @@
1
1
  import { Effect, Option, Schema } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
2
3
  import { SqlClient, SqlSchema } from "effect/sql";
3
4
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
4
5
  import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
@@ -15,6 +16,8 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
15
16
  role: NoInfer<TRole>,
16
17
  ) {
17
18
  const sql = yield* SqlClient.SqlClient;
19
+ const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
20
+ const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
18
21
  return yield* Effect.gen(function* () {
19
22
  yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
20
23
  const readTarget = SqlSchema.findOneOption({
@@ -44,5 +47,5 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
44
47
  yield* sql`update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
45
48
  yield* invalidateOnCommit(["admin.users"]);
46
49
  return true;
47
- }).pipe(transact({ onSqlError: unavailable }));
50
+ }).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
48
51
  });
@@ -0,0 +1,67 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { getSchema } from "better-auth/db";
3
+ import { matchType } from "better-auth/db/migration";
4
+ import { Effect, Schema } from "effect";
5
+ import { SqlClient } from "effect/sql";
6
+ import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
7
+
8
+ const Column = Schema.Struct({
9
+ column: Schema.String,
10
+ default: Schema.NullOr(Schema.String),
11
+ nullable: Schema.String,
12
+ table: Schema.String,
13
+ type: Schema.String,
14
+ });
15
+ type Column = typeof Column.Type;
16
+
17
+ function columnProblems(
18
+ table: string,
19
+ name: string,
20
+ field: ReturnType<typeof getSchema>[string]["fields"][string],
21
+ column: Column | undefined,
22
+ serialIds: boolean,
23
+ ) {
24
+ if (column === undefined) {
25
+ return [];
26
+ }
27
+ const type = (name === "id" || field.references?.field === "id") && serialIds ? "number" : field.type;
28
+ const missing: string[] = [];
29
+ if (!matchType(column.type, type, "postgres")) {
30
+ missing.push(`column ${table}.${name} requires type ${type} (found ${column.type})`);
31
+ }
32
+ if (field.required !== false && column.nullable === "YES") {
33
+ missing.push(`column ${table}.${name} requires NOT NULL`);
34
+ }
35
+ if (field.required === false && column.nullable === "NO" && column.default === null && field.defaultValue === undefined) {
36
+ missing.push(`column ${table}.${name} requires DROP NOT NULL`);
37
+ }
38
+ return missing;
39
+ }
40
+
41
+ export const authColumnDrift = Effect.fnUntraced(function* (options: BetterAuthOptions, role?: StoredRoleOptions) {
42
+ const sql = yield* SqlClient.SqlClient;
43
+ const columns = yield* sql`
44
+ select table_name as "table", column_name as "column", udt_name as type, is_nullable as nullable, column_default as "default"
45
+ from information_schema.columns where table_schema = current_schema()`.withoutTransform.pipe(
46
+ Effect.flatMap(Schema.decodeUnknownEffect(Schema.Array(Column))),
47
+ );
48
+ const missing: string[] = [];
49
+ for (const [table, schema] of Object.entries(getSchema(options))) {
50
+ if (schema.disableMigrations) {
51
+ continue;
52
+ }
53
+ for (const [name, field] of Object.entries(schema.fields)) {
54
+ const column = columns.find((value) => value.table === table && value.column === name);
55
+ missing.push(...columnProblems(table, name, field, column, options.advanced?.database?.generateId === "serial"));
56
+ }
57
+ }
58
+ if (role !== undefined) {
59
+ const table = options.user?.modelName ?? "user";
60
+ const column = columns.find((entry) => entry.table === table && entry.column === "role");
61
+ const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
62
+ if (column !== undefined && column.default !== `${value}::text`) {
63
+ missing.push(`column ${table}.role requires DEFAULT ${value}`);
64
+ }
65
+ }
66
+ return missing;
67
+ });
@@ -0,0 +1,14 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { Effect } from "effect";
3
+ import { SqlClient } from "effect/sql";
4
+ import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
5
+ import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.ts";
6
+
7
+ export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (
8
+ options: Omit<BetterAuthOptions, "database">,
9
+ role?: StoredRoleOptions,
10
+ ) {
11
+ const plan = yield* betterAuthMigrationPlan(options, role);
12
+ const sql = yield* SqlClient.SqlClient;
13
+ yield* sql.unsafe(authMigrationSql(plan.ddl));
14
+ });
@@ -0,0 +1,43 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { getMigrations } from "better-auth/db/migration";
3
+ import { Effect } from "effect";
4
+ import { SqlClient } from "effect/sql";
5
+ import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
6
+ import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
7
+
8
+ export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (
9
+ options: Omit<BetterAuthOptions, "database">,
10
+ role?: StoredRoleOptions,
11
+ safety: { readonly throwOnUnsafe: boolean } = { throwOnUnsafe: true },
12
+ ) {
13
+ const database = yield* betterAuthDatabase();
14
+ const plan = yield* Effect.tryPromise(() => getMigrations({ ...storedRoleOptions(options, role), database }, safety));
15
+ const missing = [
16
+ ...plan.toBeCreated.map(({ table, fields }) => `table ${table} (${Object.keys(fields).join(", ")})`),
17
+ ...plan.toBeAdded.flatMap(({ table, fields }) => Object.keys(fields).map((field) => `column ${table}.${field}`)),
18
+ ...plan.toBeAddedIndexes.map(({ table, name }) => `index ${table}.${name}`),
19
+ ...plan.schemaProblems,
20
+ ...plan.unsafeChanges,
21
+ ];
22
+ const compiled = yield* Effect.tryPromise(() => plan.compileMigrations());
23
+ let ddl = compiled === ";" ? "" : compiled;
24
+ if (role !== undefined) {
25
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
26
+ const table = options.user?.modelName ?? "user";
27
+ const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
28
+ const identifier = sql`${sql(table)}`.compile()[0];
29
+ ddl += `\nalter table ${identifier} alter column role set default ${value};\n`;
30
+ ddl += `update ${identifier} set role = ${value} where role is null;\n`;
31
+ ddl += `alter table ${identifier} alter column role set not null;`;
32
+ }
33
+ return { ddl, missing };
34
+ });
35
+
36
+ export function authMigrationSql(ddl: string) {
37
+ let tag = "$auth_migration$";
38
+ while (ddl.includes(tag)) {
39
+ tag = tag.replace("$auth", "$auth_");
40
+ }
41
+ // A DO block sends the compiled DDL as one statement on the native transaction connection.
42
+ return `do ${tag}\nbegin\n${ddl}\nend;\n${tag};`;
43
+ }
@@ -0,0 +1,13 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { Effect } from "effect";
3
+ import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
4
+ import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/migrationPlan.ts";
5
+
6
+ export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (
7
+ options: Omit<BetterAuthOptions, "database">,
8
+ role?: StoredRoleOptions,
9
+ ) {
10
+ const plan = yield* betterAuthMigrationPlan(options, role);
11
+ const sql = authMigrationSql(plan.ddl).replaceAll("\\", "\\\\").replaceAll("`", "\\`").replaceAll("${", "\\${");
12
+ return `import { Effect } from "effect";\nimport { SqlClient } from "effect/sql";\n\nexport default Effect.gen(function* () {\n\tconst sql = yield* SqlClient.SqlClient;\n\tyield* sql.unsafe(\`${sql}\`);\n});\n`;
13
+ });
@@ -2,23 +2,28 @@ import { type BetterAuthOptions, betterAuth } from "better-auth";
2
2
  import { Config, Effect, Option, Redacted } from "effect";
3
3
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
4
4
  import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
5
+ import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
5
6
  import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
7
+ import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
6
8
  import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/bearerSessions.ts";
7
9
  import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
8
10
  import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
9
11
  import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
10
12
  import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
11
13
  import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
14
+ import type { AccountRoleSeed } from "./accountRoleSeed.ts";
12
15
  import { admittedSessions } from "./admittedSessions.ts";
13
16
  import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
14
17
  import { mountedSessions } from "./mountedSessions.ts";
15
18
 
16
- export interface BetterAuthMountOptions<E = never, R = never> {
19
+ export type BetterAuthMountOptions<E = never, R = never> = {
17
20
  readonly bearerSessions?: BearerSessionsOptions | undefined;
18
21
  readonly hardening?: BetterAuthHardeningOptions;
19
- readonly roles?: RoleSet;
20
22
  readonly signIn?: SignInPolicy<E, R> | undefined;
21
- }
23
+ } & (
24
+ | { readonly roles?: undefined; readonly roleSeed?: undefined }
25
+ | (StoredRoleOptions & { readonly roles: RoleSet; readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R> })
26
+ );
22
27
 
23
28
  export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <const TOptions extends BetterAuthOptions, E = never, R = never>(
24
29
  options: TOptions,
@@ -35,11 +40,13 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
35
40
  yield* policy.accounts;
36
41
  }
37
42
  const gate = yield* signInGate(policy);
38
- const gated = yield* signInPolicyOptions(options, gate, (): Promise<PolicyStorage> => auth.$context);
43
+ const configured = mount.roles === undefined ? options : storedRoleOptions(closeRoleEndpoints(options), mount);
44
+ const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
45
+ const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
46
+ const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
39
47
  const rateLimit = options.rateLimit;
40
48
  const customStorage =
41
49
  rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
42
- const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
43
50
  const auth = betterAuth({
44
51
  ...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
45
52
  advanced: {
@@ -57,7 +64,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
57
64
  allowedHosts: ["127.0.0.1:*", "localhost:*"],
58
65
  protocol: "http" as const,
59
66
  })),
60
- databaseHooks: gate.active ? gated.databaseHooks : options.databaseHooks,
67
+ databaseHooks: seeded.databaseHooks,
61
68
  rateLimit: {
62
69
  ...rateLimit,
63
70
  ...(customStorage === undefined ? {} : { customStorage }),
@@ -66,7 +73,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
66
73
  secret,
67
74
  trustedOrigins:
68
75
  options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
69
- user: gate.active ? gated.user : options.user,
76
+ user: gate.active ? gated.user : configured.user,
70
77
  });
71
78
  const authRoutes = mountRoutes(auth, {
72
79
  bearerSessions: mount.bearerSessions,
@@ -67,7 +67,14 @@ export function mountRoutes(auth: MountedAuth, options: MountRouteOptions) {
67
67
  "auth.rate_limit.address": clientIp.address,
68
68
  "auth.rate_limit.address_source": clientIp.source,
69
69
  });
70
- return HttpServerResponse.fromWeb(yield* authResponse(auth, web, options).pipe(Effect.catch(providerFailure)));
70
+ return HttpServerResponse.fromWeb(
71
+ yield* authResponse(auth, web, options).pipe(
72
+ Effect.catchTag("Forbidden", (error) =>
73
+ Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") })),
74
+ ),
75
+ Effect.catch(providerFailure),
76
+ ),
77
+ );
71
78
  }).pipe(
72
79
  Effect.catch(() =>
73
80
  Effect.succeed(
@@ -1,5 +1,6 @@
1
1
  import { type Cause, Effect, Schema } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
+ import type { Forbidden } from "@shivaedev/errors/taxonomy.ts";
3
4
  import { SessionUserSchema } from "#identity.ts";
4
5
  import { resolveRole } from "#server/resolveRole.ts";
5
6
 
@@ -9,7 +10,7 @@ const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user:
9
10
  export const sessionPermissions = Effect.fn("Platform.sessionPermissions")(function* (
10
11
  response: Response,
11
12
  roles: RoleSet,
12
- ): Effect.fn.Return<Response, Cause.UnknownError | Schema.SchemaError> {
13
+ ): Effect.fn.Return<Response, Cause.UnknownError | Schema.SchemaError | Forbidden> {
13
14
  const payload = yield* Schema.decodeUnknownEffect(SessionPayload)(yield* Effect.tryPromise(() => response.json()));
14
15
  if (payload === null) {
15
16
  return Response.json(null, response);
@@ -1,5 +1,6 @@
1
1
  import { DateTime, Effect, Schema } from "effect";
2
2
  import { SqlClient, SqlSchema } from "effect/sql";
3
+ import { migrateBetterAuth } from "./migrate.ts";
3
4
 
4
5
  const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
5
6
 
@@ -15,7 +16,16 @@ export const authTestDatabase = Effect.gen(function* () {
15
16
  sql`update "session" set "expiresAt" = now() - interval '1 second' ${userId === undefined ? sql.literal("") : sql`where "userId" = ${userId}`}`.pipe(
16
17
  Effect.asVoid,
17
18
  ),
19
+ migrate: migrateBetterAuth,
18
20
  omitImageColumn: sql`alter table "user" drop column image`.pipe(Effect.asVoid),
21
+ omitRole: (userId: string) =>
22
+ Effect.gen(function* () {
23
+ yield* sql`alter table "user" alter column role drop not null`;
24
+ yield* sql`update "user" set role = null where id = ${userId}`;
25
+ }),
26
+ roleColumn: sql<{ type: string; nullable: string; default: string | null }>`
27
+ select data_type as type, is_nullable as nullable, column_default as "default"
28
+ from information_schema.columns where table_schema = current_schema() and table_name = 'user' and column_name = 'role'`,
19
29
  sessionIpAddresses: sql<{ ipAddress: string | null }>`select "ipAddress" from "session" order by "createdAt", id`,
20
30
  sessions: sql<{
21
31
  email: string;
@@ -27,6 +37,7 @@ export const authTestDatabase = Effect.gen(function* () {
27
37
  const now = yield* DateTime.now;
28
38
  return sessions.map((session) => ({ ...session, expired: DateTime.toEpochMillis(session.expiresAt) <= DateTime.toEpochMillis(now) }));
29
39
  }),
40
+ userRoles: sql<{ email: string; role: string | null }>`select email, role from "user" order by email`,
30
41
  users: sql<{ email: string; id: string }>`select id, email from "user" order by email`,
31
42
  };
32
43
  });
@@ -1,4 +1,4 @@
1
- import { Effect, Layer, Option } from "effect";
1
+ import { type Context, Effect, Layer, Option } from "effect";
2
2
  import { type HttpServerRequest, HttpServerResponse } from "effect/http";
3
3
  import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import type { RpcMiddleware } from "effect/rpc";
@@ -9,14 +9,16 @@ import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
9
9
  import type { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
10
10
  import { Identity, SessionUser } from "#identity.ts";
11
11
  import type { IdentityFailures } from "#middleware.ts";
12
- import { hasPermission, type permissionMiddleware } from "#permission.ts";
12
+ import { hasPermission } from "#permission.ts";
13
13
  import { commandChanges } from "#server/commandChanges.ts";
14
14
  import { recheckSession } from "./recheckSession.ts";
15
15
  import { revalidateStream } from "./revalidateStream.ts";
16
16
  import { type SessionPolicy, type UserSessionShape, withSessionUser } from "./session.ts";
17
17
 
18
18
  export function permissionLayer<TMiddleware, TSession extends UserSessionShape>(
19
- middleware: ReturnType<ReturnType<typeof permissionMiddleware<TMiddleware>>>,
19
+ middleware: Context.Key<TMiddleware, RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never>> & {
20
+ readonly permission: Permission;
21
+ },
20
22
  policy: SessionPolicy<TSession>,
21
23
  ) {
22
24
  const permission = middleware.permission;
@@ -1,7 +1,16 @@
1
1
  import { Effect } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
+ import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
3
4
 
4
5
  export function resolveRole(roles: RoleSet, stored: unknown) {
6
+ if (stored === undefined || stored === null) {
7
+ return Effect.andThen(
8
+ Effect.logWarning(
9
+ "Stored user role is missing. Generate and apply an auth migration with defaultRole, then use assignRole for administrators.",
10
+ ),
11
+ Effect.fail(new Forbidden({ message: "User role is missing" })),
12
+ );
13
+ }
5
14
  return roles.resolve(stored).pipe(
6
15
  Effect.mapError((cause) => new Error(`Stored user role is not declared by the application: ${String(stored)}`, { cause })),
7
16
  Effect.orDie,