@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
@@ -0,0 +1,19 @@
1
+ import { Context, Effect, Option, Schema } from "effect";
2
+ import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
3
+ import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
4
+ import { providerAccountsUser } from "./providerAccountsUser.js";
5
+ export const currentSessionContext = Effect.fnUntraced(function* (id, lookup) {
6
+ const session = yield* lookup;
7
+ if (Option.isNone(session) || session.value.user.id !== id) {
8
+ return yield* new Unauthorized({ message: "Authentication required" });
9
+ }
10
+ let context = yield* Effect.context();
11
+ if (Option.isSome(Context.getOption(context, SessionUser))) {
12
+ context = Context.add(context, SessionUser, Schema.decodeUnknownSync(SessionUserSchema)(session.value.user));
13
+ }
14
+ if (Option.isSome(Context.getOption(context, SessionUserWithProviderAccounts))) {
15
+ context = Context.add(context, SessionUserWithProviderAccounts, yield* providerAccountsUser(session.value.user));
16
+ }
17
+ return context;
18
+ });
19
+ //# sourceMappingURL=currentSessionContext.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"currentSessionContext.js","sourceRoot":"","sources":["../../src/server/currentSessionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAwC,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/D,EAAU,EACV,MAA8E;IAE9E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9G,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAClH,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC"}
@@ -0,0 +1,21 @@
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
+ export declare const OauthGrant: Schema.Struct<{
5
+ readonly clientId: Schema.String;
6
+ readonly scopes: Schema.$Array<Schema.String>;
7
+ }>;
8
+ export type OauthGrant = typeof OauthGrant.Type;
9
+ declare const OauthGrants_base: Context.ServiceClass<OauthGrants, "@shivaedev/identity/OauthGrants", {
10
+ readonly list: (userId: string, page: {
11
+ readonly limit: number;
12
+ readonly offset?: number;
13
+ }) => Effect.Effect<readonly OauthGrant[], AuthUnavailable>;
14
+ readonly revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable>;
15
+ readonly revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable>;
16
+ readonly resolveSubject: (userId: string, clientId: string) => Effect.Effect<Option.Option<SessionUserValue>, AuthUnavailable>;
17
+ }>;
18
+ export declare class OauthGrants extends OauthGrants_base {
19
+ }
20
+ export {};
21
+ //# sourceMappingURL=oauthGrants.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oauthGrants.d.ts","sourceRoot":"","sources":["../../src/server/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,eAAO,MAAM,UAAU;;;EAAkF,CAAC;AAC1G,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;;mBAK/B,CACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,MAAM,CAAC,MAAM,CAAC,SAAS,UAAU,EAAE,EAAE,eAAe,CAAC;2BACnC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC;+BACtE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC;6BAC1D,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,EAAE,eAAe,CAAC;;AAThI,qBAAa,WAAY,SAAQ,gBAWK;CAAG"}
@@ -0,0 +1,5 @@
1
+ import { Context, Schema } from "effect";
2
+ export const OauthGrant = Schema.Struct({ clientId: Schema.String, scopes: Schema.Array(Schema.String) });
3
+ export class OauthGrants extends Context.Service()("@shivaedev/identity/OauthGrants") {
4
+ }
5
+ //# sourceMappingURL=oauthGrants.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../src/server/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4B,MAAM,EAAE,MAAM,QAAQ,CAAC;AAInE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAG1G,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAW7C,CAAC,iCAAiC,CAAC;CAAG"}
@@ -14,7 +14,6 @@ export interface TrustedOriginsOptions {
14
14
  readonly trustedProxy?: string | undefined;
15
15
  };
16
16
  }
17
- export declare function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy;
18
17
  export declare function originRequest(headers: Headers.Headers, rpc: string, remoteAddress?: Option.Option<string>): OriginRequest;
19
18
  export declare const transportOriginRequest: (headers: Headers.Headers, rpc: string) => Effect.Effect<OriginRequest, never, never>;
20
19
  //# sourceMappingURL=origin.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"origin.d.ts","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;AAGzD,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC;AAC/D,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CACrE;AACD,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,YAAY,CAQ3E;AACD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAiB,GAAG,aAAa,CAOxI;AAED,eAAO,MAAM,sBAAsB,uFAQjC,CAAC"}
