@shivaedev/identity 0.23.1 → 0.25.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 (154) hide show
  1. package/CHANGELOG.md +28 -0
  2. package/README.md +102 -2
  3. package/dist/accountPreferences.d.ts +112 -0
  4. package/dist/accountPreferences.d.ts.map +1 -0
  5. package/dist/accountPreferences.js +37 -0
  6. package/dist/accountPreferences.js.map +1 -0
  7. package/dist/server/AccountClock.d.ts +11 -0
  8. package/dist/server/AccountClock.d.ts.map +1 -0
  9. package/dist/server/AccountClock.js +14 -0
  10. package/dist/server/AccountClock.js.map +1 -0
  11. package/dist/server/AccountPreferencesStore.d.ts +25 -0
  12. package/dist/server/AccountPreferencesStore.d.ts.map +1 -0
  13. package/dist/server/AccountPreferencesStore.js +13 -0
  14. package/dist/server/AccountPreferencesStore.js.map +1 -0
  15. package/dist/server/UserProvisioning.d.ts +15 -0
  16. package/dist/server/UserProvisioning.d.ts.map +1 -0
  17. package/dist/server/UserProvisioning.js +4 -0
  18. package/dist/server/UserProvisioning.js.map +1 -0
  19. package/dist/server/account-clock/dayRange.d.ts +7 -0
  20. package/dist/server/account-clock/dayRange.d.ts.map +1 -0
  21. package/dist/server/account-clock/dayRange.js +11 -0
  22. package/dist/server/account-clock/dayRange.js.map +1 -0
  23. package/dist/server/account-clock/initialize.d.ts +7 -0
  24. package/dist/server/account-clock/initialize.d.ts.map +1 -0
  25. package/dist/server/account-clock/initialize.js +18 -0
  26. package/dist/server/account-clock/initialize.js.map +1 -0
  27. package/dist/server/account-clock/logicalDay.d.ts +4 -0
  28. package/dist/server/account-clock/logicalDay.d.ts.map +1 -0
  29. package/dist/server/account-clock/logicalDay.js +10 -0
  30. package/dist/server/account-clock/logicalDay.js.map +1 -0
  31. package/dist/server/account-clock/settings.d.ts +5 -0
  32. package/dist/server/account-clock/settings.d.ts.map +1 -0
  33. package/dist/server/account-clock/settings.js +8 -0
  34. package/dist/server/account-clock/settings.js.map +1 -0
  35. package/dist/server/account-export/check.d.ts +15 -0
  36. package/dist/server/account-export/check.d.ts.map +1 -0
  37. package/dist/server/account-export/check.js +33 -0
  38. package/dist/server/account-export/check.js.map +1 -0
  39. package/dist/server/account-preferences/capture.d.ts +8 -0
  40. package/dist/server/account-preferences/capture.d.ts.map +1 -0
  41. package/dist/server/account-preferences/capture.js +8 -0
  42. package/dist/server/account-preferences/capture.js.map +1 -0
  43. package/dist/server/account-preferences/get.d.ts +12 -0
  44. package/dist/server/account-preferences/get.d.ts.map +1 -0
  45. package/dist/server/account-preferences/get.js +8 -0
  46. package/dist/server/account-preferences/get.js.map +1 -0
  47. package/dist/server/account-preferences/initialize.d.ts +59 -0
  48. package/dist/server/account-preferences/initialize.d.ts.map +1 -0
  49. package/dist/server/account-preferences/initialize.js +16 -0
  50. package/dist/server/account-preferences/initialize.js.map +1 -0
  51. package/dist/server/account-preferences/set.d.ts +8 -0
  52. package/dist/server/account-preferences/set.d.ts.map +1 -0
  53. package/dist/server/account-preferences/set.js +10 -0
  54. package/dist/server/account-preferences/set.js.map +1 -0
  55. package/dist/server/accountExport.d.ts +14 -0
  56. package/dist/server/accountExport.d.ts.map +1 -0
  57. package/dist/server/accountExport.js +15 -0
  58. package/dist/server/accountExport.js.map +1 -0
  59. package/dist/server/accountPreferencesHandlers.d.ts +2 -0
  60. package/dist/server/accountPreferencesHandlers.d.ts.map +1 -0
  61. package/dist/server/accountPreferencesHandlers.js +19 -0
  62. package/dist/server/accountPreferencesHandlers.js.map +1 -0
  63. package/dist/server/adapters/accountPreferencesMigration.d.ts +4 -0
  64. package/dist/server/adapters/accountPreferencesMigration.d.ts.map +1 -0
  65. package/dist/server/adapters/accountPreferencesMigration.js +12 -0
  66. package/dist/server/adapters/accountPreferencesMigration.js.map +1 -0
  67. package/dist/server/better-auth/adapters/SeedOptions.d.ts +14 -0
  68. package/dist/server/better-auth/adapters/SeedOptions.d.ts.map +1 -0
  69. package/dist/server/better-auth/adapters/SeedOptions.js +2 -0
  70. package/dist/server/better-auth/adapters/SeedOptions.js.map +1 -0
  71. package/dist/server/better-auth/adapters/accountPreferenceOptions.d.ts +14 -0
  72. package/dist/server/better-auth/adapters/accountPreferenceOptions.d.ts.map +1 -0
  73. package/dist/server/better-auth/adapters/accountPreferenceOptions.js +32 -0
  74. package/dist/server/better-auth/adapters/accountPreferenceOptions.js.map +1 -0
  75. package/dist/server/better-auth/adapters/acquire.d.ts +37 -1
  76. package/dist/server/better-auth/adapters/acquire.d.ts.map +1 -1
  77. package/dist/server/better-auth/adapters/acquire.js +4 -1
  78. package/dist/server/better-auth/adapters/acquire.js.map +1 -1
  79. package/dist/server/better-auth/adapters/assertSeedDatabase.d.ts +10 -0
  80. package/dist/server/better-auth/adapters/assertSeedDatabase.d.ts.map +1 -0
  81. package/dist/server/better-auth/adapters/assertSeedDatabase.js +12 -0
  82. package/dist/server/better-auth/adapters/assertSeedDatabase.js.map +1 -0
  83. package/dist/server/better-auth/adapters/defineSeed.d.ts +4 -0
  84. package/dist/server/better-auth/adapters/defineSeed.d.ts.map +1 -0
  85. package/dist/server/better-auth/adapters/defineSeed.js +19 -0
  86. package/dist/server/better-auth/adapters/defineSeed.js.map +1 -0
  87. package/dist/server/better-auth/adapters/emailOptions.d.ts.map +1 -1
  88. package/dist/server/better-auth/adapters/emailOptions.js +19 -8
  89. package/dist/server/better-auth/adapters/emailOptions.js.map +1 -1
  90. package/dist/server/better-auth/adapters/mount.d.ts +82 -41
  91. package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
  92. package/dist/server/better-auth/adapters/mount.js +8 -25
  93. package/dist/server/better-auth/adapters/mount.js.map +1 -1
  94. package/dist/server/better-auth/adapters/mountSettings.d.ts +51 -0
  95. package/dist/server/better-auth/adapters/mountSettings.d.ts.map +1 -0
  96. package/dist/server/better-auth/adapters/mountSettings.js +26 -0
  97. package/dist/server/better-auth/adapters/mountSettings.js.map +1 -0
  98. package/dist/server/better-auth/adapters/preferencesClient.d.ts +3 -0
  99. package/dist/server/better-auth/adapters/preferencesClient.d.ts.map +1 -0
  100. package/dist/server/better-auth/adapters/preferencesClient.js +24 -0
  101. package/dist/server/better-auth/adapters/preferencesClient.js.map +1 -0
  102. package/dist/server/better-auth/adapters/userDataExport.d.ts +38 -0
  103. package/dist/server/better-auth/adapters/userDataExport.d.ts.map +1 -0
  104. package/dist/server/better-auth/adapters/userDataExport.js +55 -0
  105. package/dist/server/better-auth/adapters/userDataExport.js.map +1 -0
  106. package/dist/server/better-auth/adapters/userProvisioning.d.ts +9 -0
  107. package/dist/server/better-auth/adapters/userProvisioning.d.ts.map +1 -0
  108. package/dist/server/better-auth/adapters/userProvisioning.js +22 -0
  109. package/dist/server/better-auth/adapters/userProvisioning.js.map +1 -0
  110. package/dist/server/better-auth/emails.d.ts +1 -0
  111. package/dist/server/better-auth/emails.d.ts.map +1 -1
  112. package/dist/server/better-auth/seedUsers.d.ts +6 -0
  113. package/dist/server/better-auth/seedUsers.d.ts.map +1 -0
  114. package/dist/server/better-auth/seedUsers.js +15 -0
  115. package/dist/server/better-auth/seedUsers.js.map +1 -0
  116. package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
  117. package/dist/server/better-auth/testDatabase.js +4 -1
  118. package/dist/server/better-auth/testDatabase.js.map +1 -1
  119. package/dist/server/userDataExport.d.ts +13 -0
  120. package/dist/server/userDataExport.d.ts.map +1 -0
  121. package/dist/server/userDataExport.js +2 -0
  122. package/dist/server/userDataExport.js.map +1 -0
  123. package/package.json +16 -15
  124. package/src/accountPreferences.ts +42 -0
  125. package/src/server/AccountClock.ts +14 -0
  126. package/src/server/AccountPreferencesStore.ts +13 -0
  127. package/src/server/UserProvisioning.ts +16 -0
  128. package/src/server/account-clock/dayRange.ts +12 -0
  129. package/src/server/account-clock/initialize.ts +20 -0
  130. package/src/server/account-clock/logicalDay.ts +11 -0
  131. package/src/server/account-clock/settings.ts +15 -0
  132. package/src/server/account-export/check.ts +38 -0
  133. package/src/server/account-preferences/capture.ts +10 -0
  134. package/src/server/account-preferences/get.ts +13 -0
  135. package/src/server/account-preferences/initialize.ts +18 -0
  136. package/src/server/account-preferences/set.ts +12 -0
  137. package/src/server/accountExport.ts +40 -0
  138. package/src/server/accountPreferencesHandlers.ts +22 -0
  139. package/src/server/adapters/accountPreferencesMigration.ts +12 -0
  140. package/src/server/better-auth/adapters/SeedOptions.ts +12 -0
  141. package/src/server/better-auth/adapters/accountPreferenceOptions.ts +33 -0
  142. package/src/server/better-auth/adapters/acquire.ts +4 -1
  143. package/src/server/better-auth/adapters/assertSeedDatabase.ts +15 -0
  144. package/src/server/better-auth/adapters/defineSeed.ts +23 -0
  145. package/src/server/better-auth/adapters/emailOptions.ts +27 -8
  146. package/src/server/better-auth/adapters/mount.ts +11 -27
  147. package/src/server/better-auth/adapters/mountSettings.ts +29 -0
  148. package/src/server/better-auth/adapters/preferencesClient.ts +25 -0
  149. package/src/server/better-auth/adapters/userDataExport.ts +57 -0
  150. package/src/server/better-auth/adapters/userProvisioning.ts +25 -0
  151. package/src/server/better-auth/emails.ts +1 -0
  152. package/src/server/better-auth/seedUsers.ts +21 -0
  153. package/src/server/better-auth/testDatabase.ts +4 -3
  154. package/src/server/userDataExport.ts +15 -0
