@shivaedev/identity 0.19.0 → 0.20.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 (193) hide show
  1. package/CHANGELOG.md +40 -0
  2. package/README.md +169 -77
  3. package/dist/PermissionSession.d.ts +11 -0
  4. package/dist/PermissionSession.d.ts.map +1 -0
  5. package/dist/PermissionSession.js +6 -0
  6. package/dist/PermissionSession.js.map +1 -0
  7. package/dist/authRefusal.d.ts +18 -0
  8. package/dist/authRefusal.d.ts.map +1 -0
  9. package/dist/authRefusal.js +11 -0
  10. package/dist/authRefusal.js.map +1 -0
  11. package/dist/client/AuthFailure.d.ts +18 -0
  12. package/dist/client/AuthFailure.d.ts.map +1 -0
  13. package/dist/client/AuthFailure.js +15 -0
  14. package/dist/client/AuthFailure.js.map +1 -0
  15. package/dist/client/AuthFailureCode.d.ts +4 -0
  16. package/dist/client/AuthFailureCode.d.ts.map +1 -0
  17. package/dist/client/AuthFailureCode.js +57 -0
  18. package/dist/client/AuthFailureCode.js.map +1 -0
  19. package/dist/client/adapters/authCall.d.ts +8 -0
  20. package/dist/client/adapters/authCall.d.ts.map +1 -0
  21. package/dist/client/adapters/authCall.js +31 -0
  22. package/dist/client/adapters/authCall.js.map +1 -0
  23. package/dist/client/adapters/authQuery.d.ts +5 -0
  24. package/dist/client/adapters/authQuery.d.ts.map +1 -0
  25. package/dist/client/adapters/authQuery.js +9 -0
  26. package/dist/client/adapters/authQuery.js.map +1 -0
  27. package/dist/client/adapters/authSession.d.ts +9 -0
  28. package/dist/client/adapters/authSession.d.ts.map +1 -0
  29. package/dist/client/adapters/authSession.js +20 -0
  30. package/dist/client/adapters/authSession.js.map +1 -0
  31. package/dist/client/adapters/changeEmail.d.ts +12 -0
  32. package/dist/client/adapters/changeEmail.d.ts.map +1 -0
  33. package/dist/client/adapters/changeEmail.js +5 -0
  34. package/dist/client/adapters/changeEmail.js.map +1 -0
  35. package/dist/roles.d.ts +16 -0
  36. package/dist/roles.d.ts.map +1 -0
  37. package/dist/roles.js +6 -0
  38. package/dist/roles.js.map +1 -0
  39. package/dist/server/UserDirectory.d.ts +14 -0
  40. package/dist/server/UserDirectory.d.ts.map +1 -0
  41. package/dist/server/UserDirectory.js +4 -0
  42. package/dist/server/UserDirectory.js.map +1 -0
  43. package/dist/server/better-auth/UndeclaredDefaultRole.d.ts +9 -0
  44. package/dist/server/better-auth/UndeclaredDefaultRole.d.ts.map +1 -0
  45. package/dist/server/better-auth/UndeclaredDefaultRole.js +9 -0
  46. package/dist/server/better-auth/UndeclaredDefaultRole.js.map +1 -0
  47. package/dist/server/better-auth/accountRoleSeed.d.ts +2 -2
  48. package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
  49. package/dist/server/better-auth/adapters/acquire.d.ts +7 -0
  50. package/dist/server/better-auth/adapters/acquire.d.ts.map +1 -0
  51. package/dist/server/better-auth/adapters/acquire.js +14 -0
  52. package/dist/server/better-auth/adapters/acquire.js.map +1 -0
  53. package/dist/server/better-auth/adapters/emailOptions.d.ts +2 -2
  54. package/dist/server/better-auth/adapters/emailOptions.d.ts.map +1 -1
  55. package/dist/server/better-auth/adapters/emailOptions.js +13 -9
  56. package/dist/server/better-auth/adapters/emailOptions.js.map +1 -1
  57. package/dist/server/better-auth/adapters/hookRuntime.d.ts +7 -1
  58. package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
  59. package/dist/server/better-auth/adapters/hookRuntime.js +9 -1
  60. package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
  61. package/dist/server/better-auth/adapters/mount.d.ts +51 -40
  62. package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
  63. package/dist/server/better-auth/adapters/mount.js +19 -6
  64. package/dist/server/better-auth/adapters/mount.js.map +1 -1
  65. package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -1
  66. package/dist/server/better-auth/adapters/oauthGrants.js +17 -7
  67. package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -1
  68. package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -1
  69. package/dist/server/better-auth/adapters/oauthProvider.js +25 -2
  70. package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -1
  71. package/dist/server/better-auth/adapters/profileStorage.d.ts +6 -0
  72. package/dist/server/better-auth/adapters/profileStorage.d.ts.map +1 -0
  73. package/dist/server/better-auth/adapters/profileStorage.js +13 -0
  74. package/dist/server/better-auth/adapters/profileStorage.js.map +1 -0
  75. package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts +3 -0
  76. package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts.map +1 -0
  77. package/dist/server/better-auth/adapters/providerOnlyOptions.js +56 -0
  78. package/dist/server/better-auth/adapters/providerOnlyOptions.js.map +1 -0
  79. package/dist/server/better-auth/adapters/response.d.ts +3 -1
  80. package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
  81. package/dist/server/better-auth/adapters/response.js +8 -6
  82. package/dist/server/better-auth/adapters/response.js.map +1 -1
  83. package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -1
  84. package/dist/server/better-auth/adapters/roleSeedOptions.js +2 -1
  85. package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -1
  86. package/dist/server/better-auth/adapters/signInPolicyOptions.d.ts.map +1 -1
  87. package/dist/server/better-auth/adapters/signInPolicyOptions.js +3 -2
  88. package/dist/server/better-auth/adapters/signInPolicyOptions.js.map +1 -1
  89. package/dist/server/better-auth/adapters/testingCredentials.d.ts +4 -0
  90. package/dist/server/better-auth/adapters/testingCredentials.d.ts.map +1 -0
  91. package/dist/server/better-auth/adapters/testingCredentials.js +8 -0
  92. package/dist/server/better-auth/adapters/testingCredentials.js.map +1 -0
  93. package/dist/server/better-auth/adapters/userDirectory.d.ts +7 -0
  94. package/dist/server/better-auth/adapters/userDirectory.d.ts.map +1 -0
  95. package/dist/server/better-auth/adapters/userDirectory.js +20 -0
  96. package/dist/server/better-auth/adapters/userDirectory.js.map +1 -0
  97. package/dist/server/better-auth/assignRole.d.ts +1 -1
  98. package/dist/server/better-auth/assignRole.d.ts.map +1 -1
  99. package/dist/server/better-auth/assignRole.js +4 -2
  100. package/dist/server/better-auth/assignRole.js.map +1 -1
  101. package/dist/server/better-auth/emails.d.ts +11 -8
  102. package/dist/server/better-auth/emails.d.ts.map +1 -1
  103. package/dist/server/better-auth/mountRoutes.d.ts +1 -0
  104. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
  105. package/dist/server/better-auth/mountRoutes.js +1 -1
  106. package/dist/server/better-auth/mountRoutes.js.map +1 -1
  107. package/dist/server/better-auth/testing.d.ts +13 -39
  108. package/dist/server/better-auth/testing.d.ts.map +1 -1
  109. package/dist/server/better-auth/testing.js +44 -12
  110. package/dist/server/better-auth/testing.js.map +1 -1
  111. package/dist/server/better-auth/userDirectoryReads.d.ts +26 -0
  112. package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -0
  113. package/dist/server/better-auth/userDirectoryReads.js +42 -0
  114. package/dist/server/better-auth/userDirectoryReads.js.map +1 -0
  115. package/dist/server/better-auth/userProfiles.d.ts +4 -6
  116. package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
  117. package/dist/server/better-auth/userProfiles.js +2 -11
  118. package/dist/server/better-auth/userProfiles.js.map +1 -1
  119. package/dist/server/oauthGrants.d.ts +4 -1
  120. package/dist/server/oauthGrants.d.ts.map +1 -1
  121. package/dist/server/oauthGrants.js.map +1 -1
  122. package/dist/server/permissions.d.ts.map +1 -1
  123. package/dist/server/permissions.js +2 -4
  124. package/dist/server/permissions.js.map +1 -1
  125. package/dist/server/resolveChanges.d.ts +8 -0
  126. package/dist/server/resolveChanges.d.ts.map +1 -0
  127. package/dist/server/resolveChanges.js +13 -0
  128. package/dist/server/resolveChanges.js.map +1 -0
  129. package/dist/server/session.d.ts +1 -1
  130. package/dist/server/session.d.ts.map +1 -1
  131. package/dist/server/session.js +10 -11
  132. package/dist/server/session.js.map +1 -1
  133. package/dist/server/tracing.d.ts.map +1 -1
  134. package/dist/server/tracing.js +3 -7
  135. package/dist/server/tracing.js.map +1 -1
  136. package/dist/sessions.d.ts +19 -3
  137. package/dist/sessions.d.ts.map +1 -1
  138. package/dist/users.d.ts +29 -0
  139. package/dist/users.d.ts.map +1 -0
  140. package/dist/users.js +18 -0
  141. package/dist/users.js.map +1 -0
  142. package/package.json +16 -17
  143. package/src/PermissionSession.ts +7 -0
  144. package/src/authRefusal.ts +13 -0
  145. package/src/client/AuthFailure.ts +19 -0
  146. package/src/client/AuthFailureCode.ts +58 -0
  147. package/src/client/adapters/authCall.ts +44 -0
  148. package/src/client/adapters/authQuery.ts +13 -0
  149. package/src/client/adapters/authSession.ts +30 -0
  150. package/src/client/adapters/changeEmail.ts +13 -0
  151. package/src/roles.ts +5 -0
  152. package/src/server/UserDirectory.ts +14 -0
  153. package/src/server/better-auth/UndeclaredDefaultRole.ts +9 -0
  154. package/src/server/better-auth/adapters/acquire.ts +17 -0
  155. package/src/server/better-auth/adapters/emailOptions.ts +21 -9
  156. package/src/server/better-auth/adapters/hookRuntime.ts +17 -3
  157. package/src/server/better-auth/adapters/mount.ts +38 -7
  158. package/src/server/better-auth/adapters/oauthGrants.ts +17 -7
  159. package/src/server/better-auth/adapters/oauthProvider.ts +32 -2
  160. package/src/server/better-auth/adapters/profileStorage.ts +18 -0
  161. package/src/server/better-auth/adapters/providerOnlyOptions.ts +63 -0
  162. package/src/server/better-auth/adapters/response.ts +15 -7
  163. package/src/server/better-auth/adapters/roleSeedOptions.ts +2 -1
  164. package/src/server/better-auth/adapters/signInPolicyOptions.ts +3 -2
  165. package/src/server/better-auth/adapters/testingCredentials.ts +9 -0
  166. package/src/server/better-auth/adapters/userDirectory.ts +33 -0
  167. package/src/server/better-auth/assignRole.ts +4 -2
  168. package/src/server/better-auth/emails.ts +11 -8
  169. package/src/server/better-auth/mountRoutes.ts +2 -1
  170. package/src/server/better-auth/testing.ts +68 -18
  171. package/src/server/better-auth/userDirectoryReads.ts +47 -0
  172. package/src/server/better-auth/userProfiles.ts +6 -12
  173. package/src/server/oauthGrants.ts +5 -1
  174. package/src/server/permissions.ts +2 -4
  175. package/src/server/resolveChanges.ts +24 -0
  176. package/src/server/session.ts +14 -11
  177. package/src/server/tracing.ts +4 -9
  178. package/src/users.ts +19 -0
  179. package/dist/server/better-auth/emailWindow.d.ts +0 -3
  180. package/dist/server/better-auth/emailWindow.d.ts.map +0 -1
  181. package/dist/server/better-auth/emailWindow.js +0 -23
  182. package/dist/server/better-auth/emailWindow.js.map +0 -1
  183. package/dist/server/commandChanges.d.ts +0 -4
  184. package/dist/server/commandChanges.d.ts.map +0 -1
  185. package/dist/server/commandChanges.js +0 -48
  186. package/dist/server/commandChanges.js.map +0 -1
  187. package/dist/server/sessionKeys.d.ts +0 -13
  188. package/dist/server/sessionKeys.d.ts.map +0 -1
  189. package/dist/server/sessionKeys.js +0 -27
  190. package/dist/server/sessionKeys.js.map +0 -1
  191. package/src/server/better-auth/emailWindow.ts +0 -27
  192. package/src/server/commandChanges.ts +0 -63
  193. package/src/server/sessionKeys.ts +0 -42