1
+ {"version":3,"file":"origin.d.ts","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC;AAC/D,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CACrE;AACD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAiB,GAAG,aAAa,CAOxI;AAED,eAAO,MAAM,sBAAsB,uFAQjC,CAAC"}
@@ -1,14 +1,6 @@
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
- export function trustedOrigins(options) {
6
- const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
7
- return (request) => Option.match(request.origin, {
8
- onNone: () => options.missing === "allow",
9
- onSome: (value) => options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
10
- });
11
- }
12
4
  export function originRequest(headers, rpc, remoteAddress = Option.none()) {
13
5
  return {
14
6
  headers,
@@ -1 +1 @@
1
- {"version":3,"file":"origin.js","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAa/D,MAAM,UAAU,cAAc,CAAC,OAA8B;IAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAClH,OAAO,CAAC,OAAO,EAAE,EAAE,CAClB,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO;QACzC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI;KAC5I,CAAC,CAAC;AACL,CAAC;AACD,MAAM,UAAU,aAAa,CAAC,OAAwB,EAAE,GAAW,EAAE,aAAa,GAA0B,MAAM,CAAC,IAAI,EAAE;IACxH,OAAO;QACN,OAAO;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC;QACtC,aAAa;QACb,GAAG;KACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAClI,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACjF,OAAO,aAAa,CACnB,SAAS,EACT,GAAG,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CACvD,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"origin.js","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAa/D,MAAM,UAAU,aAAa,CAAC,OAAwB,EAAE,GAAW,EAAE,aAAa,GAA0B,MAAM,CAAC,IAAI,EAAE;IACxH,OAAO;QACN,OAAO;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC;QACtC,aAAa;QACb,GAAG;KACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAClI,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACjF,OAAO,aAAa,CACnB,SAAS,EACT,GAAG,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CACvD,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -1,7 +1,7 @@
1
- import { Effect, Option } from "effect";
1
+ import { Effect, type Option } from "effect";
2
2
  import { type Rpc } 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
4
  import { SessionPolicy } from "./SessionPolicy.ts";
5
5
  import type { SessionShape } from "./session.ts";
6
- export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | Unauthorized, R | TLookupRequirements | SessionPolicy>;
6
+ export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized, R | TLookupRequirements | SessionPolicy>;
7
7
  //# sourceMappingURL=revalidateStream.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,YAAY,EAAE,mBAAmB,EAClF,GAAG,EAAE,GAAG,CAAC,YAAY,EACrB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,EAAE,mBAAmB,CAAC,IAExF,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,+GAc/C"}
1
+ {"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,YAAY,EAAE,mBAAmB,EAClF,GAAG,EAAE,GAAG,CAAC,YAAY,EACrB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,EAAE,mBAAmB,CAAC,IAExF,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uJAS/C"}
@@ -1,6 +1,6 @@
1
- import { Effect, Option } from "effect";
1
+ import { Effect } from "effect";
2
2
  import { RpcSchema } from "effect/rpc";
3
- import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
3
+ import { currentSessionContext } from "./currentSessionContext.js";
4
4
  import { SessionPolicy } from "./SessionPolicy.js";
5
5
  import { revalidateSession } from "./socketSession.js";
6
6
  export function revalidateStream(rpc, id, lookup) {
@@ -8,12 +8,7 @@ export function revalidateStream(rpc, id, lookup) {
8
8
  if (!RpcSchema.isStreamSchema(rpc.successSchema)) {
9
9
  return effect;
10
10
  }
11
- const check = Effect.gen(function* () {
12
- const session = yield* lookup;
13
- if (Option.isNone(session) || session.value.user.id !== id) {
14
- return yield* new Unauthorized({ message: "Authentication required" });
15
- }
16
- });
11
+ const check = Effect.asVoid(currentSessionContext(id, lookup));
17
12
  return Effect.flatMap(SessionPolicy, (policy) => Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds")));
18
13
  };
19
14
  }
@@ -1 +1 @@
1
- {"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAwC,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAC/B,GAAqB,EACrB,EAAU,EACV,MAAgG;IAEhG,OAAO,CAAU,MAA8B,EAAE,EAAE;QAClD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC5D,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;YACxE,CAAC;QACF,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,0BAA0B,IAAI,YAAY,CAAC,CAAC,CACrG,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAC/B,GAAqB,EACrB,EAAU,EACV,MAAgG;IAEhG,OAAO,CAAU,MAA8B,EAAE,EAAE;QAClD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,0BAA0B,IAAI,YAAY,CAAC,CAAC,CACrG,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EACN,QAAQ,EAER,WAAW,EAEX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAG7H,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;KACpB,CAAC;CACF;AACD,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,YAAY;IAC7D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;CACpG;AACD,eAAO,MAAM,cAAc,qMAGzB,CAAC;AAIH,wBAAgB,kBAAkB,qDAqBjC;AACD,wBAAgB,uBAAuB,0DAqBtC;AACD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACrD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CAChC;AACD,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,IAClE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,0KAc/C;AACD,wBAAgB,sBAAsB,yDAcrC;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IACrE,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;CACpD;AACD,wBAAgB,0CAA0C,6EAyBzD"}
1
+ {"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EACN,QAAQ,EAER,WAAW,EAEX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAG7H,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;KACpB,CAAC;CACF;AACD,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,YAAY;IAC7D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;CACpG;AACD,eAAO,MAAM,cAAc,qMAGzB,CAAC;AAIH,wBAAgB,kBAAkB,qDAqBjC;AACD,wBAAgB,uBAAuB,0DAsBtC;AACD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACrD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CAChC;AACD,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,IAClE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,0KAc/C;AACD,wBAAgB,sBAAsB,yDAcrC;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IACrE,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;CACpD;AACD,wBAAgB,0CAA0C,6EAyBzD"}
@@ -30,10 +30,11 @@ export function maybeAuthenticatedLayer() {
30
30
  return Layer.effect(MaybeAuthenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc, payload }) => Effect.gen(function* () {
31
31
  const session = yield* resolveSession(headers, rpc._tag);
32
32
  if (Option.isNone(session)) {
33
- return yield* Effect.provideService(authorizeReads(effect, { payload, rpc }, Option.none()), OptionalIdentity, Option.none());
33
+ const invocation = authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.none());
34
+ return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
34
35
  }
35
36
  const id = yield* identified(session.value.user.id);
36
- return yield* authorizeReads(effect, { payload, rpc }, Option.some({ id })).pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(OptionalIdentity, Option.some({ id })), Effect.annotateLogs({ userId: id }));
37
+ return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(OptionalIdentity, Option.some({ id })), Effect.annotateLogs({ userId: id }));
37
38
  }).pipe(Effect.provideService(SessionPolicy, policy))));
