@shivaedev/identity 0.17.0 → 0.18.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 (64) hide show
  1. package/CHANGELOG.md +19 -0
  2. package/README.md +34 -30
  3. package/dist/server/adapters/authCall.d.ts +5 -0
  4. package/dist/server/adapters/authCall.d.ts.map +1 -0
  5. package/dist/server/adapters/authCall.js +7 -0
  6. package/dist/server/adapters/authCall.js.map +1 -0
  7. package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
  8. package/dist/server/adapters/betterAuthSessions.js +3 -5
  9. package/dist/server/adapters/betterAuthSessions.js.map +1 -1
  10. package/dist/server/better-auth/accountRoleSeed.d.ts +2 -1
  11. package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
  12. package/dist/server/better-auth/accountRoleSeed.js +8 -6
  13. package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
  14. package/dist/server/better-auth/adapters/database.d.ts.map +1 -1
  15. package/dist/server/better-auth/adapters/database.js +18 -3
  16. package/dist/server/better-auth/adapters/database.js.map +1 -1
  17. package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
  18. package/dist/server/better-auth/adapters/hookRuntime.js +2 -1
  19. package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
  20. package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -1
  21. package/dist/server/better-auth/adapters/storedRoleOptions.js +8 -1
  22. package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
  23. package/dist/server/better-auth/assignRole.d.ts +2 -1
  24. package/dist/server/better-auth/assignRole.d.ts.map +1 -1
  25. package/dist/server/better-auth/assignRole.js +7 -5
  26. package/dist/server/better-auth/assignRole.js.map +1 -1
  27. package/dist/server/better-auth/columnDrift.d.ts.map +1 -1
  28. package/dist/server/better-auth/columnDrift.js +4 -3
  29. package/dist/server/better-auth/columnDrift.js.map +1 -1
  30. package/dist/server/better-auth/migrationPlan.d.ts.map +1 -1
  31. package/dist/server/better-auth/migrationPlan.js +7 -5
  32. package/dist/server/better-auth/migrationPlan.js.map +1 -1
  33. package/dist/server/better-auth/mount.d.ts +1 -0
  34. package/dist/server/better-auth/mount.d.ts.map +1 -1
  35. package/dist/server/better-auth/mount.js +11 -2
  36. package/dist/server/better-auth/mount.js.map +1 -1
  37. package/dist/server/better-auth/signInGate.d.ts.map +1 -1
  38. package/dist/server/better-auth/signInGate.js +2 -1
  39. package/dist/server/better-auth/signInGate.js.map +1 -1
  40. package/dist/server/better-auth/tables.d.ts +19 -0
  41. package/dist/server/better-auth/tables.d.ts.map +1 -0
  42. package/dist/server/better-auth/tables.js +24 -0
  43. package/dist/server/better-auth/tables.js.map +1 -0
  44. package/dist/server/session.d.ts.map +1 -1
  45. package/dist/server/session.js +3 -2
  46. package/dist/server/session.js.map +1 -1
  47. package/dist/server/tracing.d.ts.map +1 -1
  48. package/dist/server/tracing.js +3 -2
  49. package/dist/server/tracing.js.map +1 -1
  50. package/package.json +12 -12
  51. package/src/server/adapters/authCall.ts +8 -0
  52. package/src/server/adapters/betterAuthSessions.ts +4 -6
  53. package/src/server/better-auth/accountRoleSeed.ts +8 -5
  54. package/src/server/better-auth/adapters/database.ts +21 -4
  55. package/src/server/better-auth/adapters/hookRuntime.ts +2 -1
  56. package/src/server/better-auth/adapters/storedRoleOptions.ts +8 -1
  57. package/src/server/better-auth/assignRole.ts +7 -4
  58. package/src/server/better-auth/columnDrift.ts +4 -3
  59. package/src/server/better-auth/migrationPlan.ts +7 -5
  60. package/src/server/better-auth/mount.ts +11 -2
  61. package/src/server/better-auth/signInGate.ts +2 -1
  62. package/src/server/better-auth/tables.ts +28 -0
  63. package/src/server/session.ts +3 -2
  64. package/src/server/tracing.ts +5 -2
@@ -4,6 +4,7 @@ import { Effect } from "effect";
4
4
  import { SqlClient } from "effect/sql";
5
5
  import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
6
6
  import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
7
+ import { tables } from "./tables.ts";
7
8
 