@@ -0,0 +1,23 @@
1
+ import { Config, Effect } from "effect";
2
+ import { memoryStore } from "@shivaedev/rate-limit/memoryStore.ts";
3
+ import { postgresLayer } from "@shivaedev/sql/postgresLayer.ts";
4
+ import { seedUsers } from "#server/better-auth/seedUsers.ts";
5
+ import { assertSeedDatabase } from "./assertSeedDatabase.ts";
6
+ import { betterAuthDatabase } from "./database.ts";
7
+ import { betterAuthMount } from "./mount.ts";
8
+ import type { SeedOptions } from "./SeedOptions.ts";
9
+ import { betterAuthUserProvisioning } from "./userProvisioning.ts";
10
+
11
+ export function defineSeed<TRole extends string, E, R>(options: SeedOptions<TRole, E, R>) {
12
+ return Effect.gen(function* () {
13
+ const url = yield* Config.Redacted("DATABASE_URL");
14
+ yield* assertSeedDatabase(url);
15
+ return yield* Effect.gen(function* () {
16
+ const { auth } = yield* betterAuthMount(
17
+ { emailAndPassword: { enabled: true }, ...options.auth, database: yield* betterAuthDatabase() },
18
+ { defaultRole: options.defaultRole, roles: options.roles },
19
+ ).pipe(Effect.provide(memoryStore));
20
+ return yield* seedUsers(options).pipe(Effect.provide(betterAuthUserProvisioning(auth)));
21
+ }).pipe(Effect.provide(postgresLayer(url)));
22
+ }).pipe(Effect.scoped);
23
+ }
@@ -9,6 +9,11 @@ import type { hookRuntime } from "./hookRuntime.ts";
9
9
  type Outgoing = { [TKind in AuthEmail["_tag"]]: Omit<Extract<AuthEmail, { readonly _tag: TKind }>, "url"> }[AuthEmail["_tag"]];