38
39
  }
39
40
  export function withSessionUser(headers, operation) {
@@ -1 +1 @@
1
- {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,EAA6B,MAAM,QAAQ,CAAC;AAKvG,OAAO,EAAwC,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEzG,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAEhD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;CAClC;AA8CD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAepG"}
1
+ {"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+C,KAAK,EAA6B,MAAM,QAAQ,CAAC;AAKvG,OAAO,EAAwC,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEzG,OAAO,EAA+F,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAE7I,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;CAClC;AA8CD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAkBpG"}
@@ -5,7 +5,7 @@ import { redact } from "@shivaedev/errors/redact.ts";
5
5
  import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
6
6
  import { isSensitiveKey, REDACTED, redactText } from "@shivaedev/errors/sensitive.ts";
7
7
  import { RequestId } from "#identity.ts";
8
- import { RequestTracing } from "#middleware.ts";
8
+ import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated, RequestTracing } from "#middleware.ts";
9
9
  import { commandChanges } from "#server/commandChanges.ts";
10
10
  const ACCEPTED_REQUEST_ID = /^[A-Za-z0-9._:-]{1,128}$/u;
11
11
  function hex(byte) {
@@ -48,7 +48,8 @@ export function requestTracingLayer(options = {}) {
48
48
  return Layer.succeed(RequestTracing, (effect, { headers, payload, rpc }) => Effect.gen(function* () {
49
49
  const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
50
50
  yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
51
- const invocation = Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
51
+ const hasSession = [Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated].some((middleware) => rpc.middlewares.has(middleware));
52
+ const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
52
53
  return yield* invocation.pipe(Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))), Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)), Effect.provideService(RequestId, requestId), Effect.annotateLogs({ requestId, "rpc.method": rpc._tag }), Effect.withLogSpan("rpc.duration"));
53
54
  }));