8
9
  export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (
9
10
  options: Omit<BetterAuthOptions, "database">,
@@ -23,12 +24,13 @@ export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPl
23
24
  let ddl = compiled === ";" ? "" : compiled;
24
25
  if (role !== undefined) {
25
26
  const sql = (yield* SqlClient.SqlClient).withoutTransforms();
26
- const table = options.user?.modelName ?? "user";
27
+ const { user } = tables(options);
27
28
  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;`;
29
+ const identifier = sql`${sql(user.table)}`.compile()[0];
30
+ const column = sql`${sql(user.role)}`.compile()[0];
31
+ ddl += `\nalter table ${identifier} alter column ${column} set default ${value};\n`;
32
+ ddl += `update ${identifier} set ${column} = ${value} where ${column} is null;\n`;
33
+ ddl += `alter table ${identifier} alter column ${column} set not null;`;
32
34
  }
33
35
  return { ddl, missing };
34
36
  });
@@ -14,7 +14,8 @@ import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
14
14
  import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
15
15
  import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
16
16
  import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
17
- import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
17
+ import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
18
+ import { providerFailure } from "#server/providerFailure.ts";
18
19
  import type { AccountRoleSeed } from "./accountRoleSeed.ts";
19
20
  import { admittedSessions } from "./admittedSessions.ts";
20
21
  import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
@@ -97,8 +98,16 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
97
98
  trustedProxy,
98
99
  });
99
100
  const admit = admittedSessions(gate, () => auth.$context, mount.bearerSessions);
101
+ const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
102
+ const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId: string) {
103
+ if (!admission.active) {
104
+ return true;
105
+ }
106
+ const storage = yield* fromStorage(() => auth.$context);
107
+ return yield* admission.admitsUser(storage, userId).pipe(Effect.catch(providerFailure));
108
+ });
100
109
  const revoke = revokeUnadmitted(gate, () => auth.$context);
101
110
  const lookupSession: unknown = Reflect.get(auth.api, "getSession");
102
111
  const sessions = mountedSessions(lookupSession, admit, mount.roles);
103
- return { admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
112
+ return { admitsUser, admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
104
113
  });
@@ -50,6 +50,7 @@ export const signInGate = Effect.fnUntraced(function* <E, R>(policy: SignInPolic
50
50
  capacity: RULE_CACHE_CAPACITY,
51
51
  timeToLive: (exit) => (Exit.isSuccess(exit) ? recheckInterval : Duration.zero),
52
52
  });
53
+ const checkRule = Duration.isZero(recheckInterval) ? Cache.refresh : Cache.get;
53
54
  const admits = Effect.fnUntraced(function* (candidates: readonly ProviderAccountValue[]) {
54
55
  const allowed = accounts === undefined ? undefined : yield* accounts;
55
56
  const listed = allowed === undefined ? candidates : candidates.filter((candidate) => allowed.some((entry) => sameAccount(entry, candidate)));
@@ -57,7 +58,7 @@ export const signInGate = Effect.fnUntraced(function* <E, R>(policy: SignInPolic
57
58
  return listed.length > 0;
58
59
  }
59
60
  for (const { accountId, providerId } of listed) {
60
- if (yield* Cache.get(verdicts, { accountId, providerId })) {
61
+ if (yield* checkRule(verdicts, { accountId, providerId })) {
61
62
  return true;
62
63
  }
63
64
  }
@@ -0,0 +1,28 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { type BetterAuthDBSchema, getAuthTables } from "better-auth/db";
3
+
4
+ export type AuthTableOptions = Pick<BetterAuthOptions, "user" | "account" | "plugins">;
5
+
6
+ function field(table: BetterAuthDBSchema[string] | undefined, name: string) {
7
+ return table?.fields[name]?.fieldName ?? name;
8
+ }
9
+
10
+ export function tables(options: AuthTableOptions = {}) {
11
+ const schema = getAuthTables(options);
12
+ return {
13
+ account: {
14
+ accountId: field(schema.account, "accountId"),
15
+ providerId: field(schema.account, "providerId"),
16
+ table: schema.account?.modelName ?? "account",
17
+ userId: field(schema.account, "userId"),
18
+ },
19
+ user: {
20
+ createdAt: field(schema.user, "createdAt"),
21
+ email: field(schema.user, "email"),
22
+ name: field(schema.user, "name"),
23
+ role: field(schema.user, "role"),
24
+ table: schema.user?.modelName ?? "user",
25
+ updatedAt: field(schema.user, "updatedAt"),
26
+ },
27
+ };
28
+ }
@@ -65,10 +65,11 @@ export function maybeAuthenticatedLayer() {
65
65
  Effect.gen(function* () {
66
66
  const session = yield* resolveSession(headers, rpc._tag);
67
67
  if (Option.isNone(session)) {
68
- return yield* Effect.provideService(authorizeReads(effect, { payload, rpc }, Option.none()), OptionalIdentity, Option.none());
68
+ const invocation = authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.none());
69
+ return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
69
70
  }
70
71
  const id = yield* identified(session.value.user.id);
71
- return yield* authorizeReads(effect, { payload, rpc }, Option.some({ id })).pipe(
72
+ return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
72
73
  revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
73
74
  Effect.provideService(OptionalIdentity, Option.some({ id })),
74
75
  Effect.annotateLogs({ userId: id }),
@@ -5,7 +5,7 @@ import { redact } from "@shivaedev/errors/redact.ts";
5
5
  import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
6
6
  import { isSensitiveKey, REDACTED, redactText, type SensitiveKey } from "@shivaedev/errors/sensitive.ts";
7
7
  import { RequestId } from "#identity.ts";
8
- import { RequestTracing } from "#middleware.ts";
8
+ import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated, RequestTracing } from "#middleware.ts";
9
9
  import { commandChanges } from "#server/commandChanges.ts";
10
10
  export interface RequestTracingOptions {
11
11
  readonly header?: string;
@@ -61,7 +61,10 @@ export function requestTracingLayer(options: RequestTracingOptions = {}): Layer.
61
61
  Effect.gen(function* () {
62
62
  const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
63
63
  yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
64
- const invocation = Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
64
+ const hasSession = [Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated].some((middleware) =>
65
+ rpc.middlewares.has(middleware),
66
+ );
67
+ const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
65
68
  return yield* invocation.pipe(
66
69
  Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))),
67
70
  Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)),