10
10
 
11
11
  const Verification = Schema.Struct({ updateTo: Schema.optionalKey(Schema.String) });
12
+ const SignUp = Schema.Struct({ "callbackURL": Schema.optionalKey(Schema.String) });
13
+
14
+ function continuation(url: string) {
15
+ return new URL(url).searchParams.get("callbackURL");
16
+ }
12
17
 
13
18
  export const emailOptions = Effect.fnUntraced(function* <TOptions extends BetterAuthOptions, R>(
14
19
  options: TOptions,
@@ -18,16 +23,23 @@ export const emailOptions = Effect.fnUntraced(function* <TOptions extends Better
18
23
  if (emails === undefined) {
19
24
  return options;
20
25
  }
21
- const { routes, deliver, window = "1 minute" } = emails;
26
+ const { routes, deliver, window = "1 minute", windows } = emails;
22
27
  const store = yield* Store.pipe(Effect.provide(postgresStore));
23
- function send(message: Outgoing, request?: Request) {
28
+ function send(message: Outgoing, request?: Request, callback?: string | null) {
24
29
  const url = new URL(routes[message._tag]);
30
+ if (callback && URL.parse(callback, url.origin)?.origin === url.origin) {
31
+ url.searchParams.set("callbackURL", callback);
32
+ }
25
33
  if ("token" in message) {
26
34
  url.searchParams.set("token", Redacted.value(message.token));
27
35
  }
28
36
  return runtime.runHook(
29
37
  () =>
30
- rateLimit({ key: `identity:email:${JSON.stringify([message.user.id, message._tag])}`, per: 1, window }).pipe(
38
+ rateLimit({
39
+ key: `identity:email:${JSON.stringify([message.user.id, message._tag])}`,
40
+ per: 1,
41
+ window: windows?.[message._tag] ?? window,
42
+ }).pipe(
31
43
  Effect.provideService(Store, store),
32
44
  Effect.as(true),
33
45
  Effect.catchTag("TooManyRequests", () => Effect.succeed(false)),
@@ -42,12 +54,18 @@ export const emailOptions = Effect.fnUntraced(function* <TOptions extends Better
42
54
  emailAndPassword: {
43
55
  ...options.emailAndPassword,
44
56
  enabled: options.emailAndPassword?.enabled ?? false,
45
- onExistingUserSignUp: ({ user }, request) => send({ _tag: "AccountAlreadyExists", user }, request),
46
- sendResetPassword: ({ user, token }, request) => send({ _tag: "ResetPassword", token: Redacted.make(token), user }, request),
57
+ onExistingUserSignUp: async ({ user }, request) =>
58
+ send(
59
+ { _tag: "AccountAlreadyExists", user },
60
+ request,
61
+ request === undefined ? undefined : Schema.decodeUnknownSync(SignUp)(await request.json()).callbackURL,
62
+ ),
63
+ sendResetPassword: ({ user, token, url }, request) =>
64
+ send({ _tag: "ResetPassword", token: Redacted.make(token), user }, request, continuation(url)),
47
65
  },
48
66
  emailVerification: {
49
67
  ...options.emailVerification,
50
- sendVerificationEmail: ({ user, token }, request) => {
68
+ sendVerificationEmail: ({ user, token, url }, request) => {
51
69
  const payload = token.split(".")[1] ?? "";
52
70
  const { updateTo } = Schema.decodeUnknownSync(Schema.fromJsonString(Verification))(Buffer.from(payload, "base64url").toString("utf8"));
53
71
  return send(
@@ -55,6 +73,7 @@ export const emailOptions = Effect.fnUntraced(function* <TOptions extends Better
55
73
  ? { _tag: "ConfirmAccount", token: Redacted.make(token), user }
56
74
  : { _tag: "ConfirmNewAddress", newEmail: updateTo, token: Redacted.make(token), user },
57
75
  request,
76
+ continuation(url),
58
77
  );
59
78
  },
60
79
  },
@@ -63,8 +82,8 @@ export const emailOptions = Effect.fnUntraced(function* <TOptions extends Better
63
82
  changeEmail: {
64
83
  ...options.user?.changeEmail,
65
84
  enabled: options.user?.changeEmail?.enabled ?? false,
66
- sendChangeEmailConfirmation: ({ user, newEmail, token }, request) =>
67
- send({ _tag: "ApproveEmailChange", newEmail, token: Redacted.make(token), user }, request),
85
+ sendChangeEmailConfirmation: ({ user, newEmail, token, url }, request) =>
86
+ send({ _tag: "ApproveEmailChange", newEmail, token: Redacted.make(token), user }, request, continuation(url)),
68
87
  },
69
88
  },
70
89
  } satisfies BetterAuthOptions;
@@ -1,16 +1,17 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
- import { Config, Effect, Layer, Option, Redacted, type Scope } from "effect";
2
+ import { Effect, Layer, type Scope } from "effect";
3
3
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
4
4
  import type { Store } from "@shivaedev/rate-limit/Store.ts";
5
+ import { AccountPreferencesStore } from "#server/AccountPreferencesStore.ts";
5
6
  import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
6
7
  import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
7
- import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
8
8
  import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
9
9
  import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
10
10
  import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
11
11
  import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
12
12
  import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
13
13
  import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
14
+ import { mountSettings } from "#server/better-auth/adapters/mountSettings.ts";
14
15
  import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
15
16
  import { providerOnlyOptions } from "#server/better-auth/adapters/providerOnlyOptions.ts";
16
17
  import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
@@ -26,11 +27,14 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
26
27
  import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
27
28
  import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
28
29
  import { providerFailure } from "#server/providerFailure.ts";
30
+ import { accountPreferenceOptions } from "./accountPreferenceOptions.ts";
29
31
  import { acquireAuth } from "./acquire.ts";
30
32
  import { authRouteHandler } from "./routeHandler.ts";
31
33
 
32
34
  export type BetterAuthMountOptions<E = never, R = never> = {
35
+ readonly accountPreferences?: boolean;
33
36
  readonly bearerSessions?: BearerSessionsOptions | undefined;
37
+ readonly clientIp?: "railway";
34
38
  readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
35
39
  readonly emails?: BetterAuthEmails<R> | undefined;
36
40
  readonly enabledPaths?: readonly string[];
@@ -50,19 +54,16 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
50
54
  if (mount.roles !== undefined) {
51
55
  yield* mount.roles.resolve(mount.defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: mount.defaultRole })));
52
56
  }
53
- const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
54
- const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
55
- const origin = Option.map(publicUrl, (url) => url.origin);
56
- const trustedProxy = Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option));
57
- const clientIpHeader = yield* Config.String("AUTH_CLIENT_IP_HEADER").pipe(Config.withDefault("x-forwarded-for"));
58
- const rateLimitEnabled = yield* Config.Boolean("AUTH_RATE_LIMIT_ENABLED").pipe(Config.withDefault(true));
57
+ const { authOptions, clientIpHeader, rateLimitEnabled, trustedProxy } = yield* mountSettings(options, mount.clientIp);
59
58
  const policy = mount.signIn ?? {};
60
59
  if (policy.accounts !== undefined) {
61
60
  yield* policy.accounts;
62
61
  }
63
62
  const gate = yield* signInGate(policy);
64
63
  const runtime = yield* hookRuntime<R>();
65
- const reset = passwordResetOptions(options, mount.onPasswordReset, runtime);
64
+ const preferences =
65
+ mount.accountPreferences === true ? yield* accountPreferenceOptions(options).pipe(Effect.provide(AccountPreferencesStore.layer)) : options;
66
+ const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
66
67
  const hooked = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), mount.databaseHooks, runtime);
67
68
  const configured = mount.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), mount);
68
69
  const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
@@ -76,29 +77,12 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
76
77
  const customStorage = yield* rateLimitStorage;
77
78
  const { auth, profiles } = yield* acquireAuth({
78
79
  ...withHardening(withBearerSessions(preset, mount.bearerSessions !== undefined), mount.hardening),
79
- advanced: {
80
- useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
81
- ...options.advanced,
82
- ipAddress: {
83
- ...options.advanced?.ipAddress,
84
- ipAddressHeaders: [PEER_IP_HEADER],
85
- trustedProxies: [],
86
- },
87
- },
88
- "baseURL":
89
- options.baseURL
90
- ?? Option.getOrElse(origin, () => ({
91
- allowedHosts: ["127.0.0.1:*", "localhost:*"],
92
- protocol: "http" as const,
93
- })),
80
+ ...authOptions,
94
81
  rateLimit: {
95
82
  ...rateLimit,
96
83
  customStorage,
97
84
  enabled: rateLimitEnabled,
98
85
  },
99
- secret,
100
- trustedOrigins:
101
- options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
102
86
  user: gate.active ? gated.user : configured.user,
103
87
  });
104
88
  const authRoutes = mountRoutes.pipe(
@@ -0,0 +1,29 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { Config, Effect, Option, Redacted } from "effect";
3
+ import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
4
+
5
+ export const mountSettings = Effect.fnUntraced(function* (options: BetterAuthOptions, clientIp?: "railway") {
6
+ const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
7
+ const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
8
+ const origin = Option.map(publicUrl, (url) => url.origin);
9
+ const trustedProxy = Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option));
10
+ const clientIpHeader =
11
+ clientIp === "railway" ? "x-real-ip" : yield* Config.String("AUTH_CLIENT_IP_HEADER").pipe(Config.withDefault("x-forwarded-for"));
12
+ const rateLimitEnabled = yield* Config.Boolean("AUTH_RATE_LIMIT_ENABLED").pipe(Config.withDefault(true));
13
+ return {
14
+ authOptions: {
15
+ advanced: {
16
+ useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
17
+ ...options.advanced,
18
+ ipAddress: { ...options.advanced?.ipAddress, ipAddressHeaders: [PEER_IP_HEADER], trustedProxies: [] },
19
+ },
20
+ "baseURL": options.baseURL ?? Option.getOrElse(origin, () => ({ allowedHosts: ["127.0.0.1:*", "localhost:*"], protocol: "http" as const })),
21
+ secret,
22
+ trustedOrigins:
23
+ options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
24
+ } satisfies BetterAuthOptions,
25
+ clientIpHeader,
26
+ rateLimitEnabled,
27
+ trustedProxy,
28
+ };
29
+ });
@@ -0,0 +1,25 @@
1
+ import type { BetterAuthClientPlugin } from "better-auth/client";
2
+
3
+ export function preferencesClient(): Pick<BetterAuthClientPlugin, "id" | "fetchPlugins"> {
4
+ return {
5
+ fetchPlugins: [
6
+ {
7
+ hooks: {
8
+ onRequest(context) {
9
+ if (!("window" in globalThis)) {
10
+ return context;
11
+ }
12
+ const { locale, timeZone } = new Intl.DateTimeFormat().resolvedOptions();
13
+ const headers = new Headers(context.headers);
14
+ headers.set("x-platform-account-timezone", timeZone);
15
+ headers.set("x-platform-account-locale", locale);
16
+ return { ...context, headers };
17
+ },
18
+ },
19
+ id: "identity-account-preferences",
20
+ name: "identity-account-preferences",
21
+ },
22
+ ],
23
+ id: "identity-account-preferences",
24
+ };
25
+ }
@@ -0,0 +1,57 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { getAuthTables } from "better-auth/db";
3
+ import { Effect, Schema } from "effect";
4
+ import { SqlClient, SqlSchema } from "effect/sql";
5
+
6
+ const Timestamps = { createdAt: Schema.DateTimeUtcFromDate, updatedAt: Schema.DateTimeUtcFromDate };
7
+ const User = Schema.Struct({
8
+ ...Timestamps,
9
+ email: Schema.String,
10
+ emailVerified: Schema.Boolean,
11
+ id: Schema.String,
12
+ image: Schema.NullOr(Schema.String),
13
+ name: Schema.String,
14
+ });
15
+ const Account = Schema.Struct({ ...Timestamps, accountId: Schema.String, id: Schema.String, providerId: Schema.String, userId: Schema.String });
16
+ const Session = Schema.Struct({
17
+ ...Timestamps,
18
+ expiresAt: Schema.DateTimeUtcFromDate,
19
+ id: Schema.String,
20
+ ipAddress: Schema.NullOr(Schema.String),
21
+ userAgent: Schema.NullOr(Schema.String),
22
+ userId: Schema.String,
23
+ });
24
+
25
+ export function betterAuthUserDataExport(options: BetterAuthOptions = {}, schema = "public") {
26
+ const models = getAuthTables(options);
27
+ return {
28
+ export: Effect.fn("BetterAuth.export")(function* (userId: string) {
29
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
30
+ function select(model: string, fields: readonly string[], owner: string, id: string) {
31
+ const table = models[model];
32
+ function column(name: string) {
33
+ return table?.fields[name]?.fieldName ?? name;
34
+ }
35
+ const columns = sql.csv(fields.map((name) => sql`${sql(column(name))} as ${sql(name)}`));
36
+ return sql`select ${columns} from ${sql(`${schema}.${table?.modelName ?? model}`)} where ${sql(column(owner))} = ${id} order by id`;
37
+ }
38
+ const users = yield* SqlSchema.findAll({
39
+ execute: (id) => select("user", Object.keys(User.fields), "id", id),
40
+ Request: Schema.String,
41
+ Result: User,
42
+ })(userId);
43
+ const accounts = yield* SqlSchema.findAll({
44
+ execute: (id) => select("account", Object.keys(Account.fields), "userId", id),
45
+ Request: Schema.String,
46
+ Result: Account,
47
+ })(userId);
48
+ const sessions = yield* SqlSchema.findAll({
49
+ execute: (id) => select("session", Object.keys(Session.fields), "userId", id),
50
+ Request: Schema.String,
51
+ Result: Session,
52
+ })(userId);
53
+ return { accounts, sessions, users };
54
+ }),
55
+ tables: ["user", "account", "session"].map((model) => ({ schema, table: models[model]?.modelName ?? model })),
56
+ };
57
+ }
@@ -0,0 +1,25 @@
1
+ import type { AuthContext } from "better-auth";
2
+ import { Effect, Layer, Redacted } from "effect";
3
+ import { providerFailure } from "#server/providerFailure.ts";
4
+ import { type PasswordUser, UserProvisioning } from "#server/UserProvisioning.ts";
5
+
6
+ export function betterAuthUserProvisioning(auth: {
7
+ readonly $context: Promise<Pick<AuthContext, "internalAdapter"> & { readonly password: Pick<AuthContext["password"], "hash"> }>;
8
+ }) {
9
+ return Layer.succeed(UserProvisioning, {
10
+ findOrCreateUser: Effect.fn("Identity.findOrCreateUser")(function* ({ email, name, password }: PasswordUser) {
11
+ return yield* Effect.tryPromise(async () => {
12
+ const context = await auth.$context;
13
+ const normalized = email.toLowerCase();
14
+ const existing = await context.internalAdapter.findUserByEmail(normalized);
15
+ if (existing !== null) {
16
+ return { email: existing.user.email, id: existing.user.id, name: existing.user.name };
17
+ }
18
+ const hash = await context.password.hash(Redacted.value(password));
19
+ const user = await context.internalAdapter.createUser({ email: normalized, emailVerified: true, name }, { method: "seed" });
20
+ await context.internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id });
21
+ return { email: user.email, id: user.id, name: user.name };
22
+ }).pipe(Effect.catch((error) => providerFailure(error.cause)));
23
+ }),
24
+ });
25
+ }
@@ -23,4 +23,5 @@ export interface BetterAuthEmails<R = never> {
23
23
  readonly deliver: (message: AuthEmail) => Effect.Effect<void, BetterAuthHookError, R>;
24
24
  readonly routes: Readonly<Record<AuthEmail["_tag"], string>>;
25
25
  readonly window?: Duration.Input;
26
+ readonly windows?: Readonly<Partial<Record<AuthEmail["_tag"], Duration.Input>>>;
26
27
  }