54
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"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"}
@@ -100,7 +100,7 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
100
100
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
101
101
  }>, Schema.Struct<{
102
102
  readonly _tag: Schema.Literal<"Resync">;
103
- }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
103
+ }>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
104
104
  readonly cursor: Schema.optionalKey<Schema.Struct<{
105
105
  readonly id: Schema.String;
106
106
  readonly lastActivityAt: Schema.DateTimeUtcFromString;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/identity",
3
- "version": "0.17.0",
3
+ "version": "0.19.0",
4
4
  "description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
5
5
  "keywords": [
6
6
  "effect"
@@ -45,21 +45,23 @@
45
45
  "README.md"
46
46
  ],
47
47
  "dependencies": {
48
- "@shivaedev/access": "0.3.5",
49
- "@shivaedev/changes": "0.6.0",
50
- "@shivaedev/contract": "0.30.1",
51
- "@shivaedev/errors": "0.4.1",
52
- "@shivaedev/sql": "0.31.0"
48
+ "@shivaedev/access": "0.3.6",
49
+ "@shivaedev/changes": "0.8.0",
50
+ "@shivaedev/contract": "0.31.0",
51
+ "@shivaedev/errors": "0.5.0",
52
+ "@shivaedev/rate-limit": "0.2.1",
53
+ "@shivaedev/sql": "0.33.0"
53
54
  },
54
55
  "devDependencies": {
56
+ "@better-auth/oauth-provider": "1.7.12",
55
57
  "@effect/platform-node": "4.0.6",
56
58
  "@effect/sql-pg": "4.0.6",
57
- "@shivaedev/admin": "0.17.0",
58
- "@shivaedev/quality": "0.54.0",
59
- "@shivaedev/server": "0.17.0",
60
- "@shivaedev/test": "0.12.0",
61
- "@shivaedev/test-sql": "0.16.0",
62
- "@shivaedev/test-story": "0.32.0",
59
+ "@shivaedev/admin": "0.18.1",
60
+ "@shivaedev/quality": "0.56.0",
61
+ "@shivaedev/server": "0.19.0",
62
+ "@shivaedev/test": "0.13.0",
63
+ "@shivaedev/test-sql": "0.16.2",
64
+ "@shivaedev/test-story": "0.34.0",
63
65
  "@types/node": "24.19.2",
64
66
  "better-auth": "1.7.12",
65
67
  "effect": "4.0.6",
@@ -67,10 +69,14 @@
67
69
  "vitest": "5.0.5"
68
70
  },
69
71
  "peerDependencies": {
72
+ "@better-auth/oauth-provider": "1.7.12",
70
73
  "better-auth": "1.7.12",
71
74
  "effect": "4.0.6"
72
75
  },
73
76
  "peerDependenciesMeta": {
77
+ "@better-auth/oauth-provider": {
78
+ "optional": true
79
+ },
74
80
  "better-auth": {
75
81
  "optional": true
76
82
  }
@@ -0,0 +1,8 @@
1
+ import { AsyncLocalStorage } from "node:async_hooks";
2
+ import { Effect } from "effect";
3
+
4
+ export const authCallSignal = new AsyncLocalStorage<AbortSignal>();
5
+
6
+ export function authCall<A>(call: (signal: AbortSignal) => Promise<A>) {
7
+ return Effect.tryPromise((signal) => authCallSignal.run(signal, () => call(signal)));
8
+ }
@@ -5,6 +5,7 @@ import { type AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.t
5
5
  import type { ProviderAccountValue } from "#identity.ts";
6
6
  import { providerFailure } from "#server/providerFailure.ts";
7
7
  import type { SessionProvider, SessionShape } from "#server/session.ts";
8
+ import { authCall } from "./authCall.ts";
8
9
 
9
10
  const ExpiringSession = Schema.Struct({ session: Schema.Struct({ expiresAt: Schema.Date }) });
10
11
 
@@ -21,19 +22,16 @@ export function betterAuthSessions<TSession extends SessionShape>(
21
22
  export function betterAuthSessions<TSession extends SessionShape>(getSession: GetSession<TSession>, getProviderAccounts?: GetProviderAccounts) {
22
23
  const betterAuthSession = Effect.fn("Identity.betterAuthSession")(function* (headers: Headers.Headers) {
23
24
  const transport = new globalThis.Headers(headers);
24
- const session = yield* Effect.tryPromise(() => getSession(transport)).pipe(Effect.catch((error) => providerFailure(error.cause)));
25
+ const session = yield* authCall(() => getSession(transport)).pipe(Effect.catch((error) => providerFailure(error.cause)));
25
26
  if (Schema.is(ExpiringSession)(session) && session.session.expiresAt.getTime() <= (yield* Clock.currentTimeMillis)) {
26
27
  return Option.none();
27
28
  }
28
29
  if (session === null || getProviderAccounts === undefined) {
29
30
  return Option.fromNullishOr(session);
30
31
  }
31
- const providerAccounts = Effect.tryPromise({
32
- catch: (cause) => cause,
33
- try: () => getProviderAccounts(transport),
34
- }).pipe(
32
+ const providerAccounts = authCall(() => getProviderAccounts(transport)).pipe(
35
33
  Effect.catch(
36
- (cause): Effect.Effect<never, AuthUnavailable | Unauthorized> =>
34
+ ({ cause }): Effect.Effect<never, AuthUnavailable | Unauthorized> =>
37
35
  Predicate.hasProperty(cause, "statusCode") && cause.statusCode === HttpStatus.fromLiteral("Unauthorized")
38
36
  ? Effect.fail(new Unauthorized({ message: "Authentication required" }))
39
37
  : providerFailure(cause),
@@ -2,7 +2,7 @@ import { Effect, Option } from "effect";
2
2
  import { HttpServerRequest, HttpServerResponse, HttpTraceContext } from "effect/http";
3
3
  import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import { RpcSerialization } from "effect/rpc";
5
- import { proxyAddresses, proxyMatches } from "./trustedProxy.ts";
5
+ import { proxyAddresses, proxyMatches } from "#server/adapters/trustedProxy.ts";
6
6
 
7
7
  type TransportRequest = Pick<HttpServerRequest.HttpServerRequest, "headers" | "remoteAddress">;
8
8
 
@@ -36,14 +36,12 @@ export function sameOrigin(request: Pick<TransportRequest, "headers">): boolean
36
36
  return false;
37
37
  }
38
38
  }
39
- export function loopbackOnly<E, R>(
40
- handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>,
41
- ) {
42
- return (request: HttpServerRequest.HttpServerRequest) =>
43
- loopbackHost(request.headers.host) && Option.match(request.remoteAddress, { onNone: () => true, onSome: loopbackAddress })
44
- ? handler(request)
45
- : Effect.succeed(HttpServerResponse.text("Only loopback hosts are served", { status: HttpStatus.fromLiteral("Forbidden") }));
46
- }
39
+ export const loopbackOnly = Effect.fnUntraced(function* <E, R>(handler: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) {
40
+ const request = yield* HttpServerRequest.HttpServerRequest;
41
+ return loopbackHost(request.headers.host) && Option.match(request.remoteAddress, { onNone: () => true, onSome: loopbackAddress })
42
+ ? yield* handler
43
+ : HttpServerResponse.text("Only loopback hosts are served", { status: HttpStatus.fromLiteral("Forbidden") });
44
+ });
47
45
  export function trustedProxyPeer(trustedProxy?: string): (address: string) => boolean {
48
46
  const addresses = trustedProxy === undefined ? undefined : proxyAddresses(trustedProxy);
49
47
  return (address) => addresses !== undefined && proxyMatches(addresses, address);
@@ -0,0 +1,13 @@
1
+ import { Option } from "effect";
2
+ import type { OriginPolicy, TrustedOriginsOptions } from "#server/origin.ts";
3
+ import { localTransport } from "./local.ts";
4
+
5
+ export function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy {
6
+ const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
7
+ return (request) =>
8
+ Option.match(request.origin, {
9
+ onNone: () => options.missing === "allow",
10
+ onSome: (value) =>
11
+ options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
12
+ });
13
+ }
@@ -1,6 +1,6 @@
1
1
  import { BlockList, isIP } from "node:net";
2
2
  import { Schema } from "effect";
3
- import { addProxyAddress, proxyRanges } from "./proxyRanges.ts";
3
+ import { addProxyAddress, proxyRanges } from "#server/adapters/proxyRanges.ts";
4
4
 
5
5
  export function proxyAddresses(value: string): BlockList | undefined {
6
6
  const addresses = new BlockList();
@@ -1,4 +1,4 @@
1
- import { proxyRanges } from "./proxyRanges.ts";
1
+ import { proxyRanges } from "#server/adapters/proxyRanges.ts";
2
2
 
3
3
  export function trustedProxyRanges(trustedProxy?: string): string[] {
4
4
  return trustedProxy === undefined ? [] : (proxyRanges(trustedProxy) ?? []);
@@ -3,6 +3,7 @@ import { SqlClient, SqlSchema } from "effect/sql";
3
3
  import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
4
4
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
5
5
  import type { ProviderAccountValue } from "#identity.ts";
6
+ import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
6
7
  import { assignRole } from "./assignRole.ts";
7
8
 
8
9
  export interface AccountRoleSeed<E> {
@@ -13,15 +14,17 @@ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* <
13
14
  access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
14
15
  role: NoInfer<TRole>,
15
16
  accounts: Config.Config<readonly ProviderAccountValue[]>,
17
+ options?: AuthTableOptions,
16
18
  ) {
17
19
  const listed = yield* accounts;
18
20
  const context = yield* Effect.context<SqlClient.SqlClient>();
19
- const sql = yield* SqlClient.SqlClient;
21
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
22
+ const { account: accountTable } = tables(options);
20
23
  const findUsers = SqlSchema.findAll({
21
24
  execute: ({ accountId, providerId, userId }) => sql`
22
- select distinct "userId" as id from "account"
23
- where "providerId" = ${providerId} and "accountId" = ${accountId}
24
- ${userId === undefined ? sql.literal("") : sql`and "userId" = ${userId}`}`,
25
+ select distinct ${sql(accountTable.userId)} as id from ${sql(accountTable.table)}
26
+ where ${sql(accountTable.providerId)} = ${providerId} and ${sql(accountTable.accountId)} = ${accountId}
27
+ ${userId === undefined ? sql.literal("") : sql`and ${sql(accountTable.userId)} = ${userId}`}`,
25
28
  Request: Schema.Struct({ accountId: Schema.String, providerId: Schema.String, userId: Schema.optional(Schema.String) }),
26
29
  Result: Schema.Struct({ id: Schema.String }),
27
30
  });
@@ -31,7 +34,7 @@ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* <
31
34
  Effect.mapError(() => new AuthUnavailable({ message: "Could not access provider accounts" })),
32
35
  );
33
36
  for (const user of users) {
34
- yield* assignRole(access, user.id, role);
37
+ yield* assignRole(access, user.id, role, options);
35
38
  }
36
39
  }
37
40
  });
@@ -1,8 +1,8 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
2
  import { Effect, Schema } from "effect";
3
+ import { authColumnDrift } from "#server/better-auth/adapters/columnDrift.ts";
4
+ import { betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
3
5
  import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
4
- import { authColumnDrift } from "./columnDrift.ts";
5
- import { betterAuthMigrationPlan } from "./migrationPlan.ts";
6
6
 
7
7
  export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDrift>()("BetterAuthSchemaDrift", {
8
8
  missing: Schema.Array(Schema.String),
@@ -1,8 +1,8 @@
1
1
  import { getIP } from "better-auth/api";
2
- import { Option } from "effect";
3
- import type { HttpServerRequest } from "effect/http";
4
- import { trustedProxyPeer } from "#server/local.ts";
5
- 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";
6
6
 
7
7
  export const PEER_IP_HEADER = "x-platform-client-ip";
8
8
 
@@ -22,7 +22,8 @@ export function clientIpHeaders(options: {
22
22
  const resolved = {
23
23
  advanced: { ipAddress: { ...advanced.ipAddress, ipAddressHeaders: [PEER_IP_HEADER], trustedProxies: [] } },
24
24
  };
25
- return (request: HttpServerRequest.HttpServerRequest, web: Request) => {
25
+ return Effect.fnUntraced(function* (web: Request) {
26
+ const request = yield* HttpServerRequest.HttpServerRequest;
26
27
  web.headers.delete(PEER_IP_HEADER);
27
28
  const trusted = Option.exists(request.remoteAddress, trustedPeer);
28
29
  const forwardedIp = trusted && web.headers.has(options.clientIpHeader) ? getIP(web, { advanced }) : null;
@@ -35,5 +36,5 @@ export function clientIpHeaders(options: {
35
36
  web.headers.set(PEER_IP_HEADER, address);
36
37
  }
37
38
  return { address: getIP(web, resolved), source: forwardedIp === null ? "peer" : "forwarded" };
38
- };
39
+ });
39
40
  }
@@ -4,6 +4,7 @@ import { matchType } from "better-auth/db/migration";
4
4
  import { Effect, Schema } from "effect";
5
5
  import { SqlClient } from "effect/sql";
6
6
  import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
7
+ import { tables } from "#server/better-auth/adapters/tables.ts";
7
8
 
8
9
  const Column = Schema.Struct({
9
10
  column: Schema.String,
@@ -56,11 +57,11 @@ export const authColumnDrift = Effect.fnUntraced(function* (options: BetterAuthO
56
57
  }
57
58
  }
58
59
  if (role !== undefined) {
59
- const table = options.user?.modelName ?? "user";
60
- const column = columns.find((entry) => entry.table === table && entry.column === "role");
60
+ const { user } = tables(options);
61
+ const column = columns.find((entry) => entry.table === user.table && entry.column === user.role);
61
62
  const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
62
63
  if (column !== undefined && column.default !== `${value}::text`) {
63
- missing.push(`column ${table}.role requires DEFAULT ${value}`);
64
+ missing.push(`column ${user.table}.${user.role} requires DEFAULT ${value}`);
64
65
  }
65
66
  }
66
67
  return missing;
@@ -1,6 +1,8 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
- import { Effect, Exit, Option, Schema, Scope } from "effect";
2
+ import { APIError } from "better-auth/api";
3
+ import { Cause, Effect, Exit, Option, Schema, Scope } from "effect";
3
4
  import { SqlClient } from "effect/sql";
5
+ import { authCallSignal } from "#server/adapters/authCall.ts";
4
6
  import { betterAuthTransaction } from "./transaction.ts";
5
7
 
6
8
  type PostgresPool = Extract<NonNullable<BetterAuthOptions["database"]>, { connect: unknown }>;
@@ -17,21 +19,33 @@ interface QueryResult<R> {
17
19
  rows: R[];
18
20
  }
19
21
 
22
+ function databaseResult<A, E>(exit: Exit.Exit<A, E>): A {
23
+ if (Exit.isSuccess(exit)) {
24
+ return exit.value;
25
+ }
26
+ if (Cause.hasInterruptsOnly(exit.cause)) {
27
+ throw new APIError("REQUEST_TIMEOUT", { code: "REQUEST_CANCELLED", message: "Authentication request was cancelled" });
28
+ }
29
+ throw Cause.squash(exit.cause);
30
+ }
31
+
20
32
  export const betterAuthDatabase = Effect.fn("Identity.betterAuthDatabase")(function* () {
21
33
  const sql = yield* SqlClient.SqlClient;
22
34
  const transaction = yield* Effect.serviceOption(sql.transactionService);
23
35
  const parent = yield* Scope.Scope;
24
36
  const context = yield* Effect.context<SqlClient.SqlClient>();
25
37
  const run = Effect.runPromiseWith(context);
38
+ const runQuery = Effect.runPromiseExitWith(context);
26
39
  const pool: PostgresPool = {
27
40
  async connect(): Promise<PoolClient> {
28
41
  const scope = await run(Scope.fork(parent));
29
- const connection = await run(
42
+ const connection = await runQuery(
30
43
  (Option.isSome(transaction) ? Effect.succeed(transaction.value[0]) : sql.reserve).pipe(
31
44
  Scope.provide(scope),
32
45
  Effect.onError((cause) => Scope.close(scope, Exit.failCause(cause))),
33
46
  ),
34
- );
47
+ { signal: authCallSignal.getStore() },
48
+ ).then(databaseResult);
35
49
  const control = Option.isSome(transaction) ? await run(betterAuthTransaction.pipe(Scope.provide(scope))) : undefined;
36
50
  function query<R>(text: string, parameters: readonly unknown[]): Promise<QueryResult<R>>;
37
51
  function query<R>(cursor: Cursor<R>): Cursor<R>;
@@ -43,8 +57,11 @@ export const betterAuthDatabase = Effect.fn("Identity.betterAuthDatabase")(funct
43
57
  throw new Error("Better Auth database does not support cursors");
44
58
  }
45
59
  const nested = control?.(text);
60
+ const signal = text === "begin" || text === "commit" || text === "rollback" ? undefined : authCallSignal.getStore();
46
61
  return (
47
- nested === undefined ? run(connection.executeRaw(text, parameters)) : nested.then(() => ({ command: text, rowCount: 0, rows: [] }))
62
+ nested === undefined
63
+ ? runQuery(connection.executeRaw(text, parameters), { signal }).then(databaseResult)
64
+ : nested.then(() => ({ command: text, rowCount: 0, rows: [] }))
48
65
  ).then(Schema.decodeUnknownSync(Result));
49
66
  }
50
67
  return {