@@ -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;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"}
1
+ {"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"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"}
@@ -1,6 +1,7 @@
1
- import { type BetterAuthOptions } from "better-auth";
2
- import { Config, Effect, Layer } from "effect";
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { Config, Effect, Layer, type Scope } from "effect";
3
3
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
4
+ import type { Store } from "@shivaedev/rate-limit/Store.ts";
4
5
  import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
5
6
  import { type BearerSessionsOptions } from "#server/better-auth/adapters/bearerSessions.ts";
6
7
  import { type BetterAuthHardeningOptions } from "#server/better-auth/adapters/hardening.ts";
@@ -9,12 +10,15 @@ import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.
9
10
  import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
10
11
  import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
11
12
  import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
13
+ import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
12
14
  export type BetterAuthMountOptions<E = never, R = never> = {
13
15
  readonly bearerSessions?: BearerSessionsOptions | undefined;
14
16
  readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
15
17
  readonly emails?: BetterAuthEmails<R> | undefined;
18
+ readonly enabledPaths?: readonly string[];
16
19
  readonly hardening?: BetterAuthHardeningOptions;
17
20
  readonly onPasswordReset?: BetterAuthPasswordReset<R> | undefined;
21
+ readonly preset?: "provider-only";
18
22
  readonly signIn?: SignInPolicy<E, R> | undefined;
19
23
  } & ({
20
24
  readonly roles?: undefined;
@@ -23,49 +27,13 @@ export type BetterAuthMountOptions<E = never, R = never> = {
23
27
  readonly roles: RoleSet;
24
28
  readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R>;
25
29
  }));
26
- export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
30
+ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
27
31
  admitsUser: (userId: string) => Effect.Effect<boolean, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
28
32
  admittedSessions: {
29
33
  <TSession extends import("../../session.ts").SessionShape>(getSession: import("../../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../../session.ts").SessionProvider<TSession>;
30
34
  <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>>;
31
35
  };
32
36
  auth: import("better-auth").Auth<TOptions & {
33
- advanced: {
34
- disableCSRFCheck?: boolean | undefined;
35
- disableOriginCheck?: boolean | undefined;
36
- crossSubDomainCookies?: {
37
- enabled: boolean;
38
- additionalCookies?: string[];
39
- domain?: string;
40
- } | undefined;
41
- cookies?: {
42
- [key: string]: {
43
- name?: string;
44
- attributes?: import("better-auth").CookieOptions;
45
- };
46
- } | undefined;
47
- defaultCookieAttributes?: import("better-auth").CookieOptions | undefined;
48
- cookiePrefix?: string | undefined;
49
- database?: {
50
- defaultFindManyLimit?: number;
51
- generateId?: import("better-auth").GenerateIdFn | false | "serial" | "uuid";
52
- joins?: boolean;
53
- validateSchema?: boolean;
54
- } | undefined;
55
- trustedProxyHeaders?: boolean | undefined;
56
- backgroundTasks?: {
57
- handler: (promise: Promise<unknown>) => void;
58
- };
59
- skipTrailingSlashes?: boolean;
60
- useSecureCookies: boolean | undefined;
61
- ipAddress: {
62
- disableIpTracking?: boolean;
63
- ipv6Subnet?: number;
64
- ipAddressHeaders: string[];
65
- trustedProxies: never[];
66
- };
67
- };
68
- baseURL: import("better-auth").BaseURLConfig;
69
37
  databaseHooks: {
70
38
  user?: {
71
39
  create?: {
@@ -220,6 +188,42 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
220
188
  };
221
189
  };
222
190
  } | undefined;
191
+ advanced: {
192
+ disableCSRFCheck?: boolean | undefined;
193
+ disableOriginCheck?: boolean | undefined;
194
+ crossSubDomainCookies?: {
195
+ enabled: boolean;
196
+ additionalCookies?: string[];
197
+ domain?: string;
198
+ } | undefined;
199
+ cookies?: {
200
+ [key: string]: {
201
+ name?: string;
202
+ attributes?: import("better-auth").CookieOptions;
203
+ };
204
+ } | undefined;
205
+ defaultCookieAttributes?: import("better-auth").CookieOptions | undefined;
206
+ cookiePrefix?: string | undefined;
207
+ database?: {
208
+ defaultFindManyLimit?: number;
209
+ generateId?: import("better-auth").GenerateIdFn | false | "serial" | "uuid";
210
+ joins?: boolean;
211
+ validateSchema?: boolean;
212
+ } | undefined;
213
+ trustedProxyHeaders?: boolean | undefined;
214
+ backgroundTasks?: {
215
+ handler: (promise: Promise<unknown>) => void;
216
+ };
217
+ skipTrailingSlashes?: boolean;
218
+ useSecureCookies: boolean | undefined;
219
+ ipAddress: {
220
+ disableIpTracking?: boolean;
221
+ ipv6Subnet?: number;
222
+ ipAddressHeaders: string[];
223
+ trustedProxies: never[];
224
+ };
225
+ };
226
+ baseURL: import("better-auth").BaseURLConfig;
223
227
  rateLimit: {
224
228
  window?: number | undefined;
225
229
  max?: number | undefined;
@@ -262,11 +266,18 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
262
266
  };
263
267
  }) | undefined;
264
268
  }>;