@@ -0,0 +1,21 @@
1
+ import { Effect, Option } from "effect";
2
+ import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
3
+ import { Identity, SessionUser } from "#identity.ts";
4
+ import type { SeedOptions } from "#server/better-auth/adapters/SeedOptions.ts";
5
+ import { UserProvisioning } from "#server/UserProvisioning.ts";
6
+ import { assignRole } from "./assignRole.ts";
7
+
8
+ export const seedUsers = Effect.fn("Identity.seedUsers")(function* <TRole extends string, E, R>(options: SeedOptions<TRole, E, R>) {
9
+ const provisioning = yield* UserProvisioning;
10
+ for (const persona of options.users) {
11
+ const user = yield* provisioning.findOrCreateUser(persona);
12
+ yield* assignRole(options.roles, user.id, persona.role, options.auth);
13
+ const access = yield* options.roles.resolve(persona.role);
14
+ yield* options.run.pipe(
15
+ Effect.provideService(Identity, { id: user.id }),
16
+ Effect.provideService(SessionUser, { ...user, ...access }),
17
+ Effect.provideService(CurrentViewer, Option.some({ id: user.id })),
18
+ Effect.annotateLogs({ userId: user.id }),
19
+ );
20
+ }
21
+ });
@@ -13,9 +13,10 @@ export const authTestDatabase = Effect.gen(function* () {
13
13
  });
14
14
  return {
15
15
  expireSessions: (userId?: string) =>
16
- sql`update "session" set "expiresAt" = now() - interval '1 second' ${userId === undefined ? sql.literal("") : sql`where "userId" = ${userId}`}`.pipe(
17
- Effect.asVoid,
18
- ),
16
+ Effect.gen(function* () {
17
+ const expiredAt = DateTime.toDateUtc(DateTime.subtract(yield* DateTime.now, { seconds: 1 }));
18
+ yield* sql`update "session" set "expiresAt" = ${expiredAt} ${userId === undefined ? sql.literal("") : sql`where "userId" = ${userId}`}`;
19
+ }),
19
20
  migrate: migrateBetterAuth,
20
21
  omitImageColumn: sql`alter table "user" drop column image`.pipe(Effect.asVoid),
21
22
  omitRole: (userId: string) =>
@@ -0,0 +1,15 @@
1
+ import type { Effect } from "effect";
2
+
3
+ export interface UserExportTable {
4
+ readonly schema: string;
5
+ readonly table: string;
6
+ }
7
+
8
+ export interface UserExportReference extends UserExportTable {
9
+ readonly column: string;
10
+ }
11
+
12
+ export interface UserDataExport {
13
+ readonly export: (userId: string) => Effect.Effect<unknown, unknown, unknown>;
14
+ readonly tables: readonly UserExportTable[];
15
+ }