@shivaedev/identity 0.40.0 → 0.42.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 (75) hide show
  1. package/CHANGELOG.md +16 -0
  2. package/README.md +47 -8
  3. package/dist/Account.d.ts +17 -0
  4. package/dist/Account.d.ts.map +1 -0
  5. package/dist/Account.js +19 -0
  6. package/dist/Account.js.map +1 -0
  7. package/dist/accountPreferenceHeaders.d.ts +5 -0
  8. package/dist/accountPreferenceHeaders.d.ts.map +1 -0
  9. package/dist/accountPreferenceHeaders.js +5 -0
  10. package/dist/accountPreferenceHeaders.js.map +1 -0
  11. package/dist/client/preferencesPlugin.d.ts +17 -0
  12. package/dist/client/preferencesPlugin.d.ts.map +1 -0
  13. package/dist/{server/better-auth/preferencesClient.js → client/preferencesPlugin.js} +7 -7
  14. package/dist/client/preferencesPlugin.js.map +1 -0
  15. package/dist/generated/Account.d.ts +26 -0
  16. package/dist/generated/Account.d.ts.map +1 -0
  17. package/dist/generated/Account.js +18 -0
  18. package/dist/generated/Account.js.map +1 -0
  19. package/dist/server/AccountDeletion.d.ts +11 -0
  20. package/dist/server/AccountDeletion.d.ts.map +1 -0
  21. package/dist/server/AccountDeletion.js +5 -0
  22. package/dist/server/AccountDeletion.js.map +1 -0
  23. package/dist/server/better-auth/AccountDeletionPolicy.d.ts +10 -0
  24. package/dist/server/better-auth/AccountDeletionPolicy.d.ts.map +1 -0
  25. package/dist/server/better-auth/AccountDeletionPolicy.js +4 -0
  26. package/dist/server/better-auth/AccountDeletionPolicy.js.map +1 -0
  27. package/dist/server/better-auth/accountDeletion.d.ts +13 -0
  28. package/dist/server/better-auth/accountDeletion.d.ts.map +1 -0
  29. package/dist/server/better-auth/accountDeletion.js +22 -0
  30. package/dist/server/better-auth/accountDeletion.js.map +1 -0
  31. package/dist/server/better-auth/adapters/accountPreferenceOptions.d.ts.map +1 -1
  32. package/dist/server/better-auth/adapters/accountPreferenceOptions.js +3 -2
  33. package/dist/server/better-auth/adapters/accountPreferenceOptions.js.map +1 -1
  34. package/dist/server/better-auth/adapters/passwordMatches.d.ts +4 -0
  35. package/dist/server/better-auth/adapters/passwordMatches.d.ts.map +1 -0
  36. package/dist/server/better-auth/adapters/passwordMatches.js +9 -0
  37. package/dist/server/better-auth/adapters/passwordMatches.js.map +1 -0
  38. package/dist/server/better-auth/closeAccountDeletion.d.ts +3 -0
  39. package/dist/server/better-auth/closeAccountDeletion.d.ts.map +1 -0
  40. package/dist/server/better-auth/closeAccountDeletion.js +5 -0
  41. package/dist/server/better-auth/closeAccountDeletion.js.map +1 -0
  42. package/dist/server/better-auth/confirmPassword.d.ts +7 -0
  43. package/dist/server/better-auth/confirmPassword.d.ts.map +1 -0
  44. package/dist/server/better-auth/confirmPassword.js +34 -0
  45. package/dist/server/better-auth/confirmPassword.js.map +1 -0
  46. package/dist/server/better-auth/deleteAccount.d.ts +5 -0
  47. package/dist/server/better-auth/deleteAccount.d.ts.map +1 -0
  48. package/dist/server/better-auth/deleteAccount.js +25 -0
  49. package/dist/server/better-auth/deleteAccount.js.map +1 -0
  50. package/dist/server/better-auth/deleteUserRows.d.ts +6 -0
  51. package/dist/server/better-auth/deleteUserRows.d.ts.map +1 -0
  52. package/dist/server/better-auth/deleteUserRows.js +20 -0
  53. package/dist/server/better-auth/deleteUserRows.js.map +1 -0
  54. package/dist/server/better-auth/mount.d.ts.map +1 -1
  55. package/dist/server/better-auth/mount.js +3 -1
  56. package/dist/server/better-auth/mount.js.map +1 -1
  57. package/package.json +6 -6
  58. package/src/Account.ts +20 -0
  59. package/src/accountPreferenceHeaders.ts +4 -0
  60. package/src/client/preferencesPlugin.ts +40 -0
  61. package/src/generated/Account.ts +23 -0
  62. package/src/server/AccountDeletion.ts +14 -0
  63. package/src/server/better-auth/AccountDeletionPolicy.ts +10 -0
  64. package/src/server/better-auth/accountDeletion.ts +41 -0
  65. package/src/server/better-auth/adapters/accountPreferenceOptions.ts +3 -2
  66. package/src/server/better-auth/adapters/passwordMatches.ts +10 -0
  67. package/src/server/better-auth/closeAccountDeletion.ts +6 -0
  68. package/src/server/better-auth/confirmPassword.ts +37 -0
  69. package/src/server/better-auth/deleteAccount.ts +25 -0
  70. package/src/server/better-auth/deleteUserRows.ts +21 -0
  71. package/src/server/better-auth/mount.ts +3 -1
  72. package/dist/server/better-auth/preferencesClient.d.ts +0 -3
  73. package/dist/server/better-auth/preferencesClient.d.ts.map +0 -1
  74. package/dist/server/better-auth/preferencesClient.js.map +0 -1
  75. package/src/server/better-auth/preferencesClient.ts +0 -25
@@ -0,0 +1,25 @@
1
+ import { Effect } from "effect";
2
+ import { invalidationKeys } from "@shivaedev/changes/keys.ts";
3
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
4
+ import { SessionUser } from "#identity.ts";
5
+ import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
6
+ import { accountData } from "#server/better-auth/accountData.ts";
7
+ import { confirmPassword } from "#server/better-auth/confirmPassword.ts";
8
+ import { deleteUserRows } from "#server/better-auth/deleteUserRows.ts";
9
+ import { sessionKeys } from "#signedInSessions.ts";
10
+ import { userKeys } from "#users.ts";
11
+ // An erase that cannot run is the operator's to fix, so its failure is reported with its tables rather than answered to the person.
12
+ export const deleteAccount = Effect.fn("Identity.deleteAccount")(function* (password) {
13
+ const { id } = yield* SessionUser;
14
+ const { auth, handOver } = yield* AccountDeletionPolicy;
15
+ yield* confirmPassword(auth.options, password);
16
+ yield* Effect.gen(function* () {
17
+ yield* handOver(id);
18
+ yield* accountData(auth)
19
+ .eraseOwnedRows(id)
20
+ .pipe(Effect.catchTags({ OwnedModelsUncollected: Effect.die, OwnedTableCycle: Effect.die, UncoveredUserColumns: Effect.die }));
21
+ yield* deleteUserRows(auth.options);
22
+ yield* invalidateOnCommit(invalidationKeys([userKeys.item(id), sessionKeys.list]));
23
+ }).pipe(transact());
24
+ });
25
+ //# sourceMappingURL=deleteAccount.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"deleteAccount.js","sourceRoot":"","sources":["../../../src/server/better-auth/deleteAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AACvE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAErC,oIAAoI;AACpI,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,EAAE,CAAC,wBAAwB,CAAC,CAAC,QAAQ,CAAC,EAAE,QAAgB;IAC3F,MAAM,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;IAClC,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC;IACxD,KAAK,CAAC,CAAC,eAAe,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC/C,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpB,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;aACtB,cAAc,CAAC,EAAE,CAAC;aAClB,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,sBAAsB,EAAE,MAAM,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,CAAC,GAAG,EAAE,oBAAoB,EAAE,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAChI,KAAK,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QACpC,KAAK,CAAC,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IACpF,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrB,CAAC,CAAC,CAAC"}
@@ -0,0 +1,6 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { Effect } from "effect";
3
+ import { SqlClient } from "effect/sql";
4
+ import { SessionUser } from "#identity.ts";
5
+ export declare const deleteUserRows: (options: BetterAuthOptions) => Effect.Effect<void, import("effect/sql/SqlError").SqlError, SessionUser | SqlClient.SqlClient>;
6
+ //# sourceMappingURL=deleteUserRows.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"deleteUserRows.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/deleteUserRows.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAM3C,eAAO,MAAM,cAAc,gIAUzB,CAAC"}
@@ -0,0 +1,20 @@
1
+ import { getAuthTables } from "better-auth/db";
2
+ import { Effect } from "effect";
3
+ import { SqlClient } from "effect/sql";
4
+ import { SessionUser } from "#identity.ts";
5
+ // Better Auth's session and account tables cascade from the user row, so one delete removes the person's sign-ins with it.
6
+ // Verification rows carry no key to the user, so these are the exact identifiers Better Auth 1.7 writes for one person: the user id
7
+ // as a reset or deletion token's value, the address in an email code's identifier, and the id leading a change-email or two-factor code's.
8
+ const ADDRESS_CODES = ["email-verification", "sign-in", "forget-password"];
9
+ export const deleteUserRows = Effect.fn("Identity.deleteUserRows")(function* (options) {
10
+ const { email, id } = yield* SessionUser;
11
+ const { user, verification } = getAuthTables(options);
12
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
13
+ const identifier = sql(verification?.fields.identifier?.fieldName ?? "identifier");
14
+ const value = sql(verification?.fields.value?.fieldName ?? "value");
15
+ const codes = ADDRESS_CODES.map((type) => `${type}-otp-${email}`);
16
+ yield* sql `delete from ${sql(verification?.modelName ?? "verification")} where ${value} = ${id} or ${identifier} in ${sql.in(codes)}
17
+ or starts_with(${identifier}, ${`change-email-otp-${id}:`}) or starts_with(${identifier}, ${`2fa-otp-${id}!`})`;
18
+ yield* sql `delete from ${sql(user?.modelName ?? "user")} where id = ${id}`;
19
+ });
20
+ //# sourceMappingURL=deleteUserRows.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"deleteUserRows.js","sourceRoot":"","sources":["../../../src/server/better-auth/deleteUserRows.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,2HAA2H;AAC3H,oIAAoI;AACpI,2IAA2I;AAC3I,MAAM,aAAa,GAAG,CAAC,oBAAoB,EAAE,SAAS,EAAE,iBAAiB,CAAC,CAAC;AAC3E,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,QAAQ,CAAC,EAAE,OAA0B;IACvG,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;IACzC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,UAAU,GAAG,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,UAAU,EAAE,SAAS,IAAI,YAAY,CAAC,CAAC;IACnF,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,EAAE,MAAM,CAAC,KAAK,EAAE,SAAS,IAAI,OAAO,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,QAAQ,KAAK,EAAE,CAAC,CAAC;IAClE,KAAK,CAAC,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,YAAY,EAAE,SAAS,IAAI,cAAc,CAAC,UAAU,KAAK,MAAM,EAAE,OAAO,UAAU,OAAO,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC;mBACjH,UAAU,KAAK,oBAAoB,EAAE,GAAG,oBAAoB,UAAU,KAAK,WAAW,EAAE,GAAG,GAAG,CAAC;IACjH,KAAK,CAAC,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;AAC5E,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,7 @@ import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts
18
18
  import { fromStorage, signInGate } from "#server/better-auth/adapters/signInGate.ts";
19
19
  import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
20
20
  import { changeHooks } from "#server/better-auth/changeHooks.ts";
21
+ import { closeAccountDeletion } from "#server/better-auth/closeAccountDeletion.ts";
21
22
  import { closeRoleEndpoints } from "#server/better-auth/closeRoleEndpoints.ts";
22
23
  import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
23
24
  import { mountSettings } from "#server/better-auth/mountSettings.ts";
@@ -44,7 +45,8 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (declaration, mount
44
45
  const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
45
46
  const announced = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), changeHooks, runtime);
46
47
  const hooked = effectHookOptions(announced, mount.databaseHooks, runtime);
47
- const configured = declaration.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), declaration);
48
+ const closed = closeAccountDeletion(hooked);
49
+ const configured = declaration.roles === undefined ? closed : storedRoleOptions(closeRoleEndpoints(closed), declaration);
48
50
  const gated = yield* signInPolicyOptions(configured, gate, () => auth.$context);
49
51
  const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
50
52
  const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
@@ -1 +1 @@
1
- {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/identity",
3
- "version": "0.40.0",
3
+ "version": "0.42.0",
4
4
  "description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
5
5
  "keywords": [
6
6
  "effect"
@@ -58,11 +58,11 @@
58
58
  "@better-auth/oauth-provider": "1.7.23",
59
59
  "@effect/platform-node": "4.1.4",
60
60
  "@effect/sql-pg": "4.1.4",
61
- "@shivaedev/admin": "0.29.2",
62
- "@shivaedev/build": "0.7.1",
63
- "@shivaedev/quality": "0.83.4",
64
- "@shivaedev/server": "0.43.0",
65
- "@shivaedev/test-kits": "0.16.5",
61
+ "@shivaedev/admin": "0.29.4",
62
+ "@shivaedev/build": "0.8.1",
63
+ "@shivaedev/quality": "0.84.0",
64
+ "@shivaedev/server": "0.44.2",
65
+ "@shivaedev/test-kits": "0.16.8",
66
66
  "@shivaedev/test-sql": "0.26.1",
67
67
  "@shivaedev/test-story": "0.52.5",
68
68
  "@types/node": "24.19.2",
package/src/Account.ts ADDED
@@ -0,0 +1,20 @@
1
+ import { Schema } from "effect";
2
+ import { defineModule } from "@shivaedev/contract/defineModule.ts";
3
+ import { command } from "@shivaedev/contract/operation.ts";
4
+ import { identityAccountWire } from "#generated/Account.ts";
5
+ import { AuthenticatedUser } from "#middleware.ts";
6
+ import { AccountDeletion } from "#server/AccountDeletion.ts";
7
+
8
+ const DeleteAccount = command("delete", {
9
+ payload: { password: Schema.String },
10
+ *run({ password }) {
11
+ yield* (yield* AccountDeletion).delete(password);
12
+ },
13
+ });
14
+
15
+ export const Account = defineModule({
16
+ middleware: AuthenticatedUser,
17
+ name: "identity.account",
18
+ operations: [DeleteAccount],
19
+ wire: identityAccountWire,
20
+ });
@@ -0,0 +1,4 @@
1
+ export const accountPreferenceHeaders = {
2
+ locale: "x-platform-account-locale",
3
+ timezone: "x-platform-account-timezone",
4
+ } as const;
@@ -0,0 +1,40 @@
1
+ import { accountPreferenceHeaders } from "#accountPreferenceHeaders.ts";
2
+
3
+ // Structural copies of the Better Auth client plugin shapes: the client core must not reach the optional better-auth peer.
4
+ interface PreferenceRequest {
5
+ readonly headers: Headers;
6
+ }
7
+
8
+ interface PreferenceFetchPlugin {
9
+ readonly hooks: { readonly onRequest: (context: PreferenceRequest) => void };
10
+ readonly id: string;
11
+ readonly name: string;
12
+ }
13
+
14
+ export interface PreferencesPlugin {
15
+ readonly fetchPlugins: PreferenceFetchPlugin[];
16
+ readonly id: "identity-account-preferences";
17
+ }
18
+
19
+ export function preferencesPlugin(): PreferencesPlugin {
20
+ return {
21
+ fetchPlugins: [
22
+ {
23
+ hooks: {
24
+ onRequest(context) {
25
+ // A server-rendered auth call would send the server's zone, so only a page or app shell sends one.
26
+ if (!("window" in globalThis)) {
27
+ return;
28
+ }
29
+ const { locale, timeZone } = new Intl.DateTimeFormat().resolvedOptions();
30
+ context.headers.set(accountPreferenceHeaders.timezone, timeZone);
31
+ context.headers.set(accountPreferenceHeaders.locale, locale);
32
+ },
33
+ },
34
+ id: "identity-account-preferences",
35
+ name: "identity-account-preferences",
36
+ },
37
+ ],
38
+ id: "identity-account-preferences",
39
+ };
40
+ }
@@ -0,0 +1,23 @@
1
+ // Generated by @shivaedev/build from src/Account.ts. Do not edit or commit this file; run `pnpm generate` to write it again.
2
+ import type { Account as AccountModule } from "#Account.ts";
3
+ import { AuthenticatedUser } from "#middleware.ts";
4
+ import { clientContract } from "@shivaedev/contract/clientContract.ts";
5
+ import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
6
+ import { AuthUnavailable, BadRequest, PreconditionFailed } from "@shivaedev/errors/taxonomy.ts";
7
+ import { Schema } from "effect";
8
+
9
+ export const identityAccountWire = {
10
+ delete: { rejections: { AuthUnavailable, BadRequest, PreconditionFailed }, success: Schema.Void },
11
+ } as const;
12
+
13
+ export const Account = clientContract({
14
+ commands: ["delete"],
15
+ middleware: AuthenticatedUser,
16
+ name: "identity.account",
17
+ payloads: {
18
+ delete: { password: Schema.String },
19
+ },
20
+ wire: identityAccountWire,
21
+ });
22
+
23
+ export const identityAccountMatchModule: ClientMatchesModule<typeof Account, typeof AccountModule> = true;
@@ -0,0 +1,14 @@
1
+ import { Context, type Effect, type Schema } from "effect";
2
+ import type { SqlError } from "effect/sql/SqlError";
3
+ import type { AuthUnavailable, BadRequest, PreconditionFailed } from "@shivaedev/errors/taxonomy.ts";
4
+ import type { SessionUser } from "#identity.ts";
5
+
6
+ // The account module's port, so the module stays free of the provider that implements the deletion.
7
+ export class AccountDeletion extends Context.Service<
8
+ AccountDeletion,
9
+ {
10
+ readonly delete: (
11
+ password: string,
12
+ ) => Effect.Effect<void, AuthUnavailable | BadRequest | PreconditionFailed | Schema.SchemaError | SqlError, SessionUser>;
13
+ }
14
+ >()("@shivaedev/identity/AccountDeletion") {}
@@ -0,0 +1,10 @@
1
+ import { Context, type Effect } from "effect";
2
+ import type { AuthSchemaDeclaration } from "#server/better-auth/define.ts";
3
+
4
+ export class AccountDeletionPolicy extends Context.Service<
5
+ AccountDeletionPolicy,
6
+ {
7
+ readonly auth: Pick<AuthSchemaDeclaration, "options">;
8
+ readonly handOver: (userId: string) => Effect.Effect<void>;
9
+ }
10
+ >()("@shivaedev/identity/AccountDeletionPolicy") {}
@@ -0,0 +1,41 @@
1
+ import { type Context, Effect, Layer } from "effect";
2
+ import * as Reactivity from "effect/reactivity/Reactivity";
3
+ import { SqlClient } from "effect/sql";
4
+ import { AccountDeletion } from "#server/AccountDeletion.ts";
5
+ import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
6
+ import type { AuthSchemaDeclaration } from "#server/better-auth/define.ts";
7
+ import { deleteAccount } from "#server/better-auth/deleteAccount.ts";
8
+
9
+ export interface AccountHandOver<E> {
10
+ readonly handOver: (userId: string) => Effect.Effect<void, E>;
11
+ }
12
+
13
+ export interface AccountDeletionOptions<TIdentifier, E> {
14
+ readonly handOver?: Context.Service<TIdentifier, AccountHandOver<E>> | undefined;
15
+ }
16
+
17
+ // A hand-over's failure is the application's to fix, so it is reported rather than answered to the person.
18
+ export function accountDeletion<TIdentifier = never, E = never>(
19
+ auth: Pick<AuthSchemaDeclaration, "options">,
20
+ options: AccountDeletionOptions<TIdentifier, E> = {},
21
+ ) {
22
+ return Layer.effect(AccountDeletion)(
23
+ Effect.gen(function* () {
24
+ const sql = yield* SqlClient.SqlClient;
25
+ const reactivity = yield* Reactivity.Reactivity;
26
+ const service = options.handOver === undefined ? undefined : yield* options.handOver;
27
+ const policy = {
28
+ auth,
29
+ handOver: (userId: string) => (service === undefined ? Effect.void : Effect.orDie(service.handOver(userId))),
30
+ };
31
+ return AccountDeletion.of({
32
+ delete: (password) =>
33
+ deleteAccount(password).pipe(
34
+ Effect.provideService(AccountDeletionPolicy, policy),
35
+ Effect.provideService(SqlClient.SqlClient, sql),
36
+ Effect.provideService(Reactivity.Reactivity, reactivity),
37
+ ),
38
+ });
39
+ }),
40
+ );
41
+ }
@@ -1,6 +1,7 @@
1
1
  import type { BetterAuthOptions, BetterAuthPlugin } from "better-auth";
2
2
  import { createAuthMiddleware } from "better-auth/api";
3
3
  import { Effect, Option, Schema } from "effect";
4
+ import { accountPreferenceHeaders } from "#accountPreferenceHeaders.ts";
4
5
  import { AccountPreferenceValues } from "#accountPreferenceValues.ts";
5
6
  import { AccountPreferencesStore } from "#server/account-preferences/service.ts";
6
7
 
@@ -10,8 +11,8 @@ export const accountPreferenceOptions = Effect.fnUntraced(function* <TOptions ex
10
11
  const capture = createAuthMiddleware(async (context) => {
11
12
  const session = context.context.newSession ?? context.context.session;
12
13
  const values = Schema.decodeUnknownOption(AccountPreferenceValues)({
13
- locale: context.headers?.get("x-platform-account-locale"),
14
- timezone: context.headers?.get("x-platform-account-timezone"),
14
+ locale: context.headers?.get(accountPreferenceHeaders.locale),
15
+ timezone: context.headers?.get(accountPreferenceHeaders.timezone),
15
16
  units: "metric",
16
17
  });
17
18
  if (session !== null && session !== undefined && Option.isSome(values)) {
@@ -0,0 +1,10 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { verifyPassword } from "better-auth/crypto";
3
+ import { Effect } from "effect";
4
+ import { providerFailure } from "#server/providerFailure.ts";
5
+
6
+ // Better Auth's context resolves the verifier the same way, so a custom hash in the options is checked by its own verify.
7
+ export function passwordMatches(options: BetterAuthOptions, hash: string, password: string) {
8
+ const verify = options.emailAndPassword?.password?.verify ?? verifyPassword;
9
+ return Effect.tryPromise(() => verify({ hash, password })).pipe(Effect.catch(providerFailure));
10
+ }
@@ -0,0 +1,6 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+
3
+ // Identity's account module is the one way to delete an account, because Better Auth's deletion runs outside any transaction.
4
+ export function closeAccountDeletion<TOptions extends BetterAuthOptions>(options: TOptions): TOptions {
5
+ return { ...options, disabledPaths: [...(options.disabledPaths ?? []), "/delete-user", "/delete-user/callback", "/admin/remove-user"] };
6
+ }
@@ -0,0 +1,37 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { getAuthTables } from "better-auth/db";
3
+ import { Effect, Option, Schema } from "effect";
4
+ import { SqlClient, SqlSchema } from "effect/sql";
5
+ import { BadRequest, PreconditionFailed } from "@shivaedev/errors/taxonomy.ts";
6
+ import { SessionUser } from "#identity.ts";
7
+ import { passwordMatches } from "#server/better-auth/adapters/passwordMatches.ts";
8
+
9
+ // Better Auth's own limit when the options set none; a longer input is refused before it reaches the hash.
10
+ const MAX_PASSWORD_LENGTH = 128;
11
+
12
+ const Credential = Schema.Struct({ password: Schema.String });
13
+
14
+ export const confirmPassword = Effect.fn("Identity.confirmPassword")(function* (options: BetterAuthOptions, password: string) {
15
+ const { id: userId } = yield* SessionUser;
16
+ const { account } = getAuthTables(options);
17
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
18
+ function column(field: "password" | "providerId" | "userId") {
19
+ return sql(account?.fields[field]?.fieldName ?? field);
20
+ }
21
+ const credential = yield* SqlSchema.findOneOption({
22
+ execute: (id) => sql`select ${column("password")} as password from ${sql(account?.modelName ?? "account")}
23
+ where ${column("userId")} = ${id} and ${column("providerId")} = 'credential' and ${column("password")} is not null`,
24
+ Request: Schema.String,
25
+ Result: Credential,
26
+ })(userId);
27
+ if (Option.isNone(credential)) {
28
+ return yield* new PreconditionFailed({ message: "This account has no password to confirm its deletion with." });
29
+ }
30
+ const maximum = options.emailAndPassword?.maxPasswordLength ?? MAX_PASSWORD_LENGTH;
31
+ if (password.length === 0 || password.length > maximum) {
32
+ return yield* new BadRequest({ field: "password", message: "Enter your current password." });
33
+ }
34
+ if (!(yield* passwordMatches(options, credential.value.password, password))) {
35
+ return yield* new BadRequest({ field: "password", message: "The password is incorrect." });
36
+ }
37
+ });
@@ -0,0 +1,25 @@
1
+ import { Effect } from "effect";
2
+ import { invalidationKeys } from "@shivaedev/changes/keys.ts";
3
+ import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
4
+ import { SessionUser } from "#identity.ts";
5
+ import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
6
+ import { accountData } from "#server/better-auth/accountData.ts";
7
+ import { confirmPassword } from "#server/better-auth/confirmPassword.ts";
8
+ import { deleteUserRows } from "#server/better-auth/deleteUserRows.ts";
9
+ import { sessionKeys } from "#signedInSessions.ts";
10
+ import { userKeys } from "#users.ts";
11
+
12
+ // An erase that cannot run is the operator's to fix, so its failure is reported with its tables rather than answered to the person.
13
+ export const deleteAccount = Effect.fn("Identity.deleteAccount")(function* (password: string) {
14
+ const { id } = yield* SessionUser;
15
+ const { auth, handOver } = yield* AccountDeletionPolicy;
16
+ yield* confirmPassword(auth.options, password);
17
+ yield* Effect.gen(function* () {
18
+ yield* handOver(id);
19
+ yield* accountData(auth)
20
+ .eraseOwnedRows(id)
21
+ .pipe(Effect.catchTags({ OwnedModelsUncollected: Effect.die, OwnedTableCycle: Effect.die, UncoveredUserColumns: Effect.die }));
22
+ yield* deleteUserRows(auth.options);
23
+ yield* invalidateOnCommit(invalidationKeys([userKeys.item(id), sessionKeys.list]));
24
+ }).pipe(transact());
25
+ });
@@ -0,0 +1,21 @@
1
+ import type { BetterAuthOptions } from "better-auth";
2
+ import { getAuthTables } from "better-auth/db";
3
+ import { Effect } from "effect";
4
+ import { SqlClient } from "effect/sql";
5
+ import { SessionUser } from "#identity.ts";
6
+
7
+ // Better Auth's session and account tables cascade from the user row, so one delete removes the person's sign-ins with it.
8
+ // Verification rows carry no key to the user, so these are the exact identifiers Better Auth 1.7 writes for one person: the user id
9
+ // as a reset or deletion token's value, the address in an email code's identifier, and the id leading a change-email or two-factor code's.
10
+ const ADDRESS_CODES = ["email-verification", "sign-in", "forget-password"];
11
+ export const deleteUserRows = Effect.fn("Identity.deleteUserRows")(function* (options: BetterAuthOptions) {
12
+ const { email, id } = yield* SessionUser;
13
+ const { user, verification } = getAuthTables(options);
14
+ const sql = (yield* SqlClient.SqlClient).withoutTransforms();
15
+ const identifier = sql(verification?.fields.identifier?.fieldName ?? "identifier");
16
+ const value = sql(verification?.fields.value?.fieldName ?? "value");
17
+ const codes = ADDRESS_CODES.map((type) => `${type}-otp-${email}`);
18
+ yield* sql`delete from ${sql(verification?.modelName ?? "verification")} where ${value} = ${id} or ${identifier} in ${sql.in(codes)}
19
+ or starts_with(${identifier}, ${`change-email-otp-${id}:`}) or starts_with(${identifier}, ${`2fa-otp-${id}!`})`;
20
+ yield* sql`delete from ${sql(user?.modelName ?? "user")} where id = ${id}`;
21
+ });
@@ -22,6 +22,7 @@ import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts
22
22
  import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/adapters/signInGate.ts";
23
23
  import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
24
24
  import { changeHooks } from "#server/better-auth/changeHooks.ts";
25
+ import { closeAccountDeletion } from "#server/better-auth/closeAccountDeletion.ts";
25
26
  import { closeRoleEndpoints } from "#server/better-auth/closeRoleEndpoints.ts";
26
27
  import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
27
28
  import type { AuthDeclaration } from "#server/better-auth/define.ts";
@@ -73,7 +74,8 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
73
74
  const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
74
75
  const announced = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), changeHooks, runtime);
75
76
  const hooked = effectHookOptions(announced, mount.databaseHooks, runtime);
76
- const configured = declaration.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), declaration);
77
+ const closed = closeAccountDeletion(hooked);
78
+ const configured = declaration.roles === undefined ? closed : storedRoleOptions(closeRoleEndpoints(closed), declaration);
77
79
  const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
78
80
  const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
79
81
  const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
@@ -1,3 +0,0 @@
1
- import type { BetterAuthClientPlugin } from "better-auth/client";
2
- export declare function preferencesClient(): Pick<BetterAuthClientPlugin, "id" | "fetchPlugins">;
3
- //# sourceMappingURL=preferencesClient.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"preferencesClient.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/preferencesClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAEjE,wBAAgB,iBAAiB,IAAI,IAAI,CAAC,sBAAsB,EAAE,IAAI,GAAG,cAAc,CAAC,CAsBvF"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"preferencesClient.js","sourceRoot":"","sources":["../../../src/server/better-auth/preferencesClient.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,iBAAiB;IAChC,OAAO;QACN,YAAY,EAAE;YACb;gBACC,KAAK,EAAE;oBACN,SAAS,CAAC,OAAO;wBAChB,IAAI,CAAC,CAAC,QAAQ,IAAI,UAAU,CAAC,EAAE,CAAC;4BAC/B,OAAO,OAAO,CAAC;wBAChB,CAAC;wBACD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,eAAe,EAAE,CAAC;wBACzE,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;wBAC7C,OAAO,CAAC,GAAG,CAAC,6BAA6B,EAAE,QAAQ,CAAC,CAAC;wBACrD,OAAO,CAAC,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;wBACjD,OAAO,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,CAAC;oBAChC,CAAC;iBACD;gBACD,EAAE,EAAE,8BAA8B;gBAClC,IAAI,EAAE,8BAA8B;aACpC;SACD;QACD,EAAE,EAAE,8BAA8B;KAClC,CAAC;AACH,CAAC"}
@@ -1,25 +0,0 @@
1
- import type { BetterAuthClientPlugin } from "better-auth/client";
2
-
3
- export function preferencesClient(): Pick<BetterAuthClientPlugin, "id" | "fetchPlugins"> {
4
- return {
5
- fetchPlugins: [
6
- {
7
- hooks: {
8
- onRequest(context) {
9
- if (!("window" in globalThis)) {
10
- return context;
11
- }
12
- const { locale, timeZone } = new Intl.DateTimeFormat().resolvedOptions();
13
- const headers = new Headers(context.headers);
14
- headers.set("x-platform-account-timezone", timeZone);
15
- headers.set("x-platform-account-locale", locale);
16
- return { ...context, headers };
17
- },
18
- },
19
- id: "identity-account-preferences",
20
- name: "identity-account-preferences",
21
- },
22
- ],
23
- id: "identity-account-preferences",
24
- };
25
- }