269
+ profiles: import("../userProfiles.ts").UserProfileStorage;
265
270
  revokeUnadmitted: Effect.Effect<import("#server/better-auth/revokeUnadmitted.ts").RevokedSessions, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError, never>;
266
271
  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>>;
267
272
  sessions: {
268
273
  readonly roles?: RoleSet;
269
274
  readonly provider: import("../../session.ts").SessionProvider<import("../../session.ts").UserSessionShape>;
270
275
  };
271
- }, E | Config.ConfigError, R | import("effect/Scope").Scope | import("@shivaedev/rate-limit/Store.ts").Store>;
276
+ }, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError | UndeclaredDefaultRole, R | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient | Store>;
277
+ type Mounted<TOptions extends BetterAuthOptions, E, R> = ReturnType<typeof mountAuth<TOptions, E, R>>;
278
+ export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> & {
279
+ readonly emails?: undefined;
280
+ }): Effect.Effect<Effect.Success<Mounted<TOptions, E, R>>, Effect.Error<Mounted<TOptions, E, R>>, R | Scope.Scope | Store>;
281
+ export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount: BetterAuthMountOptions<E, R>): Mounted<TOptions, E, R>;
282
+ export {};
272
283
  //# sourceMappingURL=mount.d.ts.map
@@ -1 +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
+ {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import { betterAuth } from "better-auth";
2
1
  import { Config, Effect, Layer, Option, Redacted } from "effect";
3
2
  import { withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
4
3
  import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
@@ -9,6 +8,7 @@ import { withHardening } from "#server/better-auth/adapters/hardening.ts";
9
8
  import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
10
9
  import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
11
10
  import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
11
+ import { providerOnlyOptions } from "#server/better-auth/adapters/providerOnlyOptions.ts";
12
12
  import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
13
13
  import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
14
14
  import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
@@ -17,9 +17,14 @@ import { admittedSessions } from "#server/better-auth/admittedSessions.ts";
17
17
  import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
18
18
  import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
19
19
  import { fromStorage, signInGate } from "#server/better-auth/signInGate.ts";
20
+ import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
20
21
  import { providerFailure } from "#server/providerFailure.ts";
22
+ import { acquireAuth } from "./acquire.js";
21
23
  import { authRouteHandler } from "./routeHandler.js";
22
- export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (options, mount = {}) {
24
+ const mountAuth = Effect.fn("Identity.mountAuth")(function* (options, mount = {}) {
25
+ if (mount.roles !== undefined) {
26
+ yield* mount.roles.resolve(mount.defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: mount.defaultRole })));
27
+ }
23
28
  const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
24
29
  const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
25
30
  const origin = Option.map(publicUrl, (url) => url.origin);
@@ -38,10 +43,14 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (
38
43
  const gated = yield* signInPolicyOptions(configured, gate, () => auth.$context);
39
44
  const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
40
45
  const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
46
+ const base = { ...configured, databaseHooks: seeded.databaseHooks };
47
+ const preset = mount.preset === "provider-only" ? providerOnlyOptions(base, mount.enabledPaths) : base;
41
48
  const rateLimit = options.rateLimit;
49
+ const prefix = `/${(options.basePath || "/api/auth").replace(/^\/|\/+$/gu, "")}`;
50
+ const basePath = prefix === "/" ? "" : prefix;
42
51
  const customStorage = yield* rateLimitStorage;
43
- const auth = betterAuth({
44
- ...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
52
+ const { auth, profiles } = yield* acquireAuth({
53
+ ...withHardening(withBearerSessions(preset, mount.bearerSessions !== undefined), mount.hardening),
45
54
  advanced: {
46
55
  useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
47
56
  ...options.advanced,
@@ -56,7 +65,6 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (
56
65
  allowedHosts: ["127.0.0.1:*", "localhost:*"],
57
66
  protocol: "http",
58
67
  })),
59
- databaseHooks: seeded.databaseHooks,
60
68
  rateLimit: {
61
69
  ...rateLimit,
62
70
  customStorage,
@@ -67,7 +75,9 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (
67
75
  user: gate.active ? gated.user : configured.user,
68
76
  });
69
77
  const authRoutes = mountRoutes.pipe(Layer.provide(Layer.succeed(AuthRouteHandler, {
78
+ basePath,
70
79
  handle: authRouteHandler(auth, {
80
+ basePath,
71
81
  bearerSessions: mount.bearerSessions,
72
82
  clientIpHeader,
73
83
  ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
@@ -88,6 +98,9 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (
88
98
  const revoke = revokeUnadmitted(gate, () => auth.$context);
89
99
  const lookupSession = Reflect.get(auth.api, "getSession");
90
100
  const sessions = mountedSessions(lookupSession, admit, mount.roles);
91
- return { admitsUser, admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
101
+ return { admitsUser, admittedSessions: admit, auth, profiles, revokeUnadmitted: revoke, routes: authRoutes, sessions };
92
102
  });
103
+ export function betterAuthMount(options, mount = {}) {
104
+ return mountAuth(options, mount);
105
+ }
93
106
  //# sourceMappingURL=mount.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/mount.ts"],"names":[],"mappings":"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"}
@@ -1 +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"}
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,EAAS,MAAM,EAAE,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAC9D,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,0CAsEA"}
@@ -1,4 +1,4 @@
1
- import { Effect, Layer, Option, Schema } from "effect";
1
+ import { Clock, Effect, Layer, Option, Schema } from "effect";
2
2
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
3
3
  import { OauthGrant, OauthGrants } from "#server/oauthGrants.ts";
4
4
  function unavailable(cause) {
@@ -36,30 +36,40 @@ export function betterAuthOauthGrants(options) {
36
36
  });
37
37
  return yield* Schema.decodeUnknownEffect(Schema.Array(OauthGrant))(consents).pipe(Effect.mapError(unavailable));
38
38
  }),
39
- resolveSubject: Effect.fn("OauthGrants.resolveSubject")(function* (userId, clientId) {
39
+ resolveGrant: Effect.fn("OauthGrants.resolveGrant")(function* (grantId, userId, clientId) {
40
+ const now = yield* Clock.currentTimeMillis;
40
41
  const subject = yield* Effect.tryPromise({
41
42
  catch: unavailable,
42
43
  try: async () => {
43
44
  const { adapter, internalAdapter } = await auth.$context;
44
45
  const user = await internalAdapter.findUserById(userId);
45
- if (user === null || Reflect.get(user, "banned") === true) {
46
+ if (user === null) {
47
+ return null;
48
+ }
49
+ const banExpires = Reflect.get(user, "banExpires");
50
+ if (Reflect.get(user, "banned") === true && !(banExpires instanceof Date && banExpires.getTime() < now)) {
46
51
  return null;
47
52
  }
48
53
  const consent = await adapter.findOne({
49
54
  model: "oauthConsent",
50
55
  where: [
56
+ { field: "id", value: grantId },
51
57
  { field: "userId", value: userId },
52
58
  { field: "clientId", value: clientId },
53
59
  ],
54
60
  });
55
- return consent === null ? null : user;
61
+ return consent === null ? null : { consent, user };
56
62
  },
57
63
  });
58
- if (subject === null || !(yield* admitsUser(subject.id))) {
64
+ if (subject === null || !(yield* admitsUser(subject.user.id))) {
59
65
  return Option.none();
60
66
  }
61
- const role = Reflect.get(subject, "role");
62
- return Option.some({ email: subject.email, id: subject.id, name: subject.name, ...(typeof role === "string" ? { role } : {}) });
67
+ const role = Reflect.get(subject.user, "role");
68
+ const grant = yield* Schema.decodeUnknownEffect(OauthGrant)(subject.consent).pipe(Effect.mapError(unavailable));
69
+ return Option.some({
70
+ scopes: grant.scopes,
71
+ user: { email: subject.user.email, id: subject.user.id, name: subject.user.name, ...(typeof role === "string" ? { role } : {}) },
72
+ });
63
73
  }),
64
74
  revokeAllClients: (userId) => revoke(userId),
65
75
  revokeClient: (userId, clientId) => revoke(userId, clientId),
@@ -1 +1 @@
1
- {"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthGrants.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthGrants.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAWjE,SAAS,WAAW,CAAC,KAAc;IAClC,OAAO,MAAM,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AACjG,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,OAGrC;IACA,MAAM,EAAE,IAAI,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IACrC,MAAM,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAc,EAAE,QAAiB;QACvF,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;YACxB,KAAK,EAAE,WAAW;YAClB,GAAG,EAAE,KAAK,IAAI,EAAE;gBACf,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;gBACxC,MAAM,KAAK,GAAG,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,GAAG,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBAChI,MAAM,OAAO,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;oBAC/C,KAAK,MAAM,KAAK,IAAI,CAAC,cAAc,EAAE,kBAAkB,EAAE,mBAAmB,CAAC,EAAE,CAAC;wBAC/E,MAAM,WAAW,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;oBAChD,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;SACD,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC,OAAO,CAAC,WAAW,EAAE;QACjC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC,kBAAkB,CAAC,CAAC,QAAQ,CAAC,EAAE,MAAc,EAAE,IAA0D;YACxH,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;gBACzC,KAAK,EAAE,WAAW;gBAClB,GAAG,EAAE,KAAK,IAAI,EAAE;oBACf,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;oBACxC,OAAO,OAAO,CAAC,QAAQ,CAAC;wBACvB,GAAG,IAAI;wBACP,KAAK,EAAE,cAAc;wBACrB,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE;wBACzC,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC;qBAC3C,CAAC,CAAC;gBACJ,CAAC;aACD,CAAC,CAAC;YACH,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;QACjH,CAAC,CAAC;QACF,YAAY,EAAE,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAe,EAAE,MAAc,EAAE,QAAgB;YAC/G,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;YAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;gBACxC,KAAK,EAAE,WAAW;gBAClB,GAAG,EAAE,KAAK,IAAI,EAAE;oBACf,MAAM,EAAE,OAAO,EAAE,eAAe,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;oBACzD,MAAM,IAAI,GAAG,MAAM,eAAe,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;oBACxD,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;wBACnB,OAAO,IAAI,CAAC;oBACb,CAAC;oBACD,MAAM,UAAU,GAAY,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;oBAC5D,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,QAAQ,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,UAAU,YAAY,IAAI,IAAI,UAAU,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,EAAE,CAAC;wBACzG,OAAO,IAAI,CAAC;oBACb,CAAC;oBACD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC;wBACrC,KAAK,EAAE,cAAc;wBACrB,KAAK,EAAE;4BACN,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,OAAO,EAAE;4BAC/B,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE;4BAClC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,QAAQ,EAAE;yBACtC;qBACD,CAAC,CAAC;oBACH,OAAO,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;gBACpD,CAAC;aACD,CAAC,CAAC;YACH,IAAI,OAAO,KAAK,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC/D,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC;YACD,MAAM,IAAI,GAAY,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACxD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;YAChH,OAAO,MAAM,CAAC,IAAI,CAAC;gBAClB,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE;aAChI,CAAC,CAAC;QACJ,CAAC,CAAC;QACF,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC;QAC5C,YAAY,EAAE,CAAC,MAAM,EAAE,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC;KAC5D,CAAC,CAAC;AACJ,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"oauthProvider.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,aAAa,EAAmC,KAAK,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,WAAW,GAAG,oCAAoC,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnJ,wBAAgB,uBAAuB,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,oBAAoB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAExH;AAED,eAAO,MAAM,0BAA0B;kBAChB;QAAE,QAAQ,CAAC,sBAAsB,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAA;SAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE;;;SAOhJ,CAAC"}
1
+ {"version":3,"file":"oauthProvider.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAEN,KAAK,YAAY,EACjB,aAAa,EAEb,KAAK,KAAK,EACV,MAAM,6BAA6B,CAAC;AAErC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,MAAM,MAAM,oBAAoB,GAAG,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC,EAAE,WAAW,GAAG,oCAAoC,CAAC,GAAG;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAoBnJ,wBAAgB,uBAAuB,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,EAAE,oBAAoB,GAAG,UAAU,CAAC,OAAO,aAAa,CAAC,CAOxH;AAED,eAAO,MAAM,0BAA0B;kBAChB;QAAE,QAAQ,CAAC,sBAAsB,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;YAAC,QAAQ,CAAC,UAAU,EAAE,KAAK,CAAA;SAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAA;KAAE;;;SAOhJ,CAAC"}
@@ -1,8 +1,31 @@
1
- import { oauthProvider, oauthProviderAuthServerMetadata } from "@better-auth/oauth-provider";
1
+ import { oauthProvider, oauthProviderAuthServerMetadata, } from "@better-auth/oauth-provider";
2
+ import { APIError } from "better-auth/api";
2
3
  import { Effect } from "effect";
3
4
  import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
5
+ async function grantClaims({ ctx, user, client, referenceId }) {
6
+ if (!user) {
7
+ return {};
8
+ }
9
+ const consent = await ctx.context.adapter.findOne({
10
+ model: "oauthConsent",
11
+ where: [
12
+ { field: "userId", value: user.id },
13
+ { field: "clientId", value: client.clientId },
14
+ { field: "referenceId", value: referenceId ?? null },
15
+ ],
16
+ });
17
+ if (consent === null) {
18
+ throw new APIError("BAD_REQUEST", { error: "invalid_grant", "error_description": "Consent is required" });
19
+ }
20
+ return { "grant_id": consent.id };
21
+ }
4
22
  export function betterAuthOauthProvider({ resource, ...options }) {
5
- return oauthProvider({ ...options, clientRegistrationDefaultResources: [resource], resources: [resource] });
23
+ return oauthProvider({
24
+ ...options,
25
+ clientRegistrationDefaultResources: [resource],
26
+ extensions: [...(options.extensions ?? []), { claims: { accessToken: grantClaims } }],
27
+ resources: [resource],
28
+ });
6
29
  }
7
30
  export const oauthAuthorizationMetadata = Effect.fn("Identity.oauthAuthorizationMetadata")(function* (auth, request) {
8
31
  return yield* Effect.tryPromise({
@@ -1 +1 @@
1
- {"version":3,"file":"oauthProvider.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,aAAa,EAAE,+BAA+B,EAAc,MAAM,6BAA6B,CAAC;AAC5H,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,MAAM,UAAU,uBAAuB,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAwB;IACrF,OAAO,aAAa,CAAC,EAAE,GAAG,OAAO,EAAE,kCAAkC,EAAE,CAAC,QAAQ,CAAC,EAAE,SAAS,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;AAC7G,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,EAAE,CAAC,qCAAqC,CAAC,CAAC,QAAQ,CAAC,EACnG,IAAmJ,EACnJ,OAAgB;IAEhB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;QAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAC5G,GAAG,EAAE,GAAG,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;KACzD,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"oauthProvider.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/oauthProvider.ts"],"names":[],"mappings":"AAAA,OAAO,EAGN,aAAa,EACb,+BAA+B,GAE/B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAIhE,KAAK,UAAU,WAAW,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAA4B;IACtF,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAiB;QACjE,KAAK,EAAE,cAAc;QACrB,KAAK,EAAE;YACN,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,EAAE;YACnC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,CAAC,QAAQ,EAAE;YAC7C,EAAE,KAAK,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,IAAI,IAAI,EAAE;SACpD;KACD,CAAC,CAAC;IACH,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACtB,MAAM,IAAI,QAAQ,CAAC,aAAa,EAAE,EAAE,KAAK,EAAE,eAAe,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,CAAC,CAAC;IAC3G,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAwB;IACrF,OAAO,aAAa,CAAC;QACpB,GAAG,OAAO;QACV,kCAAkC,EAAE,CAAC,QAAQ,CAAC;QAC9C,UAAU,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,CAAC;QACrF,SAAS,EAAE,CAAC,QAAQ,CAAC;KACrB,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,0BAA0B,GAAG,MAAM,CAAC,EAAE,CAAC,qCAAqC,CAAC,CAAC,QAAQ,CAAC,EACnG,IAAmJ,EACnJ,OAAgB;IAEhB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC;QAC/B,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;QAC5G,GAAG,EAAE,GAAG,EAAE,CAAC,+BAA+B,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;KACzD,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
@@ -0,0 +1,6 @@
1
+ import type { AuthContext } from "better-auth";
2
+ import type { UserProfileStorage } from "#server/better-auth/userProfiles.ts";
3
+ export declare function profileStorage({ adapter }: {
4
+ readonly adapter: Pick<AuthContext["adapter"], "findMany">;
5
+ }): UserProfileStorage;
6
+ //# sourceMappingURL=profileStorage.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"profileStorage.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/profileStorage.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE/C,OAAO,KAAK,EAAe,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AAG3F,wBAAgB,cAAc,CAAC,EAAE,OAAO,EAAE,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,UAAU,CAAC,CAAA;CAAE,GAAG,kBAAkB,CAY9H"}
@@ -0,0 +1,13 @@
1
+ import { Effect } from "effect";
2
+ import { providerFailure } from "#server/providerFailure.ts";
3
+ export function profileStorage({ adapter }) {
4
+ return {
5
+ findByIds: (userIds) => Effect.tryPromise(() => adapter.findMany({
6
+ limit: userIds.length,
7
+ model: "user",
8
+ select: ["id", "name", "image"],
9
+ where: [{ field: "id", operator: "in", value: [...userIds] }],
10
+ })).pipe(Effect.catch((error) => providerFailure(error.cause))),
11
+ };
12
+ }
13
+ //# sourceMappingURL=profileStorage.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"profileStorage.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/profileStorage.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,MAAM,UAAU,cAAc,CAAC,EAAE,OAAO,EAAkE;IACzG,OAAO;QACN,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE,CACtB,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CACtB,OAAO,CAAC,QAAQ,CAAc;YAC7B,KAAK,EAAE,OAAO,CAAC,MAAM;YACrB,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC;YAC/B,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,EAAE,CAAC;SAC7D,CAAC,CACF,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;KAC9D,CAAC;AACH,CAAC"}
@@ -0,0 +1,3 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ export declare function providerOnlyOptions<TOptions extends BetterAuthOptions>(options: TOptions, enabledPaths?: readonly string[]): TOptions;
3
+ //# sourceMappingURL=providerOnlyOptions.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"providerOnlyOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/providerOnlyOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAA0B,MAAM,aAAa,CAAC;AA6C7E,wBAAgB,mBAAmB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,GAAE,SAAS,MAAM,EAAO,GAAG,QAAQ,CAiBzI"}
@@ -0,0 +1,56 @@
1
+ const closedPaths = [
2
+ "/sign-in/email",
3
+ "/sign-up/email",
4
+ "/request-password-reset",
5
+ "/reset-password",
6
+ "/change-password",
7
+ "/verify-password",
8
+ "/change-email",
9
+ "/send-verification-email",
10
+ "/verify-email",
11
+ "/sign-in/magic-link",
12
+ "/magic-link/verify",
13
+ "/admin/set-role",
14
+ "/admin/get-user",
15
+ "/admin/create-user",
16
+ "/admin/update-user",
17
+ "/admin/list-users",
18
+ "/admin/list-user-sessions",
19
+ "/admin/unban-user",
20
+ "/admin/ban-user",
21
+ "/admin/impersonate-user",
22
+ "/admin/stop-impersonating",
23
+ "/admin/revoke-user-session",
24
+ "/admin/revoke-user-sessions",
25
+ "/admin/remove-user",
26
+ "/admin/set-user-password",
27
+ "/admin/has-permission",
28
+ ];
29
+ function withoutTokens(before) {
30
+ return async (data, context) => {
31
+ const result = await before?.(data, context);
32
+ if (result === false) {
33
+ return false;
34
+ }
35
+ return { data: { ...data, ...(typeof result === "object" ? result.data : {}), accessToken: null, idToken: null, refreshToken: null } };
36
+ };
37
+ }
38
+ export function providerOnlyOptions(options, enabledPaths = []) {
39
+ const account = options.databaseHooks?.account;
40
+ return {
41
+ ...options,
42
+ account: { ...options.account, storeAccountCookie: false },
43
+ databaseHooks: {
44
+ ...options.databaseHooks,
45
+ account: {
46
+ ...account,
47
+ create: { ...account?.create, before: withoutTokens(account?.create?.before) },
48
+ update: { ...account?.update, before: withoutTokens(account?.update?.before) },
49
+ },
50
+ },
51
+ disabledPaths: [...(options.disabledPaths ?? []), ...closedPaths.filter((path) => !enabledPaths.includes(path))],
52
+ emailAndPassword: { ...options.emailAndPassword, enabled: false },
53
+ session: { ...options.session, cookieCache: { ...options.session?.cookieCache, enabled: false } },
54
+ };
55
+ }
56
+ //# sourceMappingURL=providerOnlyOptions.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"providerOnlyOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/providerOnlyOptions.ts"],"names":[],"mappings":"AAEA,MAAM,WAAW,GAAG;IACnB,gBAAgB;IAChB,gBAAgB;IAChB,yBAAyB;IACzB,iBAAiB;IACjB,kBAAkB;IAClB,kBAAkB;IAClB,eAAe;IACf,0BAA0B;IAC1B,eAAe;IACf,qBAAqB;IACrB,oBAAoB;IACpB,iBAAiB;IACjB,iBAAiB;IACjB,oBAAoB;IACpB,oBAAoB;IACpB,mBAAmB;IACnB,2BAA2B;IAC3B,mBAAmB;IACnB,iBAAiB;IACjB,yBAAyB;IACzB,2BAA2B;IAC3B,4BAA4B;IAC5B,6BAA6B;IAC7B,oBAAoB;IACpB,0BAA0B;IAC1B,uBAAuB;CACvB,CAAC;AAMF,SAAS,aAAa,CAAmB,MAAkB;IAC1D,OAAO,KAAK,EAAE,IAAO,EAAE,OAAsC,EAAE,EAAE;QAChE,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAC7C,IAAI,MAAM,KAAK,KAAK,EAAE,CAAC;YACtB,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;IACxI,CAAC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAqC,OAAiB,EAAE,YAAY,GAAsB,EAAE;IAC9H,MAAM,OAAO,GAAG,OAAO,CAAC,aAAa,EAAE,OAAO,CAAC;IAC/C,OAAO;QACN,GAAG,OAAO;QACV,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE;QAC1D,aAAa,EAAE;YACd,GAAG,OAAO,CAAC,aAAa;YACxB,OAAO,EAAE;gBACR,GAAG,OAAO;gBACV,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;gBAC9E,MAAM,EAAE,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE;aAC9E;SACD;QACD,aAAa,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;QAChH,gBAAgB,EAAE,EAAE,GAAG,OAAO,CAAC,gBAAgB,EAAE,OAAO,EAAE,KAAK,EAAE;QACjE,OAAO,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,EAAE,GAAG,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE;KACjG,CAAC;AACH,CAAC"}
@@ -1,6 +1,7 @@
1
1
  import { type Cause, Effect } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
3
  import { type BearerSessionsOptions } from "#server/better-auth/adapters/bearerSessions.ts";
4
+ import type { HookRefusal } from "#server/better-auth/adapters/hookRuntime.ts";
4
5
  export interface MountedAuth {
5
6
  readonly $context: Promise<{
6
7
  readonly authCookies: {
@@ -12,11 +13,12 @@ export interface MountedAuth {
12
13
  readonly handler: (request: Request) => Promise<Response>;
13
14
  }
14
15
  export interface MountRouteOptions {
16
+ readonly basePath?: string | undefined;
15
17
  readonly bearerSessions?: BearerSessionsOptions | undefined;
16
18
  readonly clientIpHeader: string;
17
19
  readonly ipv6Subnet?: number | undefined;
18
20
  readonly roles?: RoleSet | undefined;
19
- readonly runRequest?: (<A>(request: (signal: AbortSignal) => Promise<A>) => Effect.Effect<A, Cause.UnknownError>) | undefined;
21
+ readonly runRequest?: (<A>(request: (signal: AbortSignal) => Promise<A>) => Effect.Effect<A, Cause.UnknownError | HookRefusal>) | undefined;
20
22
  readonly trustedProxy?: string | undefined;
21
23
  }
22
24
  export declare const response: (auth: MountedAuth, web: Request, options: MountRouteOptions) => Effect.Effect<Response, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("effect/Schema").SchemaError | Cause.UnknownError, never>;
@@ -1 +1 @@
1
- {"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,gDAAgD,CAAC;AAGrJ,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,YAAY,EAAE;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3G,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC1D;AACD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,CAAC,GAAG,SAAS,CAAC;IAC9H,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AA6BD,eAAO,MAAM,QAAQ,+MAUnB,CAAC"}
1
+ {"version":3,"file":"response.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE5C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,gDAAgD,CAAC;AACrJ,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6CAA6C,CAAC;AAG/E,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,YAAY,EAAE;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3G,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC1D;AACD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACvC,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,YAAY,GAAG,WAAW,CAAC,CAAC,GAAG,SAAS,CAAC;IAC5I,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AA8BD,eAAO,MAAM,QAAQ,+MAcnB,CAAC"}
@@ -1,12 +1,13 @@
1
1
  import { Effect } from "effect";
2
+ import * as HttpStatus from "effect/http/HttpStatus";
2
3
  import { cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
3
4
  import { sessionPermissions } from "#server/better-auth/sessionPermissions.ts";
4
- function replacesSession(request, reply, native) {
5
+ function replacesSession(request, reply, native, basePath) {
5
6
  return (native
6
7
  && reply.ok
7
8
  && reply.headers.has("set-auth-token")
8
9
  && request.headers.has("authorization")
9
- && new URL(request.url).pathname.startsWith("/api/auth/sign-in/"));
10
+ && new URL(request.url).pathname.startsWith(`${basePath}/sign-in/`));
10
11
  }
11
12
  async function providerResponse(auth, web, options) {
12
13
  if (options.bearerSessions === undefined) {
@@ -18,8 +19,9 @@ async function providerResponse(auth, web, options) {
18
19
  const native = options.bearerSessions.origins.includes(web.headers.get("origin") ?? "") && !hasSessionCookie(web.headers, cookieName);
19
20
  const request = new Request(web, { headers });
20
21
  const reply = await auth.handler(request);
21
- if (replacesSession(request, reply, native)) {
22
- const revoked = await auth.handler(new Request(new URL("/api/auth/sign-out", web.url), { body: "{}", headers, method: "POST" }));
22
+ const basePath = options.basePath ?? "/api/auth";
23
+ if (replacesSession(request, reply, native, basePath)) {
24
+ const revoked = await auth.handler(new Request(new URL(`${basePath}/sign-out`, web.url), { body: "{}", headers, method: "POST" }));
23
25
  await revoked.body?.cancel();
24
26
  if (!revoked.ok) {
25
27
  throw new Error("Session replacement failed");
@@ -28,14 +30,14 @@ async function providerResponse(auth, web, options) {
28
30
  return native ? reply : cookieSessionResponse(reply);
29
31
  }
30
32
  export const response = Effect.fnUntraced(function* (auth, web, options) {
31
- const sessionRequest = options.roles !== undefined && new URL(web.url).pathname === "/api/auth/get-session";
33
+ const sessionRequest = options.roles !== undefined && new URL(web.url).pathname === `${options.basePath ?? "/api/auth"}/get-session`;
32
34
  const url = new URL(web.url);
33
35
  if (sessionRequest) {
34
36
  url.searchParams.set("disableCookieCache", "true");
35
37
  }
36
38
  const request = sessionRequest ? new Request(url, web) : web;
37
39
  const runRequest = options.runRequest ?? Effect.tryPromise;
38
- const reply = yield* runRequest((signal) => providerResponse(auth, new Request(request, { signal }), options));
40
+ const reply = yield* runRequest((signal) => providerResponse(auth, new Request(request, { signal }), options)).pipe(Effect.catchTag("HookRefusal", ({ code, message }) => Effect.succeed(Response.json({ code, message }, { status: HttpStatus.fromLiteral("Forbidden") }))));
39
41
  return sessionRequest && reply.ok && options.roles !== undefined ? yield* sessionPermissions(reply, options.roles) : reply;
40
42
  });
41
43
  //# sourceMappingURL=response.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"response.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/response.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"roleSeedOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/roleSeedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,iBAAiB,CAgCtH"}
1
+ {"version":3,"file":"roleSeedOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/roleSeedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAKrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAE9E,wBAAgB,eAAe,CAAC,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,SAAS,GAAG,iBAAiB,CAgCtH"}