@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,16 +1,18 @@
1
1
  import { Effect, Schema } from "effect";
2
2
  import { SqlClient, SqlSchema } from "effect/sql";
3
3
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+ import { tables } from "#server/better-auth/adapters/tables.ts";
4
5
  import { assignRole } from "./assignRole.js";
5
- export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (access, role, accounts) {
6
+ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (access, role, accounts, options) {
6
7
  const listed = yield* accounts;
7
8
  const context = yield* Effect.context();
8
- const sql = yield* SqlClient.SqlClient;
9
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
10
+ const { account: accountTable } = tables(options);
9
11
  const findUsers = SqlSchema.findAll({
10
12
  execute: ({ accountId, providerId, userId }) => sql `
11
- select distinct "userId" as id from "account"
12
- where "providerId" = ${providerId} and "accountId" = ${accountId}
13
- ${userId === undefined ? sql.literal("") : sql `and "userId" = ${userId}`}`,
13
+ select distinct ${sql(accountTable.userId)} as id from ${sql(accountTable.table)}
14
+ where ${sql(accountTable.providerId)} = ${providerId} and ${sql(accountTable.accountId)} = ${accountId}
15
+ ${userId === undefined ? sql.literal("") : sql `and ${sql(accountTable.userId)} = ${userId}`}`,
14
16
  Request: Schema.Struct({ accountId: Schema.String, providerId: Schema.String, userId: Schema.optional(Schema.String) }),
15
17
  Result: Schema.Struct({ id: Schema.String }),
16
18
  });
@@ -18,7 +20,7 @@ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (
18
20
  for (const account of listed) {
19
21
  const users = yield* findUsers({ ...account, userId }).pipe(Effect.mapError(() => new AuthUnavailable({ message: "Could not access provider accounts" })));
20
22
  for (const user of users) {
21
- yield* assignRole(access, user.id, role);
23
+ yield* assignRole(access, user.id, role, options);
22
24
  }
23
25
  }
24
26
  });
@@ -1 +1 @@
1
- {"version":3,"file":"accountRoleSeed.js","sourceRoot":"","sources":["../../../src/server/better-auth/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC7E,MAA2D,EAC3D,IAAoB,EACpB,QAAwD;IAExD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;IAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAuB,CAAC;IAC7D,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC;QACnC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;;0BAE3B,UAAU,sBAAsB,SAAS;KAC9D,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,kBAAkB,MAAM,EAAE,EAAE;QAC3E,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACvH,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAe;QACzD,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAC1D,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC,CAC7F,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC1B,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YAC1C,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;IACf,OAAO,EAAE,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;AAC7F,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"accountRoleSeed.js","sourceRoot":"","sources":["../../../src/server/better-auth/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAyB,MAAM,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAM7C,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC7E,MAA2D,EAC3D,IAAoB,EACpB,QAAwD,EACxD,OAA0B;IAE1B,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;IAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAuB,CAAC;IAC7D,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IAClD,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC;QACnC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;qBAChC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;WACxE,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,UAAU,QAAQ,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,SAAS;KACpG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,OAAO,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,MAAM,EAAE,EAAE;QAC9F,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACvH,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAe;QACzD,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAC1D,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC,CAC7F,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC1B,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;YACnD,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;IACf,OAAO,EAAE,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;AAC7F,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"assertSchema.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/assertSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGxC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;;;;AAE9G,qBAAa,qBAAsB,SAAQ,0BAEzC;IACD,IAAa,OAAO,WAEnB;CACD;AAED,eAAO,MAAM,sBAAsB,sTASjC,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { Effect, Schema } from "effect";
2
+ import { authColumnDrift } from "#server/better-auth/adapters/columnDrift.ts";
3
+ import { betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
2
4
  import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
3
- import { authColumnDrift } from "./columnDrift.js";
4
- import { betterAuthMigrationPlan } from "./migrationPlan.js";
5
5
  export class BetterAuthSchemaDrift extends Schema.TaggedError()("BetterAuthSchemaDrift", {
6
6
  missing: Schema.Array(Schema.String),
7
7
  }) {
@@ -0,0 +1 @@
1
+ {"version":3,"file":"assertSchema.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/assertSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAA0B,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAE9G,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CAAC,uBAAuB,EAAE;IAC/G,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;CACpC,CAAC;IACD,IAAa,OAAO;QACnB,OAAO,uCAAuC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACzE,CAAC;CACD;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAC3F,OAA4C,EAC5C,IAAwB;IAExB,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,CAAC,IAAI,qBAAqB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;AACF,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bearerSessions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/bearerSessions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,GAAG,QAAQ,CAEpH;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAO9E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAQ5E;AAED,wBAAsB,qBAAqB,CAAC,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwBjF"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"bearerSessions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/bearerSessions.ts"],"names":[],"mappings":"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"}
@@ -1,11 +1,12 @@
1
- import type { HttpServerRequest } from "effect/http";
1
+ import { Effect } from "effect";
2
+ import { HttpServerRequest } from "effect/http";
2
3
  export declare const PEER_IP_HEADER = "x-platform-client-ip";
3
4
  export declare function clientIpHeaders(options: {
4
5
  readonly clientIpHeader: string;
5
6
  readonly ipv6Subnet?: number | undefined;
6
7
  readonly trustedProxy?: string | undefined;
7
- }): (request: HttpServerRequest.HttpServerRequest, web: Request) => {
8
+ }): (web: Request) => Effect.Effect<{
8
9
  address: string | null;
9
10
  source: string;
10
- };
11
+ }, never, HttpServerRequest.HttpServerRequest>;
11
12
  //# sourceMappingURL=clientIp.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clientIp.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/clientIp.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,eAAO,MAAM,cAAc,yBAAyB,CAAC;AAErD,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACxC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;;;+CA2BA"}
@@ -1,7 +1,8 @@
1
1
  import { getIP } from "better-auth/api";
2
- import { Option } from "effect";
3
- import { trustedProxyPeer } from "#server/local.ts";
4
- import { trustedProxyRanges } from "#server/trustedProxyRanges.ts";
2
+ import { Effect, Option } from "effect";
3
+ import { HttpServerRequest } from "effect/http";
4
+ import { trustedProxyPeer } from "#server/adapters/local.ts";
5
+ import { trustedProxyRanges } from "#server/adapters/trustedProxyRanges.ts";
5
6
  export const PEER_IP_HEADER = "x-platform-client-ip";
6
7
  export function clientIpHeaders(options) {
7
8
  const trustedPeer = trustedProxyPeer(options.trustedProxy);
@@ -15,7 +16,8 @@ export function clientIpHeaders(options) {
15
16
  const resolved = {
16
17
  advanced: { ipAddress: { ...advanced.ipAddress, ipAddressHeaders: [PEER_IP_HEADER], trustedProxies: [] } },
17
18
  };
18
- return (request, web) => {
19
+ return Effect.fnUntraced(function* (web) {
20
+ const request = yield* HttpServerRequest.HttpServerRequest;
19
21
  web.headers.delete(PEER_IP_HEADER);
20
22
  const trusted = Option.exists(request.remoteAddress, trustedPeer);
21
23
  const forwardedIp = trusted && web.headers.has(options.clientIpHeader) ? getIP(web, { advanced }) : null;
@@ -28,6 +30,6 @@ export function clientIpHeaders(options) {
28
30
  web.headers.set(PEER_IP_HEADER, address);
29
31
  }
30
32
  return { address: getIP(web, resolved), source: forwardedIp === null ? "peer" : "forwarded" };
31
- };
33
+ });
32
34
  }
33
35
  //# sourceMappingURL=clientIp.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"clientIp.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/clientIp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,MAAM,CAAC,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAErD,MAAM,UAAU,eAAe,CAAC,OAI/B;IACA,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG;QAChB,SAAS,EAAE;YACV,gBAAgB,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC;YAC1C,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;YAC/E,cAAc,EAAE,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC;SACxD;KACD,CAAC;IACF,MAAM,QAAQ,GAAG;QAChB,QAAQ,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE;KAC1G,CAAC;IACF,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,GAAY;QAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;QAC3D,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACzG,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACtC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,IAAI,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/F,CAAC,CAAC,CAAC;AACJ,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"closeRoleEndpoints.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/closeRoleEndpoints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAMlG"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"closeRoleEndpoints.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/closeRoleEndpoints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,MAAM,UAAU,kBAAkB,CAAqC,OAAiB;IACvF,OAAO;QACN,GAAG,OAAO;QACV,aAAa,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC;QAChH,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;KAC1H,CAAC;AACH,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"columnDrift.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/columnDrift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAoC3F,eAAO,MAAM,eAAe,iLA0B1B,CAAC"}
@@ -2,6 +2,7 @@ import { getSchema } from "better-auth/db";
2
2
  import { matchType } from "better-auth/db/migration";
3
3
  import { Effect, Schema } from "effect";
4
4
  import { SqlClient } from "effect/sql";
5
+ import { tables } from "#server/better-auth/adapters/tables.ts";
5
6
  const Column = Schema.Struct({
6
7
  column: Schema.String,
7
8
  default: Schema.NullOr(Schema.String),
@@ -42,11 +43,11 @@ export const authColumnDrift = Effect.fnUntraced(function* (options, role) {
42
43
  }
43
44
  }
44
45
  if (role !== undefined) {
45
- const table = options.user?.modelName ?? "user";
46
- const column = columns.find((entry) => entry.table === table && entry.column === "role");
46
+ const { user } = tables(options);
47
+ const column = columns.find((entry) => entry.table === user.table && entry.column === user.role);
47
48
  const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
48
49
  if (column !== undefined && column.default !== `${value}::text`) {
49
- missing.push(`column ${table}.role requires DEFAULT ${value}`);
50
+ missing.push(`column ${user.table}.${user.role} requires DEFAULT ${value}`);
50
51
  }
51
52
  }
52
53
  return missing;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"columnDrift.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/columnDrift.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,MAAM,EAAE,MAAM,wCAAwC,CAAC;AAEhE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAC5B,MAAM,EAAE,MAAM,CAAC,MAAM;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;IACrC,QAAQ,EAAE,MAAM,CAAC,MAAM;IACvB,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAGH,SAAS,cAAc,CACtB,KAAa,EACb,IAAY,EACZ,KAA6D,EAC7D,MAA0B,EAC1B,SAAkB;IAElB,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,UAAU,EAAE,KAAK,KAAK,IAAI,CAAC,IAAI,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IACtG,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,EAAE,CAAC;QAC/C,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,kBAAkB,IAAI,WAAW,MAAM,CAAC,IAAI,GAAG,CAAC,CAAC;IACtF,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;QAC3D,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,oBAAoB,CAAC,CAAC;IAC3D,CAAC;IACD,IAAI,KAAK,CAAC,QAAQ,KAAK,KAAK,IAAI,MAAM,CAAC,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,OAAO,KAAK,IAAI,IAAI,KAAK,CAAC,YAAY,KAAK,SAAS,EAAE,CAAC;QACzH,OAAO,CAAC,IAAI,CAAC,UAAU,KAAK,IAAI,IAAI,yBAAyB,CAAC,CAAC;IAChE,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAA0B,EAAE,IAAwB;IAC/G,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;;wEAE6C,CAAC,gBAAgB,CAAC,IAAI,CAC5F,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAChE,CAAC;IACF,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;QAClE,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;YAC9B,SAAS;QACV,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAC3D,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,GAAG,cAAc,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,KAAK,QAAQ,CAAC,CAAC,CAAC;QAClH,CAAC;IACF,CAAC;IACD,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,CAAC;QACjG,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;QAC5D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,OAAO,KAAK,GAAG,KAAK,QAAQ,EAAE,CAAC;YACjE,OAAO,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,IAAI,qBAAqB,KAAK,EAAE,CAAC,CAAC;QAC7E,CAAC;IACF,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAwB,KAAK,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAiBvC,eAAO,MAAM,kBAAkB,oEA0C7B,CAAC"}
1
+ {"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAwB,KAAK,EAAE,MAAM,QAAQ,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AA4BvC,eAAO,MAAM,kBAAkB,oEA+C7B,CAAC"}
@@ -1,24 +1,39 @@
1
- import { Effect, Exit, Option, Schema, Scope } from "effect";
1
+ import { APIError } from "better-auth/api";
2
+ import { Cause, Effect, Exit, Option, Schema, Scope } from "effect";
2
3
  import { SqlClient } from "effect/sql";
4
+ import { authCallSignal } from "#server/adapters/authCall.ts";
3
5
  import { betterAuthTransaction } from "./transaction.js";
4
6
  const Result = Schema.Struct({ command: Schema.String, rowCount: Schema.Number, rows: Schema.Array(Schema.Unknown) });
7
+ function databaseResult(exit) {
8
+ if (Exit.isSuccess(exit)) {
9
+ return exit.value;
10
+ }
11
+ if (Cause.hasInterruptsOnly(exit.cause)) {
12
+ throw new APIError("REQUEST_TIMEOUT", { code: "REQUEST_CANCELLED", message: "Authentication request was cancelled" });
13
+ }
14
+ throw Cause.squash(exit.cause);
15
+ }
5
16
  export const betterAuthDatabase = Effect.fn("Identity.betterAuthDatabase")(function* () {
6
17
  const sql = yield* SqlClient.SqlClient;
7
18
  const transaction = yield* Effect.serviceOption(sql.transactionService);
8
19
  const parent = yield* Scope.Scope;
9
20
  const context = yield* Effect.context();
10
21
  const run = Effect.runPromiseWith(context);
22
+ const runQuery = Effect.runPromiseExitWith(context);
11
23
  const pool = {
12
24
  async connect() {
13
25
  const scope = await run(Scope.fork(parent));
14
- const connection = await run((Option.isSome(transaction) ? Effect.succeed(transaction.value[0]) : sql.reserve).pipe(Scope.provide(scope), Effect.onError((cause) => Scope.close(scope, Exit.failCause(cause)))));
26
+ const connection = await runQuery((Option.isSome(transaction) ? Effect.succeed(transaction.value[0]) : sql.reserve).pipe(Scope.provide(scope), Effect.onError((cause) => Scope.close(scope, Exit.failCause(cause)))), { signal: authCallSignal.getStore() }).then(databaseResult);
15
27
  const control = Option.isSome(transaction) ? await run(betterAuthTransaction.pipe(Scope.provide(scope))) : undefined;
16
28
  function query(text, parameters = []) {
17
29
  if (typeof text !== "string") {
18
30
  throw new Error("Better Auth database does not support cursors");
19
31
  }
20
32
  const nested = control?.(text);
21
- return (nested === undefined ? run(connection.executeRaw(text, parameters)) : nested.then(() => ({ command: text, rowCount: 0, rows: [] }))).then(Schema.decodeUnknownSync(Result));
33
+ const signal = text === "begin" || text === "commit" || text === "rollback" ? undefined : authCallSignal.getStore();
34
+ return (nested === undefined
35
+ ? runQuery(connection.executeRaw(text, parameters), { signal }).then(databaseResult)
36
+ : nested.then(() => ({ command: text, rowCount: 0, rows: [] }))).then(Schema.decodeUnknownSync(Result));
22
37
  }
23
38
  return {
24
39
  query,
@@ -1 +1 @@
1
- {"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"hookRuntime.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,eAAO,MAAM,WAAW,GAAgC,CAAC;cAIvC,CAAC,QAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,UAAU,WAAW,GAAG,SAAS,KAAG,OAAO,CAAC,CAAC,CAAC;iBAiBxG,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;YAc5D,CAAC"}
1
+ {"version":3,"file":"hookRuntime.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,eAAO,MAAM,WAAW,GAAgC,CAAC;cAIvC,CAAC,QAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,UAAU,WAAW,GAAG,SAAS,KAAG,OAAO,CAAC,CAAC,CAAC;iBAiBxG,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;YAc5D,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { AsyncLocalStorage } from "node:async_hooks";
2
2
  import { APIError } from "better-auth/api";
3
3
  import { Context, Effect, Result } from "effect";
4
+ import { authCall } from "#server/adapters/authCall.ts";
4
5
  export const hookRuntime = Effect.fnUntraced(function* () {
5
6
  const context = yield* Effect.context();
6
7
  const requests = new AsyncLocalStorage();
@@ -26,7 +27,7 @@ export const hookRuntime = Effect.fnUntraced(function* () {
26
27
  const state = {
27
28
  context: Context.merge(context, fiber.context),
28
29
  };
29
- const exit = yield* Effect.exit(Effect.tryPromise((signal) => requests.run(state, () => request(signal))));
30
+ const exit = yield* Effect.exit(authCall((signal) => requests.run(state, () => request(signal))));
30
31
  if (state.cause !== undefined) {
31
32
  return yield* Effect.failCause(state.cause);
32
33
  }
@@ -1 +1 @@
1
- {"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG7D,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAwE,CAAC;IAC/G,OAAO;QACN,OAAO,EAAE,KAAK,EAAK,IAAoD,EAAE,MAA+B,EAAc,EAAE;YACvH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACpC,SAAS,QAAQ,CAAC,KAAyB;gBAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;oBACvB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBAC3B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC5I,MAAM;aACN,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACjG,CAAC;YACD,OAAO,MAAM,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,UAAU,EAAE,CAAI,OAA4C,EAAE,EAAE,CAC/D,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,KAAK,GAAyE;gBACnF,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;aAC9C,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAC3G,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;QACpB,CAAC,CAAC,CACF;KACF,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAwE,CAAC;IAC/G,OAAO;QACN,OAAO,EAAE,KAAK,EAAK,IAAoD,EAAE,MAA+B,EAAc,EAAE;YACvH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACpC,SAAS,QAAQ,CAAC,KAAyB;gBAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;oBACvB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBAC3B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC5I,MAAM;aACN,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACjG,CAAC;YACD,OAAO,MAAM,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,UAAU,EAAE,CAAI,OAA4C,EAAE,EAAE,CAC/D,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,KAAK,GAAyE;gBACnF,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;aAC9C,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;QACpB,CAAC,CAAC,CACF;KACF,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAE3F,eAAO,MAAM,iBAAiB,+OAO5B,CAAC"}
@@ -1,6 +1,6 @@
1
1
  import { Effect } from "effect";
2
2
  import { SqlClient } from "effect/sql";
3
- import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.js";
3
+ import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
4
4
  export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (options, role) {
5
5
  const plan = yield* betterAuthMigrationPlan(options, role);
6
6
  const sql = yield* SqlClient.SqlClient;
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAG1G,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EACjF,OAA4C,EAC5C,IAAwB;IAExB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrationPlan.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/migrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAG9G,eAAO,MAAM,uBAAuB;4BAGD,OAAO;;;;2FAwBxC,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,UAO3C"}
@@ -3,6 +3,7 @@ import { Effect } from "effect";
3
3
  import { SqlClient } from "effect/sql";
4
4
  import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
5
5
  import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
6
+ import { tables } from "#server/better-auth/adapters/tables.ts";
6
7
  export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (options, role, safety = { throwOnUnsafe: true }) {
7
8
  const database = yield* betterAuthDatabase();
8
9
  const plan = yield* Effect.tryPromise(() => getMigrations({ ...storedRoleOptions(options, role), database }, safety));
@@ -17,12 +18,13 @@ export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPl
17
18
  let ddl = compiled === ";" ? "" : compiled;
18
19
  if (role !== undefined) {
19
20
  const sql = (yield* SqlClient.SqlClient).withoutTransforms();
20
- const table = options.user?.modelName ?? "user";
21
+ const { user } = tables(options);
21
22
  const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
22
- const identifier = sql `${sql(table)}`.compile()[0];
23
- ddl += `\nalter table ${identifier} alter column role set default ${value};\n`;
24
- ddl += `update ${identifier} set role = ${value} where role is null;\n`;
25
- ddl += `alter table ${identifier} alter column role set not null;`;
23
+ const identifier = sql `${sql(user.table)}`.compile()[0];
24
+ const column = sql `${sql(user.role)}`.compile()[0];
25
+ ddl += `\nalter table ${identifier} alter column ${column} set default ${value};\n`;
26
+ ddl += `update ${identifier} set ${column} = ${value} where ${column} is null;\n`;
27
+ ddl += `alter table ${identifier} alter column ${column} set not null;`;
26
28
  }
27
29
  return { ddl, missing };
28
30
  });
@@ -0,0 +1 @@
1
+ {"version":3,"file":"migrationPlan.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/migrationPlan.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../../src/server/better-auth/adapters/migrations/generate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAE3F,eAAO,MAAM,2BAA2B,6NAOtC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { Effect } from "effect";
2
- import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/migrationPlan.ts";
2
+ import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
3
3
  export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (options, role) {
4
4
  const plan = yield* betterAuthMigrationPlan(options, role);
5
5
  const sql = authMigrationSql(plan.ddl).replaceAll("\\", "\\\\").replaceAll("`", "\\`").replaceAll("${", "\\${");
@@ -0,0 +1 @@
1
+ {"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../../src/server/better-auth/adapters/migrations/generate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAG1G,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,EAAE,CAAC,sCAAsC,CAAC,CAAC,QAAQ,CAAC,EACrG,OAA4C,EAC5C,IAAwB;IAExB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChH,OAAO,2LAA2L,GAAG,aAAa,CAAC;AACpN,CAAC,CAAC,CAAC"}
@@ -1,14 +1,14 @@
1
1
  import { type BetterAuthOptions } from "better-auth";
2
- import { Config, Effect } from "effect";
2
+ import { Config, Effect, Layer } 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 } from "#server/better-auth/adapters/bearerSessions.ts";
4
6
  import { type BetterAuthHardeningOptions } from "#server/better-auth/adapters/hardening.ts";
5
7
  import { type StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
6
- import { type BearerSessionsOptions } from "#server/better-auth/bearerSessions.ts";
8
+ import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
9
+ import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
10
+ import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
7
11
  import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
8
- import type { AccountRoleSeed } from "./accountRoleSeed.ts";
9
- import type { BetterAuthDatabaseHooks } from "./databaseHooks.ts";
10
- import type { BetterAuthEmails } from "./emails.ts";
11
- import type { BetterAuthPasswordReset } from "./PasswordReset.ts";
12
12
  export type BetterAuthMountOptions<E = never, R = never> = {
13
13
  readonly bearerSessions?: BearerSessionsOptions | undefined;
14
14
  readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
@@ -24,9 +24,10 @@ export type BetterAuthMountOptions<E = never, R = never> = {
24
24
  readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R>;
25
25
  }));
26
26
  export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
27
+ admitsUser: (userId: string) => Effect.Effect<boolean, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
27
28
  admittedSessions: {
28
- <TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../session.ts").SessionProvider<TSession>;
29
- <TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>, getProviderAccounts: import("../adapters/betterAuthSessions.ts").GetProviderAccounts): import("../session.ts").SessionProvider<import("../adapters/betterAuthSessions.ts").SessionWithProviderAccounts<TSession>>;
29
+ <TSession extends import("../../session.ts").SessionShape>(getSession: import("../../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../../session.ts").SessionProvider<TSession>;
30
+ <TSession extends import("../../session.ts").SessionShape>(getSession: import("../../adapters/betterAuthSessions.ts").GetSession<TSession>, getProviderAccounts: import("../../adapters/betterAuthSessions.ts").GetProviderAccounts): import("../../session.ts").SessionProvider<import("../../adapters/betterAuthSessions.ts").SessionWithProviderAccounts<TSession>>;
30
31
  };
31
32
  auth: import("better-auth").Auth<TOptions & {
32
33
  advanced: {
@@ -228,7 +229,7 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
228
229
  [key: string]: import("better-auth").BetterAuthRateLimitRule | false | ((request: Request, currentRule: import("better-auth").BetterAuthRateLimitRule) => import("better-auth").Awaitable<false | import("better-auth").BetterAuthRateLimitRule>);
229
230
  } | undefined;
230
231
  storage?: ("memory" | "database" | "secondary-storage") | undefined;
231
- customStorage?: import("better-auth").BetterAuthRateLimitStorage;
232
+ customStorage: import("better-auth").BetterAuthRateLimitStorage;
232
233
  enabled: boolean;
233
234
  };
234
235
  secret: string;
@@ -262,10 +263,10 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
262
263
  }) | undefined;
263
264
  }>;
264
265
  revokeUnadmitted: Effect.Effect<import("#server/better-auth/revokeUnadmitted.ts").RevokedSessions, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError, never>;
265
- routes: import("effect/Layer").Layer<never, never, import("effect/http/HttpRouter").HttpRouter>;
266
+ routes: Layer.Layer<never, never, import("effect/http/HttpRouter").HttpRouter | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").InternalError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RequestParseError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RouteNotFound>>;
266
267
  sessions: {
267
268
  readonly roles?: RoleSet;
268
- readonly provider: import("../session.ts").SessionProvider<import("../session.ts").UserSessionShape>;
269
+ readonly provider: import("../../session.ts").SessionProvider<import("../../session.ts").UserSessionShape>;
269
270
  };
270
- }, E | Config.ConfigError, R | import("effect/Scope").Scope>;
271
+ }, E | Config.ConfigError, R | import("effect/Scope").Scope | import("@shivaedev/rate-limit/Store.ts").Store>;
271
272
  //# sourceMappingURL=mount.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAoB,MAAM,QAAQ,CAAC;AACjE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAC9E,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,gDAAgD,CAAC;AAKhH,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,2CAA2C,CAAC;AAO3G,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAE9G,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AAEtE,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAEpF,OAAO,EAAmC,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAInH,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI;IAC1D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,SAAS,CAAC,EAAE,0BAA0B,CAAC;IAChD,QAAQ,CAAC,eAAe,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAClE,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD,GAAG,CACD;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,GAC7D,CAAC,iBAAiB,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,CAAC,CAChH,CAAC;AAEF,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6GA+EpI,CAAC"}
@@ -1,22 +1,24 @@
1
1
  import { betterAuth } from "better-auth";
2
- import { Config, Effect, Option, Redacted } from "effect";
2
+ import { Config, Effect, Layer, Option, Redacted } from "effect";
3
+ import { withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
4
+ import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
5
+ import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
3
6
  import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
4
7
  import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
5
8
  import { withHardening } from "#server/better-auth/adapters/hardening.ts";
6
9
  import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
10
+ import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
7
11
  import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
12
+ import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
8
13
  import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
9
14
  import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
10
15
  import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
11
- import { withBearerSessions } from "#server/better-auth/bearerSessions.ts";
12
- import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
13
- import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
14
- import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
16
+ import { admittedSessions } from "#server/better-auth/admittedSessions.ts";
17
+ import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
15
18
  import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
16
- import { signInGate } from "#server/better-auth/signInGate.ts";
17
- import { admittedSessions } from "./admittedSessions.js";
18
- import { closeRoleEndpoints } from "./closeRoleEndpoints.js";
19
- import { mountedSessions } from "./mountedSessions.js";
19
+ import { fromStorage, signInGate } from "#server/better-auth/signInGate.ts";
20
+ import { providerFailure } from "#server/providerFailure.ts";
21
+ import { authRouteHandler } from "./routeHandler.js";
20
22
  export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (options, mount = {}) {
21
23
  const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
22
24
  const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
@@ -37,7 +39,7 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (
37
39
  const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
38
40
  const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
39
41
  const rateLimit = options.rateLimit;
40
- const customStorage = rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
42
+ const customStorage = yield* rateLimitStorage;
41
43
  const auth = betterAuth({
42
44
  ...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
43
45
  advanced: {
@@ -57,25 +59,35 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (
57
59
  databaseHooks: seeded.databaseHooks,
58
60
  rateLimit: {
59
61
  ...rateLimit,
60
- ...(customStorage === undefined ? {} : { customStorage }),
62
+ customStorage,
61
63
  enabled: rateLimitEnabled,
62
64
  },
63
65
  secret,
64
66
  trustedOrigins: options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
65
67
  user: gate.active ? gated.user : configured.user,
66
68
  });
67
- const authRoutes = mountRoutes(auth, {
68
- bearerSessions: mount.bearerSessions,
69
- clientIpHeader,
70
- ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
71
- roles: mount.roles,
72
- runRequest: runtime.runRequest,
73
- trustedProxy,
74
- });
69
+ const authRoutes = mountRoutes.pipe(Layer.provide(Layer.succeed(AuthRouteHandler, {
70
+ handle: authRouteHandler(auth, {
71
+ bearerSessions: mount.bearerSessions,
72
+ clientIpHeader,
73
+ ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
74
+ roles: mount.roles,
75
+ runRequest: runtime.runRequest,
76
+ trustedProxy,
77
+ }),
78
+ })));
75
79
  const admit = admittedSessions(gate, () => auth.$context, mount.bearerSessions);
80
+ const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
81
+ const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId) {
82
+ if (!admission.active) {
83
+ return true;
84
+ }
85
+ const storage = yield* fromStorage(() => auth.$context);
86
+ return yield* admission.admitsUser(storage, userId).pipe(Effect.catch(providerFailure));
87
+ });
76
88
  const revoke = revokeUnadmitted(gate, () => auth.$context);
77
89
  const lookupSession = Reflect.get(auth.api, "getSession");
78
90
  const sessions = mountedSessions(lookupSession, admit, mount.roles);
79
- return { admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
91
+ return { admitsUser, admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
80
92
  });
81
93
  //# sourceMappingURL=mount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mountedSessions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mountedSessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAW1F,wBAAgB,eAAe,CAC9B,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,CAAC,QAAQ,SAAS,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,eAAe,CAAC,QAAQ,CAAC,EACrG,KAAK,CAAC,EAAE,OAAO,GACb;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAA;CAAE,CAUpF"}
@@ -0,0 +1 @@
1
+ {"version":3,"file":"mountedSessions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mountedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAIjD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;AAOlI,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAA0B,EAAE,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC;AAErG,MAAM,UAAU,eAAe,CAC9B,MAAe,EACf,KAAqG,EACrG,KAAe;IAEf,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;IACnE,OAAO;QACN,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;QACzC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACjC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CACpC,MAAM,UAAU,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAC3G,CACD;KACD,CAAC;AACH,CAAC"}
@@ -0,0 +1,17 @@
1
+ import type { AuthContext } from "better-auth";
2
+ import { Effect, Layer } from "effect";
3
+ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
4
+ import { OauthGrants } from "#server/oauthGrants.ts";
5
+ export interface OauthGrantAuth {
6
+ readonly $context: Promise<{
7
+ readonly adapter: Pick<AuthContext["adapter"], "findOne" | "findMany"> & {
8
+ readonly transaction: <A>(run: (adapter: Pick<AuthContext["adapter"], "deleteMany">) => Promise<A>) => Promise<A>;
9
+ };
10
+ readonly internalAdapter: Pick<AuthContext["internalAdapter"], "findUserById">;
11
+ }>;
12
+ }
13
+ export declare function betterAuthOauthGrants(options: {
14
+ readonly auth: OauthGrantAuth;
15
+ readonly admitsUser: (userId: string) => Effect.Effect<boolean, AuthUnavailable>;
16
+ }): Layer.Layer<OauthGrants, never, never>;
17
+ //# sourceMappingURL=oauthGrants.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oauthGrants.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAkB,MAAM,QAAQ,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAc,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAEjE,MAAM,WAAW,cAAc;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,UAAU,CAAC,GAAG;YACxE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;SAClH,CAAC;QACF,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,WAAW,CAAC,iBAAiB,CAAC,EAAE,cAAc,CAAC,CAAC;KAC/E,CAAC,CAAC;CACH;AAMD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC9C,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC;CACjF,0CA4DA"}