@shivaedev/identity 0.41.0 → 0.43.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.
- package/CHANGELOG.md +22 -0
- package/README.md +39 -3
- package/dist/Account.d.ts +18 -0
- package/dist/Account.d.ts.map +1 -0
- package/dist/Account.js +19 -0
- package/dist/Account.js.map +1 -0
- package/dist/generated/Account.d.ts +28 -0
- package/dist/generated/Account.d.ts.map +1 -0
- package/dist/generated/Account.js +18 -0
- package/dist/generated/Account.js.map +1 -0
- package/dist/identity.d.ts +2 -0
- package/dist/identity.d.ts.map +1 -1
- package/dist/identity.js +1 -0
- package/dist/identity.js.map +1 -1
- package/dist/server/AccountDeletion.d.ts +12 -0
- package/dist/server/AccountDeletion.d.ts.map +1 -0
- package/dist/server/AccountDeletion.js +5 -0
- package/dist/server/AccountDeletion.js.map +1 -0
- package/dist/server/better-auth/AccountDeletionPolicy.d.ts +10 -0
- package/dist/server/better-auth/AccountDeletionPolicy.d.ts.map +1 -0
- package/dist/server/better-auth/AccountDeletionPolicy.js +4 -0
- package/dist/server/better-auth/AccountDeletionPolicy.js.map +1 -0
- package/dist/server/better-auth/accountDeletion.d.ts +14 -0
- package/dist/server/better-auth/accountDeletion.d.ts.map +1 -0
- package/dist/server/better-auth/accountDeletion.js +24 -0
- package/dist/server/better-auth/accountDeletion.js.map +1 -0
- package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.js +7 -1
- package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -1
- package/dist/server/better-auth/adapters/passwordMatches.d.ts +4 -0
- package/dist/server/better-auth/adapters/passwordMatches.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/passwordMatches.js +9 -0
- package/dist/server/better-auth/adapters/passwordMatches.js.map +1 -0
- package/dist/server/better-auth/closeAccountDeletion.d.ts +3 -0
- package/dist/server/better-auth/closeAccountDeletion.d.ts.map +1 -0
- package/dist/server/better-auth/closeAccountDeletion.js +5 -0
- package/dist/server/better-auth/closeAccountDeletion.js.map +1 -0
- package/dist/server/better-auth/confirmPassword.d.ts +7 -0
- package/dist/server/better-auth/confirmPassword.d.ts.map +1 -0
- package/dist/server/better-auth/confirmPassword.js +34 -0
- package/dist/server/better-auth/confirmPassword.js.map +1 -0
- package/dist/server/better-auth/deleteAccount.d.ts +5 -0
- package/dist/server/better-auth/deleteAccount.d.ts.map +1 -0
- package/dist/server/better-auth/deleteAccount.js +28 -0
- package/dist/server/better-auth/deleteAccount.js.map +1 -0
- package/dist/server/better-auth/deleteUserRows.d.ts +6 -0
- package/dist/server/better-auth/deleteUserRows.d.ts.map +1 -0
- package/dist/server/better-auth/deleteUserRows.js +20 -0
- package/dist/server/better-auth/deleteUserRows.js.map +1 -0
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +3 -1
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/seedUsers.js +1 -1
- package/dist/server/better-auth/seedUsers.js.map +1 -1
- package/dist/server/localOwner.d.ts +2 -0
- package/dist/server/localOwner.d.ts.map +1 -1
- package/dist/server/localOwner.js +3 -1
- package/dist/server/localOwner.js.map +1 -1
- package/dist/server/machineTokens.d.ts +2 -0
- package/dist/server/machineTokens.d.ts.map +1 -1
- package/dist/server/machineTokens.js +1 -1
- package/dist/server/machineTokens.js.map +1 -1
- package/dist/server/providerAccountsUser.d.ts +1 -0
- package/dist/server/providerAccountsUser.d.ts.map +1 -1
- package/package.json +5 -5
- package/src/Account.ts +20 -0
- package/src/generated/Account.ts +23 -0
- package/src/identity.ts +1 -0
- package/src/server/AccountDeletion.ts +19 -0
- package/src/server/better-auth/AccountDeletionPolicy.ts +10 -0
- package/src/server/better-auth/accountDeletion.ts +44 -0
- package/src/server/better-auth/adapters/oauthGrants.ts +7 -1
- package/src/server/better-auth/adapters/passwordMatches.ts +10 -0
- package/src/server/better-auth/closeAccountDeletion.ts +6 -0
- package/src/server/better-auth/confirmPassword.ts +37 -0
- package/src/server/better-auth/deleteAccount.ts +28 -0
- package/src/server/better-auth/deleteUserRows.ts +21 -0
- package/src/server/better-auth/mount.ts +3 -1
- package/src/server/better-auth/seedUsers.ts +1 -1
- package/src/server/localOwner.ts +3 -1
- package/src/server/machineTokens.ts +1 -1
|
@@ -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":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAG5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAOvF,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,2CAA2C,CAAC;AAQ3G,OAAO,EAAmC,KAAK,YAAY,EAAc,MAAM,4CAA4C,CAAC;
|
|
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
|
|
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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"}
|
|
@@ -9,7 +9,7 @@ export const seedUsers = Effect.fn("Identity.seedUsers")(function* (auth, seed)
|
|
|
9
9
|
const user = yield* provisioning.findOrCreateUser(persona);
|
|
10
10
|
yield* assignRole(auth, user.id, persona.role);
|
|
11
11
|
const access = yield* auth.roles.resolve(persona.role);
|
|
12
|
-
yield* seed.run.pipe(Effect.provideService(Identity, { id: user.id }), Effect.provideService(SessionUser, { email: user.email, id: user.id, name: user.name, ...access }), Effect.provideService(CurrentViewer, Option.some({ id: user.id })), Effect.annotateLogs({ userId: user.id }));
|
|
12
|
+
yield* seed.run.pipe(Effect.provideService(Identity, { id: user.id }), Effect.provideService(SessionUser, { email: user.email, emailVerified: user.emailVerified, id: user.id, name: user.name, ...access }), Effect.provideService(CurrentViewer, Option.some({ id: user.id })), Effect.annotateLogs({ userId: user.id }));
|
|
13
13
|
}
|
|
14
14
|
});
|
|
15
15
|
//# sourceMappingURL=seedUsers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seedUsers.js","sourceRoot":"","sources":["../../../src/server/better-auth/seedUsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,EACjE,IAAgC,EAChC,IAA8B;IAE9B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC;IAC7C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3D,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CACnB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAChD,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"seedUsers.js","sourceRoot":"","sources":["../../../src/server/better-auth/seedUsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,EACjE,IAAgC,EAChC,IAA8B;IAE9B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC;IAC7C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3D,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CACnB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAChD,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,EACrI,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAClE,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CACxC,CAAC;IACH,CAAC;AACF,CAAC,CAAC,CAAC"}
|
|
@@ -35,6 +35,7 @@ export declare const localOwner: (options: {
|
|
|
35
35
|
readonly strength: "any" | "own";
|
|
36
36
|
}[];
|
|
37
37
|
role: string;
|
|
38
|
+
emailVerified: boolean;
|
|
38
39
|
};
|
|
39
40
|
}> | Option.Some<{
|
|
40
41
|
machine: {
|
|
@@ -51,6 +52,7 @@ export declare const localOwner: (options: {
|
|
|
51
52
|
readonly strength: "any" | "own";
|
|
52
53
|
}[];
|
|
53
54
|
role: string;
|
|
55
|
+
emailVerified: boolean;
|
|
54
56
|
};
|
|
55
57
|
}>, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
|
|
56
58
|
revoke: (id: string) => Effect.Effect<void, import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localOwner.d.ts","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMrD,eAAO,MAAM,UAAU;6BACG,SAAS,MAAM,EAAE,GAAG,SAAS;oBACtC,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE;oBAC3E,OAAO;0CACe,QAAQ,CAAC,KAAK
|
|
1
|
+
{"version":3,"file":"localOwner.d.ts","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAMrD,eAAO,MAAM,UAAU;6BACG,SAAS,MAAM,EAAE,GAAG,SAAS;oBACtC,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE;oBAC3E,OAAO;0CACe,QAAQ,CAAC,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mQA0BnD,CAAC"}
|
|
@@ -21,7 +21,9 @@ export const localOwner = Effect.fn("Identity.localOwner")(function* (options) {
|
|
|
21
21
|
if (bearer === undefined) {
|
|
22
22
|
return Effect.succeed(Option.none());
|
|
23
23
|
}
|
|
24
|
-
return bearer === Redacted.value(token)
|
|
24
|
+
return bearer === Redacted.value(token)
|
|
25
|
+
? Effect.succeed(Option.some({ user: { ...owner, emailVerified: true, ...access } }))
|
|
26
|
+
: machines.resolve(bearer);
|
|
25
27
|
},
|
|
26
28
|
},
|
|
27
29
|
streamRevalidationInterval: options.streamRevalidationInterval,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"localOwner.js","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,EAAE,OAKrE;IACA,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,MAAM,QAAQ,GAA6B;QAC1C,aAAa;QACb,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACjH,QAAQ,EAAE;YACT,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;gBAChB,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;gBAC3F,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,MAAM,KAAK,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"localOwner.js","sourceRoot":"","sources":["../../src/server/localOwner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAiB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,KAAK,GAAG,MAAM,qBAAqB,CAAC;AAG3C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGjE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,EAAE,CAAC,qBAAqB,CAAC,CAAC,QAAQ,CAAC,EAAE,OAKrE;IACA,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC;IACjC,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,qBAAqB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAC1E,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;IAChD,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,cAAc,EAAE,CAAC;IACjC,MAAM,QAAQ,GAA6B;QAC1C,aAAa;QACb,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC;QACjH,QAAQ,EAAE;YACT,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;gBAChB,MAAM,MAAM,GAAG,0BAA0B,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC;gBAC3F,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC1B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtC,CAAC;gBACD,OAAO,MAAM,KAAK,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC;oBACtC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,CAAC,CAAC;oBACrF,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAC7B,CAAC;SACD;QACD,0BAA0B,EAAE,OAAO,CAAC,0BAA0B;KAC9D,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;AACtC,CAAC,CAAC,CAAC"}
|
|
@@ -30,6 +30,7 @@ export declare const machineTokens: (options: {
|
|
|
30
30
|
readonly strength: "any" | "own";
|
|
31
31
|
}[];
|
|
32
32
|
role: string;
|
|
33
|
+
emailVerified: boolean;
|
|
33
34
|
};
|
|
34
35
|
}> | Option.Some<{
|
|
35
36
|
machine: {
|
|
@@ -46,6 +47,7 @@ export declare const machineTokens: (options: {
|
|
|
46
47
|
readonly strength: "any" | "own";
|
|
47
48
|
}[];
|
|
48
49
|
role: string;
|
|
50
|
+
emailVerified: boolean;
|
|
49
51
|
};
|
|
50
52
|
}>, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
|
|
51
53
|
revoke: (id: string) => Effect.Effect<void, Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machineTokens.d.ts","sourceRoot":"","sources":["../../src/server/machineTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAUrD,eAAO,MAAM,aAAa;oBACT,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;oBAC/C,OAAO;;;uBAaqD,MAAM;wBAAkB,MAAM;;cAA9B,MAAM;eAAkB,MAAM;;;;;;YAmB5F,EAAE;YAAmB,IAAI;YAAqB,KAAK
|
|
1
|
+
{"version":3,"file":"machineTokens.d.ts","sourceRoot":"","sources":["../../src/server/machineTokens.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGrD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAUrD,eAAO,MAAM,aAAa;oBACT,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,MAAM,GAAG,OAAO,CAAC;oBAC/C,OAAO;;;uBAaqD,MAAM;wBAAkB,MAAM;;cAA9B,MAAM;eAAkB,MAAM;;;;;;YAmB5F,EAAE;YAAmB,IAAI;YAAqB,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+JAMhE,CAAC"}
|
|
@@ -38,7 +38,7 @@ export const machineTokens = Effect.fn("Identity.machineTokens")(function* (opti
|
|
|
38
38
|
const access = yield* options.roles.resolve(stored.value.scope).pipe(Effect.option);
|
|
39
39
|
return Option.map(access, (grants) => ({
|
|
40
40
|
machine: { id: stored.value.id, name: stored.value.name, scope: stored.value.scope },
|
|
41
|
-
user: { ...options.owner, ...grants },
|
|
41
|
+
user: { ...options.owner, emailVerified: true, ...grants },
|
|
42
42
|
}));
|
|
43
43
|
}),
|
|
44
44
|
revoke: Effect.fn("MachineTokens.revoke")((id) => repository.delete({ id, ownerId: options.owner.id })),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machineTokens.js","sourceRoot":"","sources":["../../src/server/machineTokens.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"machineTokens.js","sourceRoot":"","sources":["../../src/server/machineTokens.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"providerAccountsUser.d.ts","sourceRoot":"","sources":["../../src/server/providerAccountsUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAQxD,eAAO,MAAM,oBAAoB
|
|
1
|
+
{"version":3,"file":"providerAccountsUser.d.ts","sourceRoot":"","sources":["../../src/server/providerAccountsUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAQxD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;gBAO/B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.43.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.
|
|
62
|
-
"@shivaedev/build": "0.
|
|
61
|
+
"@shivaedev/admin": "0.29.6",
|
|
62
|
+
"@shivaedev/build": "0.9.1",
|
|
63
63
|
"@shivaedev/quality": "0.84.0",
|
|
64
|
-
"@shivaedev/server": "0.
|
|
65
|
-
"@shivaedev/test-kits": "0.16.
|
|
64
|
+
"@shivaedev/server": "0.46.0",
|
|
65
|
+
"@shivaedev/test-kits": "0.16.10",
|
|
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,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, TooManyRequests } from "@shivaedev/errors/taxonomy.ts";
|
|
7
|
+
import { Schema } from "effect";
|
|
8
|
+
|
|
9
|
+
export const identityAccountWire = {
|
|
10
|
+
delete: { rejections: { AuthUnavailable, BadRequest, PreconditionFailed, TooManyRequests }, 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;
|
package/src/identity.ts
CHANGED
|
@@ -13,6 +13,7 @@ export interface ProviderAccountValue {
|
|
|
13
13
|
}
|
|
14
14
|
export const SessionUserSchema = Schema.Struct({
|
|
15
15
|
email: Schema.String,
|
|
16
|
+
emailVerified: Schema.Boolean,
|
|
16
17
|
id: Schema.String,
|
|
17
18
|
name: Schema.String,
|
|
18
19
|
permissions: Schema.optionalKey(Schema.Array(Permission)),
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Context, type Effect, type Schema } from "effect";
|
|
2
|
+
import type { SqlError } from "effect/sql/SqlError";
|
|
3
|
+
import type { AuthUnavailable, BadRequest, PreconditionFailed, TooManyRequests } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import type { StoreError } from "@shivaedev/rate-limit/Store.ts";
|
|
5
|
+
import type { SessionUser } from "#identity.ts";
|
|
6
|
+
|
|
7
|
+
// The account module's port, so the module stays free of the provider that implements the deletion.
|
|
8
|
+
export class AccountDeletion extends Context.Service<
|
|
9
|
+
AccountDeletion,
|
|
10
|
+
{
|
|
11
|
+
readonly delete: (
|
|
12
|
+
password: string,
|
|
13
|
+
) => Effect.Effect<
|
|
14
|
+
void,
|
|
15
|
+
AuthUnavailable | BadRequest | PreconditionFailed | Schema.SchemaError | SqlError | StoreError | TooManyRequests,
|
|
16
|
+
SessionUser
|
|
17
|
+
>;
|
|
18
|
+
}
|
|
19
|
+
>()("@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,44 @@
|
|
|
1
|
+
import { type Context, Effect, Layer } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
5
|
+
import { AccountDeletion } from "#server/AccountDeletion.ts";
|
|
6
|
+
import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
|
|
7
|
+
import type { AuthSchemaDeclaration } from "#server/better-auth/define.ts";
|
|
8
|
+
import { deleteAccount } from "#server/better-auth/deleteAccount.ts";
|
|
9
|
+
|
|
10
|
+
export interface AccountHandOver<E> {
|
|
11
|
+
readonly handOver: (userId: string) => Effect.Effect<void, E>;
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export interface AccountDeletionOptions<TIdentifier, E> {
|
|
15
|
+
readonly handOver?: Context.Service<TIdentifier, AccountHandOver<E>> | undefined;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
// A hand-over's failure is the application's to fix, so it is reported rather than answered to the person.
|
|
19
|
+
export function accountDeletion<TIdentifier = never, E = never>(
|
|
20
|
+
auth: Pick<AuthSchemaDeclaration, "options">,
|
|
21
|
+
options: AccountDeletionOptions<TIdentifier, E> = {},
|
|
22
|
+
) {
|
|
23
|
+
return Layer.effect(AccountDeletion)(
|
|
24
|
+
Effect.gen(function* () {
|
|
25
|
+
const sql = yield* SqlClient.SqlClient;
|
|
26
|
+
const reactivity = yield* Reactivity.Reactivity;
|
|
27
|
+
const store = yield* Store;
|
|
28
|
+
const service = options.handOver === undefined ? undefined : yield* options.handOver;
|
|
29
|
+
const policy = {
|
|
30
|
+
auth,
|
|
31
|
+
handOver: (userId: string) => (service === undefined ? Effect.void : Effect.orDie(service.handOver(userId))),
|
|
32
|
+
};
|
|
33
|
+
return AccountDeletion.of({
|
|
34
|
+
delete: (password) =>
|
|
35
|
+
deleteAccount(password).pipe(
|
|
36
|
+
Effect.provideService(AccountDeletionPolicy, policy),
|
|
37
|
+
Effect.provideService(SqlClient.SqlClient, sql),
|
|
38
|
+
Effect.provideService(Reactivity.Reactivity, reactivity),
|
|
39
|
+
Effect.provideService(Store, store),
|
|
40
|
+
),
|
|
41
|
+
});
|
|
42
|
+
}),
|
|
43
|
+
);
|
|
44
|
+
}
|
|
@@ -83,7 +83,13 @@ export function betterAuthOauthGrants(options: {
|
|
|
83
83
|
const grant = yield* Schema.decodeUnknownEffect(OauthGrant)(subject.consent).pipe(Effect.mapError(unavailable));
|
|
84
84
|
return Option.some({
|
|
85
85
|
scopes: grant.scopes,
|
|
86
|
-
user: {
|
|
86
|
+
user: {
|
|
87
|
+
email: subject.user.email,
|
|
88
|
+
emailVerified: subject.user.emailVerified,
|
|
89
|
+
id: subject.user.id,
|
|
90
|
+
name: subject.user.name,
|
|
91
|
+
...(typeof role === "string" ? { role } : {}),
|
|
92
|
+
},
|
|
87
93
|
});
|
|
88
94
|
}),
|
|
89
95
|
revokeAllClients: (userId) => revoke(userId),
|
|
@@ -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,28 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
3
|
+
import { rateLimit } from "@shivaedev/rate-limit/rateLimit.ts";
|
|
4
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
5
|
+
import { SessionUser } from "#identity.ts";
|
|
6
|
+
import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
|
|
7
|
+
import { accountData } from "#server/better-auth/accountData.ts";
|
|
8
|
+
import { confirmPassword } from "#server/better-auth/confirmPassword.ts";
|
|
9
|
+
import { deleteUserRows } from "#server/better-auth/deleteUserRows.ts";
|
|
10
|
+
import { sessionKeys } from "#signedInSessions.ts";
|
|
11
|
+
import { userKeys } from "#users.ts";
|
|
12
|
+
|
|
13
|
+
// 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.
|
|
14
|
+
export const deleteAccount = Effect.fn("Identity.deleteAccount")(function* (password: string) {
|
|
15
|
+
const { id } = yield* SessionUser;
|
|
16
|
+
const { auth, handOver } = yield* AccountDeletionPolicy;
|
|
17
|
+
// Better Auth's own budget for its password-checked routes such as /change-email, kept per person rather than per address.
|
|
18
|
+
yield* rateLimit({ key: `identity.account.delete:${id}`, per: 3, window: "10 seconds" });
|
|
19
|
+
yield* confirmPassword(auth.options, password);
|
|
20
|
+
yield* Effect.gen(function* () {
|
|
21
|
+
yield* handOver(id);
|
|
22
|
+
yield* accountData(auth)
|
|
23
|
+
.eraseOwnedRows(id)
|
|
24
|
+
.pipe(Effect.catchTags({ OwnedModelsUncollected: Effect.die, OwnedTableCycle: Effect.die, UncoveredUserColumns: Effect.die }));
|
|
25
|
+
yield* deleteUserRows(auth.options);
|
|
26
|
+
yield* invalidateOnCommit(invalidationKeys([userKeys.item(id), sessionKeys.list]));
|
|
27
|
+
}).pipe(transact());
|
|
28
|
+
});
|
|
@@ -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
|
|
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);
|
|
@@ -17,7 +17,7 @@ export const seedUsers = Effect.fn("Identity.seedUsers")(function* <TRole extend
|
|
|
17
17
|
const access = yield* auth.roles.resolve(persona.role);
|
|
18
18
|
yield* seed.run.pipe(
|
|
19
19
|
Effect.provideService(Identity, { id: user.id }),
|
|
20
|
-
Effect.provideService(SessionUser, { email: user.email, id: user.id, name: user.name, ...access }),
|
|
20
|
+
Effect.provideService(SessionUser, { email: user.email, emailVerified: user.emailVerified, id: user.id, name: user.name, ...access }),
|
|
21
21
|
Effect.provideService(CurrentViewer, Option.some({ id: user.id })),
|
|
22
22
|
Effect.annotateLogs({ userId: user.id }),
|
|
23
23
|
);
|
package/src/server/localOwner.ts
CHANGED
|
@@ -30,7 +30,9 @@ export const localOwner = Effect.fn("Identity.localOwner")(function* (options: {
|
|
|
30
30
|
if (bearer === undefined) {
|
|
31
31
|
return Effect.succeed(Option.none());
|
|
32
32
|
}
|
|
33
|
-
return bearer === Redacted.value(token)
|
|
33
|
+
return bearer === Redacted.value(token)
|
|
34
|
+
? Effect.succeed(Option.some({ user: { ...owner, emailVerified: true, ...access } }))
|
|
35
|
+
: machines.resolve(bearer);
|
|
34
36
|
},
|
|
35
37
|
},
|
|
36
38
|
streamRevalidationInterval: options.streamRevalidationInterval,
|
|
@@ -49,7 +49,7 @@ export const machineTokens = Effect.fn("Identity.machineTokens")(function* (opti
|
|
|
49
49
|
const access = yield* options.roles.resolve(stored.value.scope).pipe(Effect.option);
|
|
50
50
|
return Option.map(access, (grants) => ({
|
|
51
51
|
machine: { id: stored.value.id, name: stored.value.name, scope: stored.value.scope },
|
|
52
|
-
user: { ...options.owner, ...grants },
|
|
52
|
+
user: { ...options.owner, emailVerified: true, ...grants },
|
|
53
53
|
}));
|
|
54
54
|
}),
|
|
55
55
|
revoke: Effect.fn("MachineTokens.revoke")((id: string) => repository.delete({ id, ownerId: options.owner.id })),
|