@shivaedev/identity 0.42.0 → 0.44.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 +26 -14
- package/dist/Account.d.ts +4 -3
- package/dist/Account.d.ts.map +1 -1
- package/dist/generated/Account.d.ts +3 -1
- package/dist/generated/Account.d.ts.map +1 -1
- package/dist/generated/Account.js +2 -2
- package/dist/generated/Account.js.map +1 -1
- 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 +3 -2
- package/dist/server/AccountDeletion.d.ts.map +1 -1
- package/dist/server/AccountDeletion.js.map +1 -1
- package/dist/server/account-clock/boundary.d.ts +1 -1
- package/dist/server/account-clock/boundary.d.ts.map +1 -1
- package/dist/server/account-clock/boundary.js +2 -2
- package/dist/server/account-clock/boundary.js.map +1 -1
- package/dist/server/account-clock/dayRange.d.ts +2 -3
- package/dist/server/account-clock/dayRange.d.ts.map +1 -1
- package/dist/server/account-clock/dayRange.js +6 -4
- package/dist/server/account-clock/dayRange.js.map +1 -1
- package/dist/server/account-clock/initialize.d.ts +1 -6
- package/dist/server/account-clock/initialize.d.ts.map +1 -1
- package/dist/server/account-clock/initialize.js +1 -9
- package/dist/server/account-clock/initialize.js.map +1 -1
- package/dist/server/account-clock/logicalDay.d.ts +1 -2
- package/dist/server/account-clock/logicalDay.d.ts.map +1 -1
- package/dist/server/account-clock/logicalDay.js +6 -4
- package/dist/server/account-clock/logicalDay.js.map +1 -1
- package/dist/server/account-clock/service.d.ts +4 -5
- package/dist/server/account-clock/service.d.ts.map +1 -1
- package/dist/server/account-clock/service.js +2 -3
- package/dist/server/account-clock/service.js.map +1 -1
- package/dist/server/account-clock/zone.d.ts +3 -0
- package/dist/server/account-clock/zone.d.ts.map +1 -0
- package/dist/server/account-clock/zone.js +8 -0
- package/dist/server/account-clock/zone.js.map +1 -0
- package/dist/server/better-auth/accountDeletion.d.ts +2 -1
- package/dist/server/better-auth/accountDeletion.d.ts.map +1 -1
- package/dist/server/better-auth/accountDeletion.js +3 -1
- package/dist/server/better-auth/accountDeletion.js.map +1 -1
- package/dist/server/better-auth/adapters/evictCachedAccount.d.ts +7 -0
- package/dist/server/better-auth/adapters/evictCachedAccount.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/evictCachedAccount.js +36 -0
- package/dist/server/better-auth/adapters/evictCachedAccount.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/deleteAccount.d.ts +1 -1
- package/dist/server/better-auth/deleteAccount.d.ts.map +1 -1
- package/dist/server/better-auth/deleteAccount.js +6 -0
- package/dist/server/better-auth/deleteAccount.js.map +1 -1
- package/dist/server/better-auth/deleteUserRows.d.ts.map +1 -1
- package/dist/server/better-auth/deleteUserRows.js +6 -3
- package/dist/server/better-auth/deleteUserRows.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 +6 -6
- package/src/generated/Account.ts +2 -2
- package/src/identity.ts +1 -0
- package/src/server/AccountDeletion.ts +7 -2
- package/src/server/account-clock/boundary.ts +2 -2
- package/src/server/account-clock/dayRange.ts +7 -5
- package/src/server/account-clock/initialize.ts +1 -9
- package/src/server/account-clock/logicalDay.ts +6 -5
- package/src/server/account-clock/service.ts +2 -3
- package/src/server/account-clock/zone.ts +8 -0
- package/src/server/better-auth/accountDeletion.ts +3 -0
- package/src/server/better-auth/adapters/evictCachedAccount.ts +41 -0
- package/src/server/better-auth/adapters/oauthGrants.ts +7 -1
- package/src/server/better-auth/deleteAccount.ts +6 -0
- package/src/server/better-auth/deleteUserRows.ts +6 -3
- 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,7 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
export declare const evictCachedAccount: (options: Omit<BetterAuthOptions, "database">, user: {
|
|
4
|
+
readonly email: string;
|
|
5
|
+
readonly id: string;
|
|
6
|
+
}) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
|
|
7
|
+
//# sourceMappingURL=evictCachedAccount.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evictCachedAccount.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/evictCachedAccount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAS,MAAM,EAAU,MAAM,QAAQ,CAAC;AAW/C,eAAO,MAAM,kBAAkB;oBAEN,MAAM;iBAAe,MAAM;yFA0BlD,CAAC"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { Clock, Effect, Schema } from "effect";
|
|
2
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
3
|
+
const References = Schema.Array(Schema.Struct({ token: Schema.String }));
|
|
4
|
+
// Better Auth reads the list through safeJSONParse, which takes a JSON string or a value the store's client already parsed.
|
|
5
|
+
const StoredReferences = Schema.Union([Schema.fromJsonString(References), References]);
|
|
6
|
+
const ADDRESS_CODES = ["email-verification", "sign-in", "forget-password"];
|
|
7
|
+
// Better Auth 1.7 keeps these keys in secondary storage and revokes a user's sessions with the same writes in deleteCachedUserSessions:
|
|
8
|
+
// a revoked-before time its session lookup checks, and the tokens listed as the user's active sessions. Its other codes are keyed by
|
|
9
|
+
// a token or a new address that only the email holds, so only the exact address codes can be found here.
|
|
10
|
+
export const evictCachedAccount = Effect.fn("Identity.evictCachedAccount")(function* (options, user) {
|
|
11
|
+
const storage = options.secondaryStorage;
|
|
12
|
+
if (storage === undefined) {
|
|
13
|
+
return;
|
|
14
|
+
}
|
|
15
|
+
function call(run) {
|
|
16
|
+
return Effect.tryPromise(async () => await run()).pipe(Effect.catch(providerFailure));
|
|
17
|
+
}
|
|
18
|
+
const revokedKey = `revoked-sessions-before-${user.id}`;
|
|
19
|
+
const activeKey = `active-sessions-${user.id}`;
|
|
20
|
+
const lifetime = Math.max(options.session?.expiresIn || 604_800, 86_400);
|
|
21
|
+
const now = yield* Clock.currentTimeMillis;
|
|
22
|
+
const previous = Number(yield* call(() => storage.get(revokedKey))) || 0;
|
|
23
|
+
yield* call(() => storage.set(revokedKey, String(Math.max(now, previous)), lifetime));
|
|
24
|
+
const listed = yield* call(() => storage.get(activeKey));
|
|
25
|
+
const references = yield* Schema.decodeUnknownEffect(StoredReferences)(listed).pipe(Effect.orElseSucceed(() => []));
|
|
26
|
+
for (const { token } of references) {
|
|
27
|
+
yield* call(() => storage.delete(token));
|
|
28
|
+
}
|
|
29
|
+
yield* call(() => storage.delete(activeKey));
|
|
30
|
+
if (options.verification?.storeInDatabase !== true) {
|
|
31
|
+
for (const type of ADDRESS_CODES) {
|
|
32
|
+
yield* call(() => storage.delete(`verification:${type}-otp-${user.email}`));
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
});
|
|
36
|
+
//# sourceMappingURL=evictCachedAccount.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"evictCachedAccount.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/evictCachedAccount.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,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,
|
|
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,0CA4EA"}
|
|
@@ -68,7 +68,13 @@ export function betterAuthOauthGrants(options) {
|
|
|
68
68
|
const grant = yield* Schema.decodeUnknownEffect(OauthGrant)(subject.consent).pipe(Effect.mapError(unavailable));
|
|
69
69
|
return Option.some({
|
|
70
70
|
scopes: grant.scopes,
|
|
71
|
-
user: {
|
|
71
|
+
user: {
|
|
72
|
+
email: subject.user.email,
|
|
73
|
+
emailVerified: subject.user.emailVerified,
|
|
74
|
+
id: subject.user.id,
|
|
75
|
+
name: subject.user.name,
|
|
76
|
+
...(typeof role === "string" ? { role } : {}),
|
|
77
|
+
},
|
|
72
78
|
});
|
|
73
79
|
}),
|
|
74
80
|
revokeAllClients: (userId) => revoke(userId),
|
|
@@ -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;oBACL,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,KAAK;oBACzB,aAAa,EAAE,OAAO,CAAC,IAAI,CAAC,aAAa;oBACzC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE;oBACnB,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;oBACvB,GAAG,CAAC,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;iBAC7C;aACD,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,5 +1,5 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { SessionUser } from "#identity.ts";
|
|
3
3
|
import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
|
|
4
|
-
export declare const deleteAccount: (password: string) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").BadRequest | import("@shivaedev/errors/taxonomy.ts").PreconditionFailed | import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError, AccountDeletionPolicy | SessionUser | (import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient)>;
|
|
4
|
+
export declare const deleteAccount: (password: string) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").BadRequest | import("@shivaedev/errors/taxonomy.ts").PreconditionFailed | import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError | import("@shivaedev/rate-limit/Store.ts").StoreError | import("@shivaedev/errors/taxonomy.ts").TooManyRequests, AccountDeletionPolicy | SessionUser | import("@shivaedev/rate-limit/Store.ts").Store | (import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient)>;
|
|
5
5
|
//# sourceMappingURL=deleteAccount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deleteAccount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/deleteAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"deleteAccount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/deleteAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIhC,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,qBAAqB,EAAE,MAAM,8CAA8C,CAAC;AAUrF,eAAO,MAAM,aAAa,4kBAexB,CAAC"}
|
|
@@ -1,17 +1,22 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
3
|
+
import { rateLimit } from "@shivaedev/rate-limit/rateLimit.ts";
|
|
3
4
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
4
5
|
import { SessionUser } from "#identity.ts";
|
|
5
6
|
import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
|
|
6
7
|
import { accountData } from "#server/better-auth/accountData.ts";
|
|
8
|
+
import { evictCachedAccount } from "#server/better-auth/adapters/evictCachedAccount.ts";
|
|
7
9
|
import { confirmPassword } from "#server/better-auth/confirmPassword.ts";
|
|
8
10
|
import { deleteUserRows } from "#server/better-auth/deleteUserRows.ts";
|
|
9
11
|
import { sessionKeys } from "#signedInSessions.ts";
|
|
10
12
|
import { userKeys } from "#users.ts";
|
|
11
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
|
+
// Cached sessions are evicted last inside the transaction, so a failed eviction deletes nothing and a failed commit only signs out.
|
|
12
15
|
export const deleteAccount = Effect.fn("Identity.deleteAccount")(function* (password) {
|
|
13
16
|
const { id } = yield* SessionUser;
|
|
14
17
|
const { auth, handOver } = yield* AccountDeletionPolicy;
|
|
18
|
+
// Better Auth's own budget for its password-checked routes such as /change-email, kept per person rather than per address.
|
|
19
|
+
yield* rateLimit({ key: `identity.account.delete:${id}`, per: 3, window: "10 seconds" });
|
|
15
20
|
yield* confirmPassword(auth.options, password);
|
|
16
21
|
yield* Effect.gen(function* () {
|
|
17
22
|
yield* handOver(id);
|
|
@@ -19,6 +24,7 @@ export const deleteAccount = Effect.fn("Identity.deleteAccount")(function* (pass
|
|
|
19
24
|
.eraseOwnedRows(id)
|
|
20
25
|
.pipe(Effect.catchTags({ OwnedModelsUncollected: Effect.die, OwnedTableCycle: Effect.die, UncoveredUserColumns: Effect.die }));
|
|
21
26
|
yield* deleteUserRows(auth.options);
|
|
27
|
+
yield* evictCachedAccount(auth.options, yield* SessionUser);
|
|
22
28
|
yield* invalidateOnCommit(invalidationKeys([userKeys.item(id), sessionKeys.list]));
|
|
23
29
|
}).pipe(transact());
|
|
24
30
|
});
|
|
@@ -1 +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"}
|
|
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,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,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,kBAAkB,EAAE,MAAM,oDAAoD,CAAC;AACxF,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,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,2HAA2H;IAC3H,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,2BAA2B,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,YAAY,EAAE,CAAC,CAAC;IACzF,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,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,WAAW,CAAC,CAAC;QAC5D,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"}
|
|
@@ -1 +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;
|
|
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;AAO3C,eAAO,MAAM,cAAc,gIAYzB,CAAC"}
|
|
@@ -2,7 +2,8 @@ import { getAuthTables } from "better-auth/db";
|
|
|
2
2
|
import { Effect } from "effect";
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
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.
|
|
5
|
+
// Better Auth's session and account tables cascade from the user row, so one delete removes the person's sign-ins with it. It keeps
|
|
6
|
+
// no verification table when verifications live in secondary storage.
|
|
6
7
|
// 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
8
|
// 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
9
|
const ADDRESS_CODES = ["email-verification", "sign-in", "forget-password"];
|
|
@@ -13,8 +14,10 @@ export const deleteUserRows = Effect.fn("Identity.deleteUserRows")(function* (op
|
|
|
13
14
|
const identifier = sql(verification?.fields.identifier?.fieldName ?? "identifier");
|
|
14
15
|
const value = sql(verification?.fields.value?.fieldName ?? "value");
|
|
15
16
|
const codes = ADDRESS_CODES.map((type) => `${type}-otp-${email}`);
|
|
16
|
-
|
|
17
|
-
|
|
17
|
+
if (verification !== undefined) {
|
|
18
|
+
yield* sql `delete from ${sql(verification.modelName)} 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
|
+
}
|
|
18
21
|
yield* sql `delete from ${sql(user?.modelName ?? "user")} where id = ${id}`;
|
|
19
22
|
});
|
|
20
23
|
//# sourceMappingURL=deleteUserRows.js.map
|
|
@@ -1 +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,
|
|
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,oIAAoI;AACpI,sEAAsE;AACtE,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,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;QAChC,KAAK,CAAC,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,UAAU,KAAK,MAAM,EAAE,OAAO,UAAU,OAAO,GAAG,CAAC,EAAE,CAAC,KAAK,CAAC;oBAC9F,UAAU,KAAK,oBAAoB,EAAE,GAAG,oBAAoB,UAAU,KAAK,WAAW,EAAE,GAAG,GAAG,CAAC;IAClH,CAAC;IACD,KAAK,CAAC,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,IAAI,EAAE,SAAS,IAAI,MAAM,CAAC,eAAe,EAAE,EAAE,CAAC;AAC5E,CAAC,CAAC,CAAC"}
|
|
@@ -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.44.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.
|
|
63
|
-
"@shivaedev/quality": "0.84.
|
|
64
|
-
"@shivaedev/server": "0.
|
|
65
|
-
"@shivaedev/test-kits": "0.16.
|
|
61
|
+
"@shivaedev/admin": "0.29.7",
|
|
62
|
+
"@shivaedev/build": "0.9.2",
|
|
63
|
+
"@shivaedev/quality": "0.84.1",
|
|
64
|
+
"@shivaedev/server": "0.46.1",
|
|
65
|
+
"@shivaedev/test-kits": "0.16.11",
|
|
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/generated/Account.ts
CHANGED
|
@@ -3,11 +3,11 @@ import type { Account as AccountModule } from "#Account.ts";
|
|
|
3
3
|
import { AuthenticatedUser } from "#middleware.ts";
|
|
4
4
|
import { clientContract } from "@shivaedev/contract/clientContract.ts";
|
|
5
5
|
import type { ClientMatchesModule } from "@shivaedev/contract/clientMatchesModule.ts";
|
|
6
|
-
import { AuthUnavailable, BadRequest, PreconditionFailed } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { AuthUnavailable, BadRequest, PreconditionFailed, TooManyRequests } from "@shivaedev/errors/taxonomy.ts";
|
|
7
7
|
import { Schema } from "effect";
|
|
8
8
|
|
|
9
9
|
export const identityAccountWire = {
|
|
10
|
-
delete: { rejections: { AuthUnavailable, BadRequest, PreconditionFailed }, success: Schema.Void },
|
|
10
|
+
delete: { rejections: { AuthUnavailable, BadRequest, PreconditionFailed, TooManyRequests }, success: Schema.Void },
|
|
11
11
|
} as const;
|
|
12
12
|
|
|
13
13
|
export const Account = clientContract({
|
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)),
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Context, type Effect, type Schema } from "effect";
|
|
2
2
|
import type { SqlError } from "effect/sql/SqlError";
|
|
3
|
-
import type { AuthUnavailable, BadRequest, PreconditionFailed } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { AuthUnavailable, BadRequest, PreconditionFailed, TooManyRequests } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import type { StoreError } from "@shivaedev/rate-limit/Store.ts";
|
|
4
5
|
import type { SessionUser } from "#identity.ts";
|
|
5
6
|
|
|
6
7
|
// The account module's port, so the module stays free of the provider that implements the deletion.
|
|
@@ -9,6 +10,10 @@ export class AccountDeletion extends Context.Service<
|
|
|
9
10
|
{
|
|
10
11
|
readonly delete: (
|
|
11
12
|
password: string,
|
|
12
|
-
) => Effect.Effect<
|
|
13
|
+
) => Effect.Effect<
|
|
14
|
+
void,
|
|
15
|
+
AuthUnavailable | BadRequest | PreconditionFailed | Schema.SchemaError | SqlError | StoreError | TooManyRequests,
|
|
16
|
+
SessionUser
|
|
17
|
+
>;
|
|
13
18
|
}
|
|
14
19
|
>()("@shivaedev/identity/AccountDeletion") {}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { DateTime, Effect } from "effect";
|
|
2
2
|
|
|
3
|
-
export const boundary = Effect.fn("AccountClock.boundary")((day: string,
|
|
3
|
+
export const boundary = Effect.fn("AccountClock.boundary")((day: string, timeZone: DateTime.TimeZone, minutes: number) =>
|
|
4
4
|
Effect.sync(() =>
|
|
5
5
|
DateTime.toUtc(
|
|
6
6
|
DateTime.makeZonedUnsafe(`${day}T00:00:00.000Z`, {
|
|
7
7
|
adjustForTimeZone: true,
|
|
8
8
|
disambiguation: "compatible",
|
|
9
|
-
timeZone
|
|
9
|
+
timeZone,
|
|
10
10
|
}).pipe(DateTime.setParts({ hour: Math.floor(minutes / 60), minute: minutes % 60 })),
|
|
11
11
|
),
|
|
12
12
|
),
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { DateTime, Effect, Schema } from "effect";
|
|
2
2
|
import { boundary } from "#server/account-clock/boundary.ts";
|
|
3
|
-
import type { initialize } from "#server/account-clock/initialize.ts";
|
|
4
3
|
import { LogicalDay } from "#server/account-clock/settings.ts";
|
|
4
|
+
import { zone } from "#server/account-clock/zone.ts";
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
const decodeDay = Schema.decodeUnknownEffect(LogicalDay.pipe(Schema.decodeTo(Schema.DateTimeUtcFromString)));
|
|
7
|
+
|
|
8
|
+
export function dayRange(minutes: number) {
|
|
9
|
+
return Effect.fn("AccountClock.dayRange")(function* (account: string, day: string) {
|
|
9
10
|
const next = DateTime.formatIsoDateUtc(DateTime.add(yield* decodeDay(day), { days: 1 }));
|
|
10
|
-
|
|
11
|
+
const timeZone = yield* zone(account);
|
|
12
|
+
return { end: yield* boundary(next, timeZone, minutes), start: yield* boundary(day, timeZone, minutes) };
|
|
11
13
|
});
|
|
12
14
|
}
|
|
@@ -1,12 +1,4 @@
|
|
|
1
1
|
import { Effect, Schema } from "effect";
|
|
2
2
|
import { AccountDayStart, DayStart } from "#server/account-clock/settings.ts";
|
|
3
|
-
import { AccountPreferencesStore } from "#server/account-preferences/service.ts";
|
|
4
|
-
import { Subject } from "#subject.ts";
|
|
5
3
|
|
|
6
|
-
export const initialize = Effect.
|
|
7
|
-
const { id } = yield* Subject;
|
|
8
|
-
const { timezone } = yield* (yield* AccountPreferencesStore).get(id);
|
|
9
|
-
const minutes = yield* Schema.decodeUnknownEffect(DayStart)(yield* AccountDayStart);
|
|
10
|
-
const zone = yield* Schema.decodeUnknownEffect(Schema.TimeZoneNamedFromString)(timezone);
|
|
11
|
-
return { minutes, timezone, zone };
|
|
12
|
-
});
|
|
4
|
+
export const initialize = Effect.flatMap(AccountDayStart, Schema.decodeUnknownEffect(DayStart));
|
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { DateTime, Effect } from "effect";
|
|
2
2
|
import { boundary } from "#server/account-clock/boundary.ts";
|
|
3
|
-
import
|
|
3
|
+
import { zone } from "#server/account-clock/zone.ts";
|
|
4
4
|
|
|
5
|
-
export function logicalDay(
|
|
6
|
-
return Effect.fn("AccountClock.logicalDay")(function* (instant?: DateTime.Utc) {
|
|
5
|
+
export function logicalDay(minutes: number) {
|
|
6
|
+
return Effect.fn("AccountClock.logicalDay")(function* (account: string, instant?: DateTime.Utc) {
|
|
7
7
|
const now = instant ?? (yield* DateTime.now);
|
|
8
|
-
const
|
|
8
|
+
const timeZone = yield* zone(account);
|
|
9
|
+
const local = DateTime.setZone(now, timeZone);
|
|
9
10
|
const day = DateTime.formatIsoDate(local);
|
|
10
|
-
return DateTime.isLessThan(now, yield* boundary(day,
|
|
11
|
+
return DateTime.isLessThan(now, yield* boundary(day, timeZone, minutes)) ? DateTime.formatIsoDate(DateTime.subtract(local, { days: 1 })) : day;
|
|
11
12
|
});
|
|
12
13
|
}
|
|
@@ -4,11 +4,10 @@ import { initialize } from "#server/account-clock/initialize.ts";
|
|
|
4
4
|
import { logicalDay } from "#server/account-clock/logicalDay.ts";
|
|
5
5
|
import { AccountDayStart } from "#server/account-clock/settings.ts";
|
|
6
6
|
import { AccountPreferencesStore } from "#server/account-preferences/service.ts";
|
|
7
|
-
import { Subject } from "#subject.ts";
|
|
8
7
|
|
|
9
8
|
export const AccountClock = defineService({
|
|
10
9
|
id: "@shivaedev/identity/AccountClock",
|
|
11
10
|
initialize,
|
|
12
|
-
methods: (
|
|
13
|
-
requires: [AccountPreferencesStore,
|
|
11
|
+
methods: (minutes) => ({ dayRange: dayRange(minutes), logicalDay: logicalDay(minutes) }),
|
|
12
|
+
requires: [AccountPreferencesStore, AccountDayStart],
|
|
14
13
|
});
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import { AccountPreferencesStore } from "#server/account-preferences/service.ts";
|
|
3
|
+
|
|
4
|
+
export const zone = Effect.fn("AccountClock.zone")(function* (account: string) {
|
|
5
|
+
const { timezone } = yield* (yield* AccountPreferencesStore).get(account);
|
|
6
|
+
// The store returns only timezones its row schema has checked, so a timezone that does not decode here is a broken invariant.
|
|
7
|
+
return yield* Schema.decodeUnknownEffect(Schema.TimeZoneNamedFromString)(timezone).pipe(Effect.orDie);
|
|
8
|
+
});
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type Context, Effect, Layer } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
4
5
|
import { AccountDeletion } from "#server/AccountDeletion.ts";
|
|
5
6
|
import { AccountDeletionPolicy } from "#server/better-auth/AccountDeletionPolicy.ts";
|
|
6
7
|
import type { AuthSchemaDeclaration } from "#server/better-auth/define.ts";
|
|
@@ -23,6 +24,7 @@ export function accountDeletion<TIdentifier = never, E = never>(
|
|
|
23
24
|
Effect.gen(function* () {
|
|
24
25
|
const sql = yield* SqlClient.SqlClient;
|
|
25
26
|
const reactivity = yield* Reactivity.Reactivity;
|
|
27
|
+
const store = yield* Store;
|
|
26
28
|
const service = options.handOver === undefined ? undefined : yield* options.handOver;
|
|
27
29
|
const policy = {
|
|
28
30
|
auth,
|
|
@@ -34,6 +36,7 @@ export function accountDeletion<TIdentifier = never, E = never>(
|
|
|
34
36
|
Effect.provideService(AccountDeletionPolicy, policy),
|
|
35
37
|
Effect.provideService(SqlClient.SqlClient, sql),
|
|
36
38
|
Effect.provideService(Reactivity.Reactivity, reactivity),
|
|
39
|
+
Effect.provideService(Store, store),
|
|
37
40
|
),
|
|
38
41
|
});
|
|
39
42
|
}),
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Clock, Effect, Schema } from "effect";
|
|
3
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
4
|
+
|
|
5
|
+
const References = Schema.Array(Schema.Struct({ token: Schema.String }));
|
|
6
|
+
// Better Auth reads the list through safeJSONParse, which takes a JSON string or a value the store's client already parsed.
|
|
7
|
+
const StoredReferences = Schema.Union([Schema.fromJsonString(References), References]);
|
|
8
|
+
const ADDRESS_CODES = ["email-verification", "sign-in", "forget-password"];
|
|
9
|
+
|
|
10
|
+
// Better Auth 1.7 keeps these keys in secondary storage and revokes a user's sessions with the same writes in deleteCachedUserSessions:
|
|
11
|
+
// a revoked-before time its session lookup checks, and the tokens listed as the user's active sessions. Its other codes are keyed by
|
|
12
|
+
// a token or a new address that only the email holds, so only the exact address codes can be found here.
|
|
13
|
+
export const evictCachedAccount = Effect.fn("Identity.evictCachedAccount")(function* (
|
|
14
|
+
options: Omit<BetterAuthOptions, "database">,
|
|
15
|
+
user: { readonly email: string; readonly id: string },
|
|
16
|
+
) {
|
|
17
|
+
const storage = options.secondaryStorage;
|
|
18
|
+
if (storage === undefined) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
function call<A>(run: () => A | Promise<A>) {
|
|
22
|
+
return Effect.tryPromise(async () => await run()).pipe(Effect.catch(providerFailure));
|
|
23
|
+
}
|
|
24
|
+
const revokedKey = `revoked-sessions-before-${user.id}`;
|
|
25
|
+
const activeKey = `active-sessions-${user.id}`;
|
|
26
|
+
const lifetime = Math.max(options.session?.expiresIn || 604_800, 86_400);
|
|
27
|
+
const now = yield* Clock.currentTimeMillis;
|
|
28
|
+
const previous = Number(yield* call(() => storage.get(revokedKey))) || 0;
|
|
29
|
+
yield* call(() => storage.set(revokedKey, String(Math.max(now, previous)), lifetime));
|
|
30
|
+
const listed = yield* call(() => storage.get(activeKey));
|
|
31
|
+
const references = yield* Schema.decodeUnknownEffect(StoredReferences)(listed).pipe(Effect.orElseSucceed(() => []));
|
|
32
|
+
for (const { token } of references) {
|
|
33
|
+
yield* call(() => storage.delete(token));
|
|
34
|
+
}
|
|
35
|
+
yield* call(() => storage.delete(activeKey));
|
|
36
|
+
if (options.verification?.storeInDatabase !== true) {
|
|
37
|
+
for (const type of ADDRESS_CODES) {
|
|
38
|
+
yield* call(() => storage.delete(`verification:${type}-otp-${user.email}`));
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
});
|
|
@@ -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),
|