@shivaedev/identity 0.17.0 → 0.19.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 (218) hide show
  1. package/CHANGELOG.md +38 -0
  2. package/README.md +74 -45
  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/{local.d.ts → adapters/local.d.ts} +1 -1
  11. package/dist/server/adapters/local.d.ts.map +1 -0
  12. package/dist/server/{local.js → adapters/local.js} +7 -6
  13. package/dist/server/adapters/local.js.map +1 -0
  14. package/dist/server/adapters/proxyRanges.d.ts.map +1 -0
  15. package/dist/server/adapters/proxyRanges.js.map +1 -0
  16. package/dist/server/adapters/trustedOrigins.d.ts +3 -0
  17. package/dist/server/adapters/trustedOrigins.d.ts.map +1 -0
  18. package/dist/server/adapters/trustedOrigins.js +10 -0
  19. package/dist/server/adapters/trustedOrigins.js.map +1 -0
  20. package/dist/server/adapters/trustedProxy.d.ts.map +1 -0
  21. package/dist/server/{trustedProxy.js → adapters/trustedProxy.js} +1 -1
  22. package/dist/server/adapters/trustedProxy.js.map +1 -0
  23. package/dist/server/adapters/trustedProxyRanges.d.ts.map +1 -0
  24. package/dist/server/{trustedProxyRanges.js → adapters/trustedProxyRanges.js} +1 -1
  25. package/dist/server/adapters/trustedProxyRanges.js.map +1 -0
  26. package/dist/server/better-auth/accountRoleSeed.d.ts +2 -1
  27. package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
  28. package/dist/server/better-auth/accountRoleSeed.js +8 -6
  29. package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
  30. package/dist/server/better-auth/adapters/assertSchema.d.ts.map +1 -0
  31. package/dist/server/better-auth/{assertSchema.js → adapters/assertSchema.js} +2 -2
  32. package/dist/server/better-auth/adapters/assertSchema.js.map +1 -0
  33. package/dist/server/better-auth/adapters/bearerSessions.d.ts.map +1 -0
  34. package/dist/server/better-auth/adapters/bearerSessions.js.map +1 -0
  35. package/dist/server/better-auth/{clientIp.d.ts → adapters/clientIp.d.ts} +4 -3
  36. package/dist/server/better-auth/adapters/clientIp.d.ts.map +1 -0
  37. package/dist/server/better-auth/{clientIp.js → adapters/clientIp.js} +7 -5
  38. package/dist/server/better-auth/adapters/clientIp.js.map +1 -0
  39. package/dist/server/better-auth/adapters/closeRoleEndpoints.d.ts.map +1 -0
  40. package/dist/server/better-auth/adapters/closeRoleEndpoints.js.map +1 -0
  41. package/dist/server/better-auth/adapters/columnDrift.d.ts.map +1 -0
  42. package/dist/server/better-auth/{columnDrift.js → adapters/columnDrift.js} +4 -3
  43. package/dist/server/better-auth/adapters/columnDrift.js.map +1 -0
  44. package/dist/server/better-auth/adapters/database.d.ts.map +1 -1
  45. package/dist/server/better-auth/adapters/database.js +18 -3
  46. package/dist/server/better-auth/adapters/database.js.map +1 -1
  47. package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
  48. package/dist/server/better-auth/adapters/hookRuntime.js +2 -1
  49. package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
  50. package/dist/server/better-auth/adapters/migrate.d.ts.map +1 -0
  51. package/dist/server/better-auth/{migrate.js → adapters/migrate.js} +1 -1
  52. package/dist/server/better-auth/adapters/migrate.js.map +1 -0
  53. package/dist/server/better-auth/adapters/migrationPlan.d.ts.map +1 -0
  54. package/dist/server/better-auth/{migrationPlan.js → adapters/migrationPlan.js} +7 -5
  55. package/dist/server/better-auth/adapters/migrationPlan.js.map +1 -0
  56. package/dist/server/better-auth/adapters/migrations/generate.d.ts.map +1 -0
  57. package/dist/server/better-auth/{migrations → adapters/migrations}/generate.js +1 -1
  58. package/dist/server/better-auth/adapters/migrations/generate.js.map +1 -0
  59. package/dist/server/better-auth/{mount.d.ts → adapters/mount.d.ts} +13 -12
  60. package/dist/server/better-auth/adapters/mount.d.ts.map +1 -0
  61. package/dist/server/better-auth/{mount.js → adapters/mount.js} +32 -20
  62. package/dist/server/better-auth/adapters/mount.js.map +1 -0
  63. package/dist/server/better-auth/adapters/mountedSessions.d.ts.map +1 -0
  64. package/dist/server/better-auth/adapters/mountedSessions.js.map +1 -0
  65. package/dist/server/better-auth/adapters/oauthGrants.d.ts +17 -0
  66. package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -0
  67. package/dist/server/better-auth/adapters/oauthGrants.js +68 -0
  68. package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -0
  69. package/dist/server/better-auth/adapters/oauthProvider.d.ts +18 -0
  70. package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -0
  71. package/dist/server/better-auth/adapters/oauthProvider.js +13 -0
  72. package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -0
  73. package/dist/server/better-auth/adapters/rateLimitStorage.d.ts +4 -0
  74. package/dist/server/better-auth/adapters/rateLimitStorage.d.ts.map +1 -0
  75. package/dist/server/better-auth/adapters/rateLimitStorage.js +14 -0
  76. package/dist/server/better-auth/adapters/rateLimitStorage.js.map +1 -0
  77. package/dist/server/better-auth/adapters/response.d.ts +1 -1
  78. package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
  79. package/dist/server/better-auth/adapters/response.js +1 -1
  80. package/dist/server/better-auth/adapters/response.js.map +1 -1
  81. package/dist/server/better-auth/adapters/routeHandler.d.ts +5 -0
  82. package/dist/server/better-auth/adapters/routeHandler.d.ts.map +1 -0
  83. package/dist/server/better-auth/adapters/routeHandler.js +20 -0
  84. package/dist/server/better-auth/adapters/routeHandler.js.map +1 -0
  85. package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -1
  86. package/dist/server/better-auth/adapters/storedRoleOptions.js +8 -1
  87. package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
  88. package/dist/server/better-auth/adapters/tables.d.ts +19 -0
  89. package/dist/server/better-auth/adapters/tables.d.ts.map +1 -0
  90. package/dist/server/better-auth/adapters/tables.js +24 -0
  91. package/dist/server/better-auth/adapters/tables.js.map +1 -0
  92. package/dist/server/better-auth/admittedSessions.d.ts +1 -1
  93. package/dist/server/better-auth/admittedSessions.d.ts.map +1 -1
  94. package/dist/server/better-auth/admittedSessions.js +1 -1
  95. package/dist/server/better-auth/admittedSessions.js.map +1 -1
  96. package/dist/server/better-auth/assignRole.d.ts +2 -1
  97. package/dist/server/better-auth/assignRole.d.ts.map +1 -1
  98. package/dist/server/better-auth/assignRole.js +7 -5
  99. package/dist/server/better-auth/assignRole.js.map +1 -1
  100. package/dist/server/better-auth/mountRoutes.d.ts +9 -3
  101. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
  102. package/dist/server/better-auth/mountRoutes.js +7 -17
  103. package/dist/server/better-auth/mountRoutes.js.map +1 -1
  104. package/dist/server/better-auth/signInGate.d.ts.map +1 -1
  105. package/dist/server/better-auth/signInGate.js +2 -1
  106. package/dist/server/better-auth/signInGate.js.map +1 -1
  107. package/dist/server/better-auth/testDatabase.js +1 -1
  108. package/dist/server/better-auth/testDatabase.js.map +1 -1
  109. package/dist/server/currentSessionContext.d.ts +5 -0
  110. package/dist/server/currentSessionContext.d.ts.map +1 -0
  111. package/dist/server/currentSessionContext.js +19 -0
  112. package/dist/server/currentSessionContext.js.map +1 -0
  113. package/dist/server/oauthGrants.d.ts +21 -0
  114. package/dist/server/oauthGrants.d.ts.map +1 -0
  115. package/dist/server/oauthGrants.js +5 -0
  116. package/dist/server/oauthGrants.js.map +1 -0
  117. package/dist/server/origin.d.ts +0 -1
  118. package/dist/server/origin.d.ts.map +1 -1
  119. package/dist/server/origin.js +0 -8
  120. package/dist/server/origin.js.map +1 -1
  121. package/dist/server/revalidateStream.d.ts +3 -3
  122. package/dist/server/revalidateStream.d.ts.map +1 -1
  123. package/dist/server/revalidateStream.js +3 -8
  124. package/dist/server/revalidateStream.js.map +1 -1
  125. package/dist/server/session.d.ts.map +1 -1
  126. package/dist/server/session.js +3 -2
  127. package/dist/server/session.js.map +1 -1
  128. package/dist/server/tracing.d.ts.map +1 -1
  129. package/dist/server/tracing.js +3 -2
  130. package/dist/server/tracing.js.map +1 -1
  131. package/dist/sessions.d.ts +1 -1
  132. package/package.json +18 -12
  133. package/src/server/adapters/authCall.ts +8 -0
  134. package/src/server/adapters/betterAuthSessions.ts +4 -6
  135. package/src/server/{local.ts → adapters/local.ts} +7 -9
  136. package/src/server/adapters/trustedOrigins.ts +13 -0
  137. package/src/server/{trustedProxy.ts → adapters/trustedProxy.ts} +1 -1
  138. package/src/server/{trustedProxyRanges.ts → adapters/trustedProxyRanges.ts} +1 -1
  139. package/src/server/better-auth/accountRoleSeed.ts +8 -5
  140. package/src/server/better-auth/{assertSchema.ts → adapters/assertSchema.ts} +2 -2
  141. package/src/server/better-auth/{clientIp.ts → adapters/clientIp.ts} +7 -6
  142. package/src/server/better-auth/{columnDrift.ts → adapters/columnDrift.ts} +4 -3
  143. package/src/server/better-auth/adapters/database.ts +21 -4
  144. package/src/server/better-auth/adapters/hookRuntime.ts +2 -1
  145. package/src/server/better-auth/{migrate.ts → adapters/migrate.ts} +1 -1
  146. package/src/server/better-auth/{migrationPlan.ts → adapters/migrationPlan.ts} +7 -5
  147. package/src/server/better-auth/{migrations → adapters/migrations}/generate.ts +1 -1
  148. package/src/server/better-auth/{mount.ts → adapters/mount.ts} +40 -25
  149. package/src/server/better-auth/adapters/oauthGrants.ts +82 -0
  150. package/src/server/better-auth/adapters/oauthProvider.ts +19 -0
  151. package/src/server/better-auth/adapters/rateLimitStorage.ts +23 -0
  152. package/src/server/better-auth/adapters/response.ts +1 -1
  153. package/src/server/better-auth/adapters/routeHandler.ts +31 -0
  154. package/src/server/better-auth/adapters/storedRoleOptions.ts +8 -1
  155. package/src/server/better-auth/adapters/tables.ts +28 -0
  156. package/src/server/better-auth/admittedSessions.ts +1 -1
  157. package/src/server/better-auth/assignRole.ts +7 -4
  158. package/src/server/better-auth/mountRoutes.ts +15 -35
  159. package/src/server/better-auth/signInGate.ts +2 -1
  160. package/src/server/better-auth/testDatabase.ts +1 -1
  161. package/src/server/currentSessionContext.ts +23 -0
  162. package/src/server/oauthGrants.ts +19 -0
  163. package/src/server/origin.ts +0 -10
  164. package/src/server/revalidateStream.ts +4 -8
  165. package/src/server/session.ts +3 -2
  166. package/src/server/tracing.ts +5 -2
  167. package/dist/server/better-auth/assertSchema.d.ts.map +0 -1
  168. package/dist/server/better-auth/assertSchema.js.map +0 -1
  169. package/dist/server/better-auth/bearerSessions.d.ts.map +0 -1
  170. package/dist/server/better-auth/bearerSessions.js.map +0 -1
  171. package/dist/server/better-auth/clientIp.d.ts.map +0 -1
  172. package/dist/server/better-auth/clientIp.js.map +0 -1
  173. package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +0 -1
  174. package/dist/server/better-auth/closeRoleEndpoints.js.map +0 -1
  175. package/dist/server/better-auth/columnDrift.d.ts.map +0 -1
  176. package/dist/server/better-auth/columnDrift.js.map +0 -1
  177. package/dist/server/better-auth/memoryRateLimit.d.ts +0 -3
  178. package/dist/server/better-auth/memoryRateLimit.d.ts.map +0 -1
  179. package/dist/server/better-auth/memoryRateLimit.js +0 -46
  180. package/dist/server/better-auth/memoryRateLimit.js.map +0 -1
  181. package/dist/server/better-auth/migrate.d.ts.map +0 -1
  182. package/dist/server/better-auth/migrate.js.map +0 -1
  183. package/dist/server/better-auth/migrationPlan.d.ts.map +0 -1
  184. package/dist/server/better-auth/migrationPlan.js.map +0 -1
  185. package/dist/server/better-auth/migrations/generate.d.ts.map +0 -1
  186. package/dist/server/better-auth/migrations/generate.js.map +0 -1
  187. package/dist/server/better-auth/mount.d.ts.map +0 -1
  188. package/dist/server/better-auth/mount.js.map +0 -1
  189. package/dist/server/better-auth/mountedSessions.d.ts.map +0 -1
  190. package/dist/server/better-auth/mountedSessions.js.map +0 -1
  191. package/dist/server/local.d.ts.map +0 -1
  192. package/dist/server/local.js.map +0 -1
  193. package/dist/server/proxyRanges.d.ts.map +0 -1
  194. package/dist/server/proxyRanges.js.map +0 -1
  195. package/dist/server/trustedProxy.d.ts.map +0 -1
  196. package/dist/server/trustedProxy.js.map +0 -1
  197. package/dist/server/trustedProxyRanges.d.ts.map +0 -1
  198. package/dist/server/trustedProxyRanges.js.map +0 -1
  199. package/src/server/better-auth/memoryRateLimit.ts +0 -56
  200. /package/dist/server/{proxyRanges.d.ts → adapters/proxyRanges.d.ts} +0 -0
  201. /package/dist/server/{proxyRanges.js → adapters/proxyRanges.js} +0 -0
  202. /package/dist/server/{trustedProxy.d.ts → adapters/trustedProxy.d.ts} +0 -0
  203. /package/dist/server/{trustedProxyRanges.d.ts → adapters/trustedProxyRanges.d.ts} +0 -0
  204. /package/dist/server/better-auth/{assertSchema.d.ts → adapters/assertSchema.d.ts} +0 -0
  205. /package/dist/server/better-auth/{bearerSessions.d.ts → adapters/bearerSessions.d.ts} +0 -0
  206. /package/dist/server/better-auth/{bearerSessions.js → adapters/bearerSessions.js} +0 -0
  207. /package/dist/server/better-auth/{closeRoleEndpoints.d.ts → adapters/closeRoleEndpoints.d.ts} +0 -0
  208. /package/dist/server/better-auth/{closeRoleEndpoints.js → adapters/closeRoleEndpoints.js} +0 -0
  209. /package/dist/server/better-auth/{columnDrift.d.ts → adapters/columnDrift.d.ts} +0 -0
  210. /package/dist/server/better-auth/{migrate.d.ts → adapters/migrate.d.ts} +0 -0
  211. /package/dist/server/better-auth/{migrationPlan.d.ts → adapters/migrationPlan.d.ts} +0 -0
  212. /package/dist/server/better-auth/{migrations → adapters/migrations}/generate.d.ts +0 -0
  213. /package/dist/server/better-auth/{mountedSessions.d.ts → adapters/mountedSessions.d.ts} +0 -0
  214. /package/dist/server/better-auth/{mountedSessions.js → adapters/mountedSessions.js} +0 -0
  215. /package/src/server/{proxyRanges.ts → adapters/proxyRanges.ts} +0 -0
  216. /package/src/server/better-auth/{bearerSessions.ts → adapters/bearerSessions.ts} +0 -0
  217. /package/src/server/better-auth/{closeRoleEndpoints.ts → adapters/closeRoleEndpoints.ts} +0 -0
  218. /package/src/server/better-auth/{mountedSessions.ts → adapters/mountedSessions.ts} +0 -0
@@ -1,6 +1,7 @@
1
1
  import { AsyncLocalStorage } from "node:async_hooks";
2
2
  import { APIError } from "better-auth/api";
3
3
  import { type Cause, Context, Effect, Result } from "effect";
4
+ import { authCall } from "#server/adapters/authCall.ts";
4
5
  import type { BetterAuthHookError } from "#server/better-auth/databaseHooks.ts";
5
6
 
6
7
  export const hookRuntime = Effect.fnUntraced(function* <R>() {
@@ -30,7 +31,7 @@ export const hookRuntime = Effect.fnUntraced(function* <R>() {
30
31
  const state: { readonly context: Context.Context<R>; cause?: Cause.Cause<never> } = {
31
32
  context: Context.merge(context, fiber.context),
32
33
  };
33
- const exit = yield* Effect.exit(Effect.tryPromise((signal) => requests.run(state, () => request(signal))));
34
+ const exit = yield* Effect.exit(authCall((signal) => requests.run(state, () => request(signal))));
34
35
  if (state.cause !== undefined) {
35
36
  return yield* Effect.failCause(state.cause);
36
37
  }
@@ -1,8 +1,8 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
2
  import { Effect } from "effect";
3
3
  import { SqlClient } from "effect/sql";
4
+ import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
4
5
  import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
5
- import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.ts";
6
6
 
7
7
  export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (
8
8
  options: Omit<BetterAuthOptions, "database">,
@@ -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 "#server/better-auth/adapters/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
  });
@@ -1,7 +1,7 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
2
  import { Effect } from "effect";
3
+ import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
3
4
  import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
4
- import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/migrationPlan.ts";
5
5
 
6
6
  export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (
7
7
  options: Omit<BetterAuthOptions, "database">,
@@ -1,27 +1,29 @@
1
1
  import { type BetterAuthOptions, betterAuth } from "better-auth";
2
- import { Config, Effect, Option, Redacted } from "effect";
2
+ import { Config, Effect, Layer, Option, Redacted } from "effect";
3
3
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
4
+ import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
5
+ import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
6
+ import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
7
+ import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
4
8
  import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
5
9
  import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
6
10
  import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
7
11
  import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
12
+ import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
8
13
  import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
14
+ import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
9
15
  import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
10
16
  import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
11
17
  import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
12
- import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/bearerSessions.ts";
13
- import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
14
- import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
15
- import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
18
+ import { admittedSessions } from "#server/better-auth/admittedSessions.ts";
19
+ import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
20
+ import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
21
+ import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
22
+ import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
16
23
  import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
17
- import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
18
- import type { AccountRoleSeed } from "./accountRoleSeed.ts";
19
- import { admittedSessions } from "./admittedSessions.ts";
20
- import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
21
- import type { BetterAuthDatabaseHooks } from "./databaseHooks.ts";
22
- import type { BetterAuthEmails } from "./emails.ts";
23
- import { mountedSessions } from "./mountedSessions.ts";
24
- import type { BetterAuthPasswordReset } from "./PasswordReset.ts";
24
+ import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
25
+ import { providerFailure } from "#server/providerFailure.ts";
26
+ import { authRouteHandler } from "./routeHandler.ts";
25
27
 
26
28
  export type BetterAuthMountOptions<E = never, R = never> = {
27
29
  readonly bearerSessions?: BearerSessionsOptions | undefined;
@@ -58,8 +60,7 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
58
60
  const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
59
61
  const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
60
62
  const rateLimit = options.rateLimit;
61
- const customStorage =
62
- rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
63
+ const customStorage = yield* rateLimitStorage;
63
64
  const auth = betterAuth({
64
65
  ...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
65
66
  advanced: {
@@ -80,7 +81,7 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
80
81
  databaseHooks: seeded.databaseHooks,
81
82
  rateLimit: {
82
83
  ...rateLimit,
83
- ...(customStorage === undefined ? {} : { customStorage }),
84
+ customStorage,
84
85
  enabled: rateLimitEnabled,
85
86
  },
86
87
  secret,
@@ -88,17 +89,31 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
88
89
  options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
89
90
  user: gate.active ? gated.user : configured.user,
90
91
  });
91
- const authRoutes = mountRoutes(auth, {
92
- bearerSessions: mount.bearerSessions,
93
- clientIpHeader,
94
- ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
95
- roles: mount.roles,
96
- runRequest: runtime.runRequest,
97
- trustedProxy,
98
- });
92
+ const authRoutes = mountRoutes.pipe(
93
+ Layer.provide(
94
+ Layer.succeed(AuthRouteHandler, {
95
+ handle: authRouteHandler(auth, {
96
+ bearerSessions: mount.bearerSessions,
97
+ clientIpHeader,
98
+ ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
99
+ roles: mount.roles,
100
+ runRequest: runtime.runRequest,
101
+ trustedProxy,
102
+ }),
103
+ }),
104
+ ),
105
+ );
99
106
  const admit = admittedSessions(gate, () => auth.$context, mount.bearerSessions);
107
+ const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
108
+ const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId: string) {
109
+ if (!admission.active) {
110
+ return true;
111
+ }
112
+ const storage = yield* fromStorage(() => auth.$context);
113
+ return yield* admission.admitsUser(storage, userId).pipe(Effect.catch(providerFailure));
114
+ });
100
115
  const revoke = revokeUnadmitted(gate, () => auth.$context);
101
116
  const lookupSession: unknown = Reflect.get(auth.api, "getSession");
102
117
  const sessions = mountedSessions(lookupSession, admit, mount.roles);
103
- return { admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
118
+ return { admitsUser, admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
104
119
  });
@@ -0,0 +1,82 @@
1
+ import type { AuthContext } from "better-auth";
2
+ import { Effect, Layer, Option, Schema } from "effect";
3
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+ import { OauthGrant, OauthGrants } from "#server/oauthGrants.ts";
5
+
6
+ export interface OauthGrantAuth {
7
+ readonly $context: Promise<{
8
+ readonly adapter: Pick<AuthContext["adapter"], "findOne" | "findMany"> & {
9
+ readonly transaction: <A>(run: (adapter: Pick<AuthContext["adapter"], "deleteMany">) => Promise<A>) => Promise<A>;
10
+ };
11
+ readonly internalAdapter: Pick<AuthContext["internalAdapter"], "findUserById">;
12
+ }>;
13
+ }
14
+
15
+ function unavailable(cause: unknown) {
16
+ return Object.assign(new AuthUnavailable({ message: "OAuth grant storage failed" }), { cause });
17
+ }
18
+
19
+ export function betterAuthOauthGrants(options: {
20
+ readonly auth: OauthGrantAuth;
21
+ readonly admitsUser: (userId: string) => Effect.Effect<boolean, AuthUnavailable>;
22
+ }) {
23
+ const { auth, admitsUser } = options;
24
+ const revoke = Effect.fn("Identity.revoke")(function* (userId: string, clientId?: string) {
25
+ yield* Effect.tryPromise({
26
+ catch: unavailable,
27
+ try: async () => {
28
+ const { adapter } = await auth.$context;
29
+ const where = [{ field: "userId", value: userId }, ...(clientId === undefined ? [] : [{ field: "clientId", value: clientId }])];
30
+ await adapter.transaction(async (transaction) => {
31
+ for (const model of ["oauthConsent", "oauthAccessToken", "oauthRefreshToken"]) {
32
+ await transaction.deleteMany({ model, where });
33
+ }
34
+ });
35
+ },
36
+ });
37
+ });
38
+ return Layer.succeed(OauthGrants, {
39
+ list: Effect.fn("OauthGrants.list")(function* (userId: string, page: { readonly limit: number; readonly offset?: number }) {
40
+ const consents = yield* Effect.tryPromise({
41
+ catch: unavailable,
42
+ try: async () => {
43
+ const { adapter } = await auth.$context;
44
+ return adapter.findMany({
45
+ ...page,
46
+ model: "oauthConsent",
47
+ sortBy: { direction: "asc", field: "id" },
48
+ where: [{ field: "userId", value: userId }],
49
+ });
50
+ },
51
+ });
52
+ return yield* Schema.decodeUnknownEffect(Schema.Array(OauthGrant))(consents).pipe(Effect.mapError(unavailable));
53
+ }),
54
+ resolveSubject: Effect.fn("OauthGrants.resolveSubject")(function* (userId: string, clientId: string) {
55
+ const subject = yield* Effect.tryPromise({
56
+ catch: unavailable,
57
+ try: async () => {
58
+ const { adapter, internalAdapter } = await auth.$context;
59
+ const user = await internalAdapter.findUserById(userId);
60
+ if (user === null || Reflect.get(user, "banned") === true) {
61
+ return null;
62
+ }
63
+ const consent = await adapter.findOne({
64
+ model: "oauthConsent",
65
+ where: [
66
+ { field: "userId", value: userId },
67
+ { field: "clientId", value: clientId },
68
+ ],
69
+ });
70
+ return consent === null ? null : user;
71
+ },
72
+ });
73
+ if (subject === null || !(yield* admitsUser(subject.id))) {
74
+ return Option.none();
75
+ }
76
+ const role: unknown = Reflect.get(subject, "role");
77
+ return Option.some({ email: subject.email, id: subject.id, name: subject.name, ...(typeof role === "string" ? { role } : {}) });
78
+ }),
79
+ revokeAllClients: (userId) => revoke(userId),
80
+ revokeClient: (userId, clientId) => revoke(userId, clientId),
81
+ });
82
+ }
@@ -0,0 +1,19 @@
1
+ import { type OAuthOptions, oauthProvider, oauthProviderAuthServerMetadata, type Scope } from "@better-auth/oauth-provider";
2
+ import { Effect } from "effect";
3
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+
5
+ export type OauthResourceOptions = Omit<OAuthOptions<Scope[]>, "resources" | "clientRegistrationDefaultResources"> & { readonly resource: string };
6
+
7
+ export function betterAuthOauthProvider({ resource, ...options }: OauthResourceOptions): ReturnType<typeof oauthProvider> {
8
+ return oauthProvider({ ...options, clientRegistrationDefaultResources: [resource], resources: [resource] });
9
+ }
10
+
11
+ export const oauthAuthorizationMetadata = Effect.fn("Identity.oauthAuthorizationMetadata")(function* (
12
+ auth: { readonly api: { readonly "getOAuthServerConfig": (input: { readonly request: Request; readonly asResponse: false }) => Promise<unknown> } },
13
+ request: Request,
14
+ ) {
15
+ return yield* Effect.tryPromise({
16
+ catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth server metadata failed" }), { cause }),
17
+ try: () => oauthProviderAuthServerMetadata(auth)(request),
18
+ });
19
+ });
@@ -0,0 +1,23 @@
1
+ import type { BetterAuthRateLimitOptions } from "better-auth";
2
+ import { Clock, Effect } from "effect";
3
+ import { Store } from "@shivaedev/rate-limit/Store.ts";
4
+
5
+ export const rateLimitStorage = Effect.gen(function* () {
6
+ const store = yield* Store;
7
+ const run = Effect.runPromiseWith(yield* Effect.context<Store>());
8
+ const storage: NonNullable<BetterAuthRateLimitOptions["customStorage"]> = {
9
+ consume: (key, rule) =>
10
+ run(
11
+ store.consume({ key: `identity:auth:${key}`, per: rule.max, windowMillis: rule.window * 1000 }).pipe(
12
+ Effect.as({ allowed: true, retryAfter: null }),
13
+ Effect.catchTag("TooManyRequests", (error) =>
14
+ Effect.map(Clock.currentTimeMillis, (now) => ({
15
+ allowed: false,
16
+ retryAfter: Math.max(1, Math.ceil(((error.retryAt ?? now + rule.window * 1000) - now) / 1000)),
17
+ })),
18
+ ),
19
+ ),
20
+ ),
21
+ };
22
+ return storage;
23
+ });
@@ -1,6 +1,6 @@
1
1
  import { type Cause, Effect } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
- import { type BearerSessionsOptions, cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/bearerSessions.ts";
3
+ import { type BearerSessionsOptions, cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
4
4
  import { sessionPermissions } from "#server/better-auth/sessionPermissions.ts";
5
5
 
6
6
  export interface MountedAuth {
@@ -0,0 +1,31 @@
1
+ import { Effect } from "effect";
2
+ import { HttpServerRequest, HttpServerResponse } from "effect/http";
3
+ import * as HttpStatus from "effect/http/HttpStatus";
4
+ import { clientIpHeaders } from "#server/better-auth/adapters/clientIp.ts";
5
+ import { type MountedAuth, type MountRouteOptions, response } from "#server/better-auth/adapters/response.ts";
6
+ import { providerFailure } from "#server/providerFailure.ts";
7
+
8
+ export function authRouteHandler(auth: MountedAuth, options: MountRouteOptions) {
9
+ const setClientIp = clientIpHeaders(options);
10
+ return Effect.gen(function* () {
11
+ const request = yield* HttpServerRequest.HttpServerRequest;
12
+ const web = yield* HttpServerRequest.toWeb(request);
13
+ const clientIp = yield* setClientIp(web);
14
+ yield* Effect.annotateCurrentSpan({
15
+ "auth.rate_limit.address": clientIp.address,
16
+ "auth.rate_limit.address_source": clientIp.source,
17
+ });
18
+ return HttpServerResponse.fromWeb(
19
+ yield* response(auth, web, options).pipe(
20
+ Effect.catchTag("Forbidden", (error) =>
21
+ Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") })),
22
+ ),
23
+ Effect.catch(providerFailure),
24
+ ),
25
+ );
26
+ }).pipe(
27
+ Effect.catchTag("AuthUnavailable", () =>
28
+ Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") })),
29
+ ),
30
+ );
31
+ }
@@ -1,4 +1,5 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
+ import { tables } from "#server/better-auth/adapters/tables.ts";
2
3
 
3
4
  export interface StoredRoleOptions {
4
5
  readonly defaultRole: string;
@@ -14,7 +15,13 @@ export function storedRoleOptions<TOptions extends BetterAuthOptions>(options: T
14
15
  ...options.user,
15
16
  additionalFields: {
16
17
  ...options.user?.additionalFields,
17
- role: { defaultValue: role.defaultRole, input: false, required: true, type: "string" },
18
+ role: {
19
+ defaultValue: role.defaultRole,
20
+ fieldName: tables(options).user.role,
21
+ input: false,
22
+ required: true,
23
+ type: "string",
24
+ },
18
25
  },
19
26
  },
20
27
  };
@@ -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
+ }
@@ -6,9 +6,9 @@ import {
6
6
  type GetSession,
7
7
  type SessionWithProviderAccounts,
8
8
  } from "#server/adapters/betterAuthSessions.ts";
9
+ import { type BearerSessionsOptions, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
9
10
  import { providerFailure } from "#server/providerFailure.ts";
10
11
  import type { SessionProvider, SessionShape } from "#server/session.ts";
11
- import { type BearerSessionsOptions, sessionHeaders } from "./bearerSessions.ts";
12
12
  import { fromStorage, type PolicyStorage, type SignInGate } from "./signInGate.ts";
13
13
 
14
14
  interface SessionStorage extends PolicyStorage {
@@ -5,6 +5,7 @@ import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
5
5
  import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
6
6
  import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
7
7
  import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
8
+ import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
8
9
 
9
10
  function unavailable() {
10
11
  return new AuthUnavailable({ message: "Could not access app users" });
@@ -14,14 +15,16 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
14
15
  access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
15
16
  userId: string,
16
17
  role: NoInfer<TRole>,
18
+ options?: AuthTableOptions,
17
19
  ) {
18
- const sql = yield* SqlClient.SqlClient;
20
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
21
+ const { user } = tables(options);
19
22
  const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
20
23
  const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
21
24
  return yield* Effect.gen(function* () {
22
25
  yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
23
26
  const readTarget = SqlSchema.findOneOption({
24
- execute: (id) => sql`select id, role from "user" where id = ${id} for update`,
27
+ execute: (id) => sql`select id, ${sql(user.role)} as role from ${sql(user.table)} where id = ${id} for update`,
25
28
  Request: Schema.String,
26
29
  Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
27
30
  });
@@ -35,7 +38,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
35
38
  const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
36
39
  if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
37
40
  const readHolders = SqlSchema.findAll({
38
- execute: () => sql`select id from "user" where role in ${sql.in(assigners)}`,
41
+ execute: () => sql`select id from ${sql(user.table)} where ${sql(user.role)} in ${sql.in(assigners)}`,
39
42
  Request: Schema.Void,
40
43
  Result: Schema.Struct({ id: Schema.String }),
41
44
  });
@@ -44,7 +47,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
44
47
  return yield* Effect.fail(new LastRoleAssigner({ userId }));
45
48
  }
46
49
  }
47
- yield* sql`update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
50
+ yield* sql`update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
48
51
  yield* invalidateOnCommit(["admin.users"]);
49
52
  return true;
50
53
  }).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
@@ -1,36 +1,16 @@
1
- import { Effect } from "effect";
2
- import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
3
- import * as HttpStatus from "effect/http/HttpStatus";
4
- import { type MountedAuth, type MountRouteOptions, response } from "#server/better-auth/adapters/response.ts";
5
- import { providerFailure } from "#server/providerFailure.ts";
6
- import { clientIpHeaders } from "./clientIp.ts";
1
+ import { Context, Effect } from "effect";
2
+ import { HttpRouter, type HttpServerError, type HttpServerRequest, type HttpServerResponse } from "effect/http";
7
3
 
8
- export function mountRoutes(auth: MountedAuth, options: MountRouteOptions) {
9
- const setClientIp = clientIpHeaders(options);
10
- return HttpRouter.use((router) =>
11
- router.add("*", "/api/auth/*", (request) =>
12
- Effect.gen(function* () {
13
- const web = yield* HttpServerRequest.toWeb(request);
14
- const clientIp = setClientIp(request, web);
15
- yield* Effect.annotateCurrentSpan({
16
- "auth.rate_limit.address": clientIp.address,
17
- "auth.rate_limit.address_source": clientIp.source,
18
- });
19
- return HttpServerResponse.fromWeb(
20
- yield* response(auth, web, options).pipe(
21
- Effect.catchTag("Forbidden", (error) =>
22
- Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") })),
23
- ),
24
- Effect.catch(providerFailure),
25
- ),
26
- );
27
- }).pipe(
28
- Effect.catch(() =>
29
- Effect.succeed(
30
- HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") }),
31
- ),
32
- ),
33
- ),
34
- ),
35
- );
36
- }
4
+ export class AuthRouteHandler extends Context.Service<
5
+ AuthRouteHandler,
6
+ {
7
+ readonly handle: Effect.Effect<HttpServerResponse.HttpServerResponse, HttpServerError.RequestError, HttpServerRequest.HttpServerRequest>;
8
+ }
9
+ >()("@shivaedev/identity/AuthRouteHandler") {}
10
+
11
+ export const mountRoutes = HttpRouter.use((router) =>
12
+ Effect.gen(function* () {
13
+ const handler = yield* AuthRouteHandler;
14
+ yield* router.add("*", "/api/auth/*", handler.handle);
15
+ }),
16
+ );
@@ -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
  }
@@ -1,6 +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
+ import { migrateBetterAuth } from "#server/better-auth/adapters/migrate.ts";
4
4
 
5
5
  const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
6
6
 
@@ -0,0 +1,23 @@
1
+ import { Context, Effect, Option, Schema } from "effect";
2
+ import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
3
+ import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
4
+ import { providerAccountsUser } from "./providerAccountsUser.ts";
5
+ import type { SessionShape } from "./session.ts";
6
+
7
+ export const currentSessionContext = Effect.fnUntraced(function* <TSession extends SessionShape, R>(
8
+ id: string,
9
+ lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, R>,
10
+ ) {
11
+ const session = yield* lookup;
12
+ if (Option.isNone(session) || session.value.user.id !== id) {
13
+ return yield* new Unauthorized({ message: "Authentication required" });
14
+ }
15
+ let context = yield* Effect.context<never>();
16
+ if (Option.isSome(Context.getOption(context, SessionUser))) {
17
+ context = Context.add(context, SessionUser, Schema.decodeUnknownSync(SessionUserSchema)(session.value.user));
18
+ }
19
+ if (Option.isSome(Context.getOption(context, SessionUserWithProviderAccounts))) {
20
+ context = Context.add(context, SessionUserWithProviderAccounts, yield* providerAccountsUser(session.value.user));
21
+ }
22
+ return context;
23
+ });
@@ -0,0 +1,19 @@
1
+ import { Context, type Effect, type Option, Schema } from "effect";
2
+ import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
3
+ import type { SessionUserValue } from "#identity.ts";
4
+
5
+ export const OauthGrant = Schema.Struct({ clientId: Schema.String, scopes: Schema.Array(Schema.String) });
6
+ export type OauthGrant = typeof OauthGrant.Type;
7
+
8
+ export class OauthGrants extends Context.Service<
9
+ OauthGrants,
10
+ {
11
+ readonly list: (
12
+ userId: string,
13
+ page: { readonly limit: number; readonly offset?: number },
14
+ ) => Effect.Effect<readonly OauthGrant[], AuthUnavailable>;
15
+ readonly revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable>;
16
+ readonly revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable>;
17
+ readonly resolveSubject: (userId: string, clientId: string) => Effect.Effect<Option.Option<SessionUserValue>, AuthUnavailable>;
18
+ }
19
+ >()("@shivaedev/identity/OauthGrants") {}
@@ -1,6 +1,5 @@
1
1
  import { Effect, Option } from "effect";
2
2
  import { Headers, HttpServerRequest } from "effect/http";
3
- import { localTransport } from "#server/local.ts";
4
3
  import { transportHeaders } from "#server/transportHeaders.ts";
5
4
  export interface OriginRequest {
6
5
  readonly headers: Headers.Headers;
@@ -14,15 +13,6 @@ export interface TrustedOriginsOptions {
14
13
  readonly missing: "allow" | "reject";
15
14
  readonly sameOrigin?: { readonly trustedProxy?: string | undefined };
16
15
  }
17
- export function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy {
18
- const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
19
- return (request) =>
20
- Option.match(request.origin, {
21
- onNone: () => options.missing === "allow",
22
- onSome: (value) =>
23
- options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
24
- });
25
- }
26
16
  export function originRequest(headers: Headers.Headers, rpc: string, remoteAddress: Option.Option<string> = Option.none()): OriginRequest {
27
17
  return {
28
18
  headers,
@@ -1,6 +1,7 @@
1
- import { Effect, Option } from "effect";
1
+ import { Effect, type Option } from "effect";
2
2
  import { type Rpc, RpcSchema } from "effect/rpc";
3
- import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
3
+ import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
4
+ import { currentSessionContext } from "./currentSessionContext.ts";
4
5
  import { SessionPolicy } from "./SessionPolicy.ts";
5
6
  import type { SessionShape } from "./session.ts";
6
7
  import { revalidateSession } from "./socketSession.ts";
@@ -14,12 +15,7 @@ export function revalidateStream<TSession extends SessionShape, TLookupRequireme
14
15
  if (!RpcSchema.isStreamSchema(rpc.successSchema)) {
15
16
  return effect;
16
17
  }
17
- const check = Effect.gen(function* () {
18
- const session = yield* lookup;
19
- if (Option.isNone(session) || session.value.user.id !== id) {
20
- return yield* new Unauthorized({ message: "Authentication required" });
21
- }
22
- });
18
+ const check = Effect.asVoid(currentSessionContext(id, lookup));
23
19
  return Effect.flatMap(SessionPolicy, (policy) =>
24
20
  Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds")),
25
21
  );
@@ -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 }),