@shivaedev/identity 0.10.1 → 0.11.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (62) hide show
  1. package/CHANGELOG.md +36 -0
  2. package/README.md +21 -3
  3. package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
  4. package/dist/server/adapters/betterAuthSessions.js +5 -1
  5. package/dist/server/adapters/betterAuthSessions.js.map +1 -1
  6. package/dist/server/better-auth/adapters/hardening.d.ts +6 -0
  7. package/dist/server/better-auth/adapters/hardening.d.ts.map +1 -0
  8. package/dist/server/better-auth/adapters/hardening.js +30 -0
  9. package/dist/server/better-auth/adapters/hardening.js.map +1 -0
  10. package/dist/server/better-auth/{signInPolicy.d.ts → adapters/signInPolicyOptions.d.ts} +3 -4
  11. package/dist/server/better-auth/adapters/signInPolicyOptions.d.ts.map +1 -0
  12. package/dist/server/better-auth/{signInPolicy.js → adapters/signInPolicyOptions.js} +8 -5
  13. package/dist/server/better-auth/adapters/signInPolicyOptions.js.map +1 -0
  14. package/dist/server/better-auth/allowedAccounts.d.ts +1 -1
  15. package/dist/server/better-auth/allowedAccounts.d.ts.map +1 -1
  16. package/dist/server/better-auth/allowedAccounts.js +7 -2
  17. package/dist/server/better-auth/allowedAccounts.js.map +1 -1
  18. package/dist/server/better-auth/bearerSessions.d.ts.map +1 -1
  19. package/dist/server/better-auth/bearerSessions.js +10 -4
  20. package/dist/server/better-auth/bearerSessions.js.map +1 -1
  21. package/dist/server/better-auth/clientIp.d.ts +4 -1
  22. package/dist/server/better-auth/clientIp.d.ts.map +1 -1
  23. package/dist/server/better-auth/clientIp.js +5 -1
  24. package/dist/server/better-auth/clientIp.js.map +1 -1
  25. package/dist/server/better-auth/mount.d.ts +4 -13
  26. package/dist/server/better-auth/mount.d.ts.map +1 -1
  27. package/dist/server/better-auth/mount.js +4 -5
  28. package/dist/server/better-auth/mount.js.map +1 -1
  29. package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
  30. package/dist/server/better-auth/mountRoutes.js +6 -2
  31. package/dist/server/better-auth/mountRoutes.js.map +1 -1
  32. package/dist/server/better-auth/mountedSessions.d.ts +3 -14
  33. package/dist/server/better-auth/mountedSessions.d.ts.map +1 -1
  34. package/dist/server/better-auth/mountedSessions.js +1 -1
  35. package/dist/server/better-auth/mountedSessions.js.map +1 -1
  36. package/dist/server/better-auth/sessionAdministration.d.ts.map +1 -1
  37. package/dist/server/better-auth/sessionAdministration.js +2 -1
  38. package/dist/server/better-auth/sessionAdministration.js.map +1 -1
  39. package/dist/server/better-auth/sweepExpiredSessions.d.ts.map +1 -1
  40. package/dist/server/better-auth/sweepExpiredSessions.js +3 -2
  41. package/dist/server/better-auth/sweepExpiredSessions.js.map +1 -1
  42. package/dist/server/better-auth/testDatabase.d.ts +6 -1
  43. package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
  44. package/dist/server/better-auth/testDatabase.js +13 -2
  45. package/dist/server/better-auth/testDatabase.js.map +1 -1
  46. package/dist/sessions.d.ts +4 -4
  47. package/dist/sessions.d.ts.map +1 -1
  48. package/package.json +8 -8
  49. package/src/server/adapters/betterAuthSessions.ts +7 -1
  50. package/src/server/better-auth/adapters/hardening.ts +36 -0
  51. package/src/server/better-auth/{signInPolicy.ts → adapters/signInPolicyOptions.ts} +11 -5
  52. package/src/server/better-auth/allowedAccounts.ts +10 -2
  53. package/src/server/better-auth/bearerSessions.ts +10 -4
  54. package/src/server/better-auth/clientIp.ts +5 -1
  55. package/src/server/better-auth/mount.ts +5 -5
  56. package/src/server/better-auth/mountRoutes.ts +6 -2
  57. package/src/server/better-auth/mountedSessions.ts +3 -3
  58. package/src/server/better-auth/sessionAdministration.ts +2 -1
  59. package/src/server/better-auth/sweepExpiredSessions.ts +3 -2
  60. package/src/server/better-auth/testDatabase.ts +14 -2
  61. package/dist/server/better-auth/signInPolicy.d.ts.map +0 -1
  62. package/dist/server/better-auth/signInPolicy.js.map +0 -1
@@ -1 +1 @@
1
- {"version":3,"file":"mountedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountedSessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAWxE,wBAAgB,eAAe,CAC9B,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,CAAC,QAAQ,SAAS,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,eAAe,CAAC,QAAQ,CAAC,EACrG,KAAK,CAAC,EAAE,OAAO;;;;;;;;;;;;;;EAWf"}
1
+ {"version":3,"file":"mountedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountedSessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAW1F,wBAAgB,eAAe,CAC9B,MAAM,EAAE,OAAO,EACf,KAAK,EAAE,CAAC,QAAQ,SAAS,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,eAAe,CAAC,QAAQ,CAAC,EACrG,KAAK,CAAC,EAAE,OAAO,GACb;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,eAAe,CAAC,gBAAgB,CAAC,CAAA;CAAE,CAUpF"}
@@ -1,6 +1,6 @@
1
1
  import { Schema } from "effect";
2
2
  import { SessionUserSchema } from "#identity.ts";
3
- const AuthSession = Schema.NullOr(Schema.Struct({ user: SessionUserSchema }));
3
+ const AuthSession = Schema.NullOr(Schema.Struct({ session: Schema.Struct({ expiresAt: Schema.Date }), user: SessionUserSchema }));
4
4
  const SessionLookup = Schema.declare((value) => typeof value === "function");
5
5
  export function mountedSessions(lookup, admit, roles) {
6
6
  const getSession = Schema.decodeUnknownSync(SessionLookup)(lookup);
@@ -1 +1 @@
1
- {"version":3,"file":"mountedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAIjD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;AAO9E,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAA0B,EAAE,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC;AAErG,MAAM,UAAU,eAAe,CAC9B,MAAe,EACf,KAAqG,EACrG,KAAe;IAEf,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;IACnE,OAAO;QACN,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;QACzC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACjC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CACpC,MAAM,UAAU,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAC3G,CACD;KACD,CAAC;AACH,CAAC"}
1
+ {"version":3,"file":"mountedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAIjD,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,iBAAiB,EAAE,CAAC,CAAC,CAAC;AAOlI,MAAM,aAAa,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAA0B,EAAE,CAAC,OAAO,KAAK,KAAK,UAAU,CAAC,CAAC;AAErG,MAAM,UAAU,eAAe,CAC9B,MAAe,EACf,KAAqG,EACrG,KAAe;IAEf,MAAM,UAAU,GAAG,MAAM,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;IACnE,OAAO;QACN,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;QACzC,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CACjC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CACpC,MAAM,UAAU,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAC3G,CACD;KACD,CAAC;AACH,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"sessionAdministration.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAQ3C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;0GAqBvB,CAAC;AAEH,eAAO,MAAM,aAAa,6JAYxB,CAAC"}
1
+ {"version":3,"file":"sessionAdministration.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAQ3C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;0GAsBvB,CAAC;AAEH,eAAO,MAAM,aAAa,6JAYxB,CAAC"}
@@ -11,13 +11,14 @@ function unavailable() {
11
11
  export const listSessions = Effect.fn("Identity.listSessions")(function* (input) {
12
12
  yield* requirePermission(yield* SessionUser, ManageSessions);
13
13
  const sql = yield* SqlClient.SqlClient;
14
+ const now = DateTime.toDateUtc(yield* DateTime.now);
14
15
  const cursor = input.cursor;
15
16
  const before = cursor === undefined ? sql `true` : sql `(s."updatedAt", s.id) < (${DateTime.toDateUtc(cursor.lastActivityAt)}, ${cursor.id})`;
16
17
  const read = SqlSchema.findAll({
17
18
  execute: () => sql `select s.id, s."createdAt" as "startedAt", s."updatedAt" as "lastActivityAt", s."expiresAt",
18
19
  json_build_object('id', u.id, 'name', u.name, 'email', u.email) as "user"
19
20
  from "session" s join "user" u on u.id = s."userId"
20
- where s."expiresAt" > now() and ${before}
21
+ where s."expiresAt" > ${now} and ${before}
21
22
  order by s."updatedAt" desc, s.id desc limit ${input.limit + 1}`,
22
23
  Request: Schema.Void,
23
24
  Result: SignedInSession,
@@ -1 +1 @@
1
- {"version":3,"file":"sessionAdministration.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"sessionAdministration.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"sweepExpiredSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sweepExpiredSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,eAAO,MAAM,oBAAoB,yGAOwB,CAAC"}
1
+ {"version":3,"file":"sweepExpiredSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sweepExpiredSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAIvC,eAAO,MAAM,oBAAoB,yGAQwB,CAAC"}
@@ -1,10 +1,11 @@
1
- import { Effect, Schema } from "effect";
1
+ import { DateTime, Effect, Schema } from "effect";
2
2
  import { SqlClient } from "effect/sql";
3
3
  const SweepResult = Schema.Tuple([Schema.Struct({ removed: Schema.NumberFromString })]);
4
4
  export const sweepExpiredSessions = Effect.gen(function* () {
5
5
  const sql = yield* SqlClient.SqlClient;
6
+ const now = DateTime.toDateUtc(yield* DateTime.now);
6
7
  const rows = yield* sql `with expired as (
7
- delete from "session" where "expiresAt" <= now() returning 1
8
+ delete from "session" where "expiresAt" <= ${now} returning 1
8
9
  ) select count(*)::text as removed from expired`;
9
10
  const [result] = yield* Schema.decodeUnknownEffect(SweepResult)(rows);
10
11
  return result.removed;
@@ -1 +1 @@
1
- {"version":3,"file":"sweepExpiredSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/sweepExpiredSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC;AAExF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACvD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;;iDAEyB,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;IACtE,OAAO,MAAM,CAAC,OAAO,CAAC;AACvB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"sweepExpiredSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/sweepExpiredSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,WAAW,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAC;AAExF,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACvD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,GAAG,CAAA;+CACuB,GAAG;iDACD,CAAC;IACjD,MAAM,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;IACtE,OAAO,MAAM,CAAC,OAAO,CAAC;AACvB,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,+BAA+B,CAAC,CAAC,CAAC"}
@@ -1,4 +1,4 @@
1
- import { Effect } from "effect";
1
+ import { DateTime, Effect, Schema } from "effect";
2
2
  import { SqlClient } from "effect/sql";
3
3
  export declare const authTestDatabase: Effect.Effect<{
4
4
  expireSessions: (userId?: string) => Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
@@ -11,6 +11,11 @@ export declare const authTestDatabase: Effect.Effect<{
11
11
  id: string;
12
12
  userId: string;
13
13
  }>;
14
+ sessionsFor: (userId: string) => Effect.Effect<{
15
+ expiresAt: DateTime.Utc;
16
+ id: string;
17
+ expired: boolean;
18
+ }[], Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>;
14
19
  users: import("effect/sql/Statement").Statement<{
15
20
  email: string;
16
21
  id: string;
@@ -1 +1 @@
1
- {"version":3,"file":"testDatabase.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,gBAAgB;8BAGD,MAAM;;;mBAKK,MAAM,GAAG,IAAI;;;eAE1C,MAAM;YACT,MAAM;gBACF,MAAM;;;eAEK,MAAM;YAAM,MAAM;;8BAEtC,CAAC"}
1
+ {"version":3,"file":"testDatabase.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAIlD,eAAO,MAAM,gBAAgB;8BAQD,MAAM;;;mBAKK,MAAM,GAAG,IAAI;;;eAE1C,MAAM;YACT,MAAM;gBACF,MAAM;;;;;;;;eAOK,MAAM;YAAM,MAAM;;8BAEtC,CAAC"}
@@ -1,12 +1,23 @@
1
- import { Effect } from "effect";
2
- import { SqlClient } from "effect/sql";
1
+ import { DateTime, Effect, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+ const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
3
4
  export const authTestDatabase = Effect.gen(function* () {
4
5
  const sql = (yield* SqlClient.SqlClient).withoutTransforms();
6
+ const readSessions = SqlSchema.findAll({
7
+ execute: (userId) => sql `select id, "expiresAt" from "session" where "userId" = ${userId} order by id`,
8
+ Request: Schema.String,
9
+ Result: StoredSession,
10
+ });
5
11
  return {
6
12
  expireSessions: (userId) => sql `update "session" set "expiresAt" = now() - interval '1 second' ${userId === undefined ? sql.literal("") : sql `where "userId" = ${userId}`}`.pipe(Effect.asVoid),
7
13
  omitImageColumn: sql `alter table "user" drop column image`.pipe(Effect.asVoid),
8
14
  sessionIpAddresses: sql `select "ipAddress" from "session" order by "createdAt", id`,
9
15
  sessions: sql `select s.id, s."userId", u.email from "session" s join "user" u on u.id = s."userId" order by u.email, s.id`,
16
+ sessionsFor: Effect.fnUntraced(function* (userId) {
17
+ const sessions = yield* readSessions(userId);
18
+ const now = yield* DateTime.now;
19
+ return sessions.map((session) => ({ ...session, expired: DateTime.toEpochMillis(session.expiresAt) <= DateTime.toEpochMillis(now) }));
20
+ }),
10
21
  users: sql `select id, email from "user" order by email`,
11
22
  };
12
23
  });
@@ -1 +1 @@
1
- {"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,OAAO;QACN,cAAc,EAAE,CAAC,MAAe,EAAE,EAAE,CACnC,GAAG,CAAA,kEAAkE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,oBAAoB,MAAM,EAAE,EAAE,CAAC,IAAI,CACnJ,MAAM,CAAC,MAAM,CACb;QACF,eAAe,EAAE,GAAG,CAAA,sCAAsC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9E,kBAAkB,EAAE,GAAG,CAA8B,4DAA4D;QACjH,QAAQ,EAAE,GAAG,CAIX,6GAA6G;QAC/G,KAAK,EAAE,GAAG,CAA+B,6CAA6C;KACtF,CAAC;AACH,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,mBAAmB,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC;QACtC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAA,0DAA0D,MAAM,cAAc;QACtG,OAAO,EAAE,MAAM,CAAC,MAAM;QACtB,MAAM,EAAE,aAAa;KACrB,CAAC,CAAC;IACH,OAAO;QACN,cAAc,EAAE,CAAC,MAAe,EAAE,EAAE,CACnC,GAAG,CAAA,kEAAkE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,oBAAoB,MAAM,EAAE,EAAE,CAAC,IAAI,CACnJ,MAAM,CAAC,MAAM,CACb;QACF,eAAe,EAAE,GAAG,CAAA,sCAAsC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9E,kBAAkB,EAAE,GAAG,CAA8B,4DAA4D;QACjH,QAAQ,EAAE,GAAG,CAIX,6GAA6G;QAC/G,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAc;YACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;YAChC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACvI,CAAC,CAAC;QACF,KAAK,EAAE,GAAG,CAA+B,6CAA6C;KACtF,CAAC;AACH,CAAC,CAAC,CAAC"}
@@ -100,9 +100,7 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
100
100
  readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
101
101
  }>, Schema.Struct<{
102
102
  readonly _tag: Schema.Literal<"Resync">;
103
- }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", Schema.Struct<{
104
- id: Schema.String;
105
- }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
103
+ }>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
106
104
  readonly cursor: Schema.optionalKey<Schema.Struct<{
107
105
  readonly id: Schema.String;
108
106
  readonly lastActivityAt: Schema.DateTimeUtcFromString;
@@ -124,5 +122,7 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
124
122
  readonly name: Schema.String;
125
123
  }>;
126
124
  }>>;
127
- }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission, never>, readonly [], undefined>;
125
+ }>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", Schema.Struct<{
126
+ id: Schema.String;
127
+ }>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never>, readonly [], undefined>;
128
128
  //# sourceMappingURL=sessions.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uOAiBY,CAAC"}
1
+ {"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mKAiBY,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/identity",
3
- "version": "0.10.1",
3
+ "version": "0.11.1",
4
4
  "description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
5
5
  "keywords": [
6
6
  "effect"
@@ -45,21 +45,21 @@
45
45
  "README.md"
46
46
  ],
47
47
  "dependencies": {
48
- "@shivaedev/access": "0.3.1",
48
+ "@shivaedev/access": "0.3.3",
49
49
  "@shivaedev/changes": "0.6.0",
50
- "@shivaedev/contract": "0.27.0",
51
- "@shivaedev/errors": "0.1.3",
50
+ "@shivaedev/contract": "0.29.0",
51
+ "@shivaedev/errors": "0.3.0",
52
52
  "@shivaedev/sql": "0.27.0"
53
53
  },
54
54
  "devDependencies": {
55
55
  "@effect/platform-node": "4.0.6",
56
56
  "@effect/sql-pg": "4.0.6",
57
- "@shivaedev/admin": "0.12.3",
58
- "@shivaedev/quality": "0.48.2",
59
- "@shivaedev/server": "0.10.0",
57
+ "@shivaedev/admin": "0.14.0",
58
+ "@shivaedev/quality": "0.50.0",
59
+ "@shivaedev/server": "0.12.0",
60
60
  "@shivaedev/test": "0.12.0",
61
61
  "@shivaedev/test-sql": "0.15.0",
62
- "@shivaedev/test-story": "0.28.0",
62
+ "@shivaedev/test-story": "0.30.0",
63
63
  "@types/node": "24.19.2",
64
64
  "better-auth": "1.7.12",
65
65
  "effect": "4.0.6",
@@ -1,10 +1,13 @@
1
- import { Effect, Option, Predicate } from "effect";
1
+ import { Clock, Effect, Option, Predicate, Schema } from "effect";
2
2
  import type { Headers } from "effect/http";
3
3
  import * as HttpStatus from "effect/http/HttpStatus";
4
4
  import { type AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
5
5
  import type { ProviderAccountValue } from "#identity.ts";
6
6
  import { providerFailure } from "#server/providerFailure.ts";
7
7
  import type { SessionProvider, SessionShape } from "#server/session.ts";
8
+
9
+ const ExpiringSession = Schema.Struct({ session: Schema.Struct({ expiresAt: Schema.Date }) });
10
+
8
11
  export type GetSession<TSession extends SessionShape> = (headers: globalThis.Headers) => Promise<TSession | null>;
9
12
  export type GetProviderAccounts = (headers: globalThis.Headers) => Promise<readonly ProviderAccountValue[]>;
10
13
  export type SessionWithProviderAccounts<TSession extends SessionShape> = TSession & {
@@ -19,6 +22,9 @@ export function betterAuthSessions<TSession extends SessionShape>(getSession: Ge
19
22
  const betterAuthSession = Effect.fn("PlatformRpc.betterAuthSession")(function* (headers: Headers.Headers) {
20
23
  const transport = new globalThis.Headers(headers);
21
24
  const session = yield* Effect.tryPromise(() => getSession(transport)).pipe(Effect.catch((error) => providerFailure(error.cause)));
25
+ if (Schema.is(ExpiringSession)(session) && session.session.expiresAt.getTime() <= (yield* Clock.currentTimeMillis)) {
26
+ return Option.none();
27
+ }
22
28
  if (session === null || getProviderAccounts === undefined) {
23
29
  return Option.fromNullishOr(session);
24
30
  }
@@ -0,0 +1,36 @@
1
+ import type { BetterAuthOptions, BetterAuthPlugin } from "better-auth";
2
+ import { APIError, createAuthMiddleware, dispatchAuthEndpoint, verifyPassword } from "better-auth/api";
3
+
4
+ export interface BetterAuthHardeningOptions {
5
+ readonly requirePasswordForEmailChange?: boolean;
6
+ }
7
+
8
+ const emailChangePassword = {
9
+ hooks: {
10
+ before: [
11
+ {
12
+ handler: createAuthMiddleware(async (ctx) => {
13
+ const password: unknown = ctx.body?.password;
14
+ if (typeof password !== "string" || password.length === 0 || password.length > ctx.context.password.config.maxPasswordLength) {
15
+ throw new APIError("BAD_REQUEST", { code: "INVALID_PASSWORD", message: "Current password is required" });
16
+ }
17
+ // Bearer conversion finishes after before hooks, so verification needs its own dispatch.
18
+ await dispatchAuthEndpoint(verifyPassword, { asResponse: false, body: { password }, context: ctx.context, headers: ctx.headers });
19
+ }),
20
+ matcher: (ctx) => ctx.path === "/change-email",
21
+ },
22
+ ],
23
+ },
24
+ id: "identity-email-change-password",
25
+ } satisfies BetterAuthPlugin;
26
+
27
+ export function withHardening<TOptions extends BetterAuthOptions>(options: TOptions, hardening: BetterAuthHardeningOptions = {}): TOptions {
28
+ return {
29
+ ...options,
30
+ emailAndPassword: options.emailAndPassword && {
31
+ ...options.emailAndPassword,
32
+ revokeSessionsOnPasswordReset: options.emailAndPassword.revokeSessionsOnPasswordReset ?? true,
33
+ },
34
+ plugins: [...(options.plugins ?? []), ...(hardening.requirePasswordForEmailChange === false ? [] : [emailChangePassword])],
35
+ };
36
+ }
@@ -6,7 +6,6 @@ import { fromStorage, type PolicyStorage, type SignInGate } from "#server/better
6
6
 
7
7
  type SessionCreateBefore = NonNullable<NonNullable<NonNullable<NonNullable<BetterAuthOptions["databaseHooks"]>["session"]>["create"]>["before"]>;
8
8
  type ValidateUserInfo = NonNullable<NonNullable<BetterAuthOptions["user"]>["validateUserInfo"]>;
9
- export type PolicyRun = <A, E>(effect: Effect.Effect<A, E>) => Promise<A>;
10
9
 
11
10
  const REFUSED_MESSAGE = "This account may not sign in";
12
11
  const UNAVAILABLE_MESSAGE = "Sign-in is temporarily unavailable";
@@ -30,7 +29,12 @@ async function signingInAccount(
30
29
  return typeof subject === "string" || typeof subject === "number" ? { accountId: String(subject), providerId: provider.id } : undefined;
31
30
  }
32
31
 
33
- export function signInPolicyOptions<E>(options: BetterAuthOptions, gate: SignInGate<E>, run: PolicyRun, storage: () => Promise<PolicyStorage>) {
32
+ export const signInPolicyOptions = Effect.fnUntraced(function* <E>(
33
+ options: BetterAuthOptions,
34
+ gate: SignInGate<E>,
35
+ storage: () => Promise<PolicyStorage>,
36
+ ) {
37
+ const run = Effect.runPromiseWith(yield* Effect.context<never>());
34
38
  const sessionBefore = options.databaseHooks?.session?.create?.before;
35
39
  const before: SessionCreateBefore = async (session, endpoint) => {
36
40
  const own = await sessionBefore?.(session, endpoint);
@@ -38,7 +42,9 @@ export function signInPolicyOptions<E>(options: BetterAuthOptions, gate: SignInG
38
42
  return own;
39
43
  }
40
44
  const userId = typeof own === "object" && typeof own.data.userId === "string" ? own.data.userId : session.userId;
41
- const exit = await run(Effect.exit(logged(Effect.flatMap(fromStorage(storage), (auth) => gate.admitsUser(auth, userId)))));
45
+ const exit = await run(Effect.exit(logged(Effect.flatMap(fromStorage(storage), (auth) => gate.admitsUser(auth, userId)))), {
46
+ signal: endpoint?.request?.signal,
47
+ });
42
48
  if (Exit.isFailure(exit)) {
43
49
  throw new APIError("SERVICE_UNAVAILABLE", { code: unavailable.error, message: UNAVAILABLE_MESSAGE });
44
50
  }
@@ -56,7 +62,7 @@ export function signInPolicyOptions<E>(options: BetterAuthOptions, gate: SignInG
56
62
  if (account === undefined) {
57
63
  return refused;
58
64
  }
59
- const exit = await run(Effect.exit(logged(gate.admits([account]))));
65
+ const exit = await run(Effect.exit(logged(gate.admits([account]))), { signal: endpoint.request?.signal });
60
66
  if (Exit.isFailure(exit)) {
61
67
  return unavailable;
62
68
  }
@@ -69,4 +75,4 @@ export function signInPolicyOptions<E>(options: BetterAuthOptions, gate: SignInG
69
75
  },
70
76
  user: { ...options.user, validateUserInfo },
71
77
  };
72
- }
78
+ });
@@ -1,6 +1,14 @@
1
- import { Config, Schema, SchemaGetter } from "effect";
1
+ import { Config, Result, Schema, SchemaGetter } from "effect";
2
2
 
3
- const ProviderAccount = Schema.Struct({ accountId: Schema.NonEmptyString, providerId: Schema.NonEmptyString });
3
+ const GitHubAccountId = Schema.String.check(Schema.isPattern(/^[0-9]+$/u, { expected: "a numeric GitHub account id (digits only)" }));
4
+
5
+ const ProviderAccount = Schema.Struct({ accountId: Schema.String, providerId: Schema.NonEmptyString }).check(
6
+ Schema.makeFilter(({ accountId, providerId }) => {
7
+ const accountIdSchema = providerId === "github" ? GitHubAccountId : Schema.NonEmptyString;
8
+ const decoded = Schema.decodeUnknownResult(accountIdSchema)(accountId);
9
+ return Result.isSuccess(decoded) ? true : `Invalid entry "${providerId}:${accountId}": ${decoded.failure.message}`;
10
+ }),
11
+ );
4
12
 
5
13
  const AccountEntry = Schema.String.pipe(
6
14
  Schema.decodeTo(ProviderAccount, {
@@ -1,5 +1,6 @@
1
1
  import type { BetterAuthOptions } from "better-auth";
2
2
  import { bearer } from "better-auth/plugins/bearer";
3
+ import { Result } from "effect";
3
4
 
4
5
  export interface BearerSessionsOptions {
5
6
  readonly origins: readonly string[];
@@ -41,10 +42,15 @@ export async function cookieSessionResponse(response: Response): Promise<Respons
41
42
  .join(","),
42
43
  );
43
44
  }
44
- if (!headers.get("content-type")?.includes("application/json")) {
45
- return new Response(response.body, { headers, status: response.status });
45
+ const init = { headers, status: response.status, statusText: response.statusText };
46
+ if ((response.status >= 300 && response.status < 400) || response.body === null || !headers.get("content-type")?.includes("application/json")) {
47
+ return new Response(response.body, init);
48
+ }
49
+ const bytes = await response.arrayBuffer();
50
+ const body = Result.try((): unknown => JSON.parse(new TextDecoder().decode(bytes), (key, value: unknown) => (key === "token" ? undefined : value)));
51
+ if (Result.isFailure(body)) {
52
+ return new Response(bytes, init);
46
53
  }
47
- const body: unknown = JSON.parse(await response.text(), (key, value: unknown) => (key === "token" ? undefined : value));
48
54
  headers.delete("content-length");
49
- return Response.json(body, { headers, status: response.status });
55
+ return Response.json(body.success, init);
50
56
  }
@@ -19,10 +19,13 @@ export function clientIpHeaders(options: {
19
19
  trustedProxies: trustedProxyRanges(options.trustedProxy),
20
20
  },
21
21
  };
22
+ const resolved = {
23
+ advanced: { ipAddress: { ...advanced.ipAddress, ipAddressHeaders: [PEER_IP_HEADER], trustedProxies: [] } },
24
+ };
22
25
  return (request: HttpServerRequest.HttpServerRequest, web: Request) => {
23
26
  web.headers.delete(PEER_IP_HEADER);
24
27
  const trusted = Option.exists(request.remoteAddress, trustedPeer);
25
- const forwardedIp = trusted ? getIP(web, { advanced }) : null;
28
+ const forwardedIp = trusted && web.headers.has(options.clientIpHeader) ? getIP(web, { advanced }) : null;
26
29
  if (!trusted) {
27
30
  web.headers.delete("x-forwarded-for");
28
31
  web.headers.delete(options.clientIpHeader);
@@ -31,5 +34,6 @@ export function clientIpHeaders(options: {
31
34
  if (address !== undefined) {
32
35
  web.headers.set(PEER_IP_HEADER, address);
33
36
  }
37
+ return { address: getIP(web, resolved), source: forwardedIp === null ? "peer" : "forwarded" };
34
38
  };
35
39
  }
@@ -1,19 +1,21 @@
1
1
  import { type BetterAuthOptions, betterAuth } from "better-auth";
2
2
  import { Config, Effect, Option, Redacted } from "effect";
3
3
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
4
+ import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
5
+ import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
4
6
  import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/bearerSessions.ts";
5
7
  import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
6
8
  import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
7
9
  import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
8
10
  import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
9
11
  import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
10
- import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
11
12
  import { admittedSessions } from "./admittedSessions.ts";
12
13
  import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
13
14
  import { mountedSessions } from "./mountedSessions.ts";
14
15
 
15
16
  export interface BetterAuthMountOptions<E = never, R = never> {
16
17
  readonly bearerSessions?: BearerSessionsOptions | undefined;
18
+ readonly hardening?: BetterAuthHardeningOptions;
17
19
  readonly roles?: RoleSet;
18
20
  readonly signIn?: SignInPolicy<E, R> | undefined;
19
21
  }
@@ -28,20 +30,18 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
28
30
  const trustedProxy = Option.getOrUndefined(yield* Config.String("TRUSTED_PROXY").pipe(Config.option));
29
31
  const clientIpHeader = yield* Config.String("AUTH_CLIENT_IP_HEADER").pipe(Config.withDefault("x-forwarded-for"));
30
32
  const rateLimitEnabled = yield* Config.Boolean("AUTH_RATE_LIMIT_ENABLED").pipe(Config.withDefault(true));
31
- const context = yield* Effect.context<R>();
32
- const run = Effect.runPromiseWith(context);
33
33
  const policy = mount.signIn ?? {};
34
34
  if (policy.accounts !== undefined) {
35
35
  yield* policy.accounts;
36
36
  }
37
37
  const gate = yield* signInGate(policy);
38
- const gated = signInPolicyOptions(options, gate, run, (): Promise<PolicyStorage> => auth.$context);
38
+ const gated = yield* signInPolicyOptions(options, gate, (): Promise<PolicyStorage> => auth.$context);
39
39
  const rateLimit = options.rateLimit;
40
40
  const customStorage =
41
41
  rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
42
42
  const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
43
43
  const auth = betterAuth({
44
- ...withBearerSessions(configured, mount.bearerSessions !== undefined),
44
+ ...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
45
45
  advanced: {
46
46
  useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
47
47
  ...options.advanced,
@@ -53,7 +53,7 @@ const authResponse = Effect.fnUntraced(function* (auth: MountedAuth, web: Reques
53
53
  url.searchParams.set("disableCookieCache", "true");
54
54
  }
55
55
  const request = sessionRequest ? new Request(url, web) : web;
56
- const response = yield* Effect.tryPromise(() => providerResponse(auth, request, options));
56
+ const response = yield* Effect.tryPromise((signal) => providerResponse(auth, new Request(request, { signal }), options));
57
57
  return sessionRequest && response.ok && options.roles !== undefined ? yield* sessionPermissions(response, options.roles) : response;
58
58
  });
59
59
  export function mountRoutes(auth: MountedAuth, options: MountRouteOptions) {
@@ -62,7 +62,11 @@ export function mountRoutes(auth: MountedAuth, options: MountRouteOptions) {
62
62
  router.add("*", "/api/auth/*", (request) =>
63
63
  Effect.gen(function* () {
64
64
  const web = yield* HttpServerRequest.toWeb(request);
65
- setClientIp(request, web);
65
+ const clientIp = setClientIp(request, web);
66
+ yield* Effect.annotateCurrentSpan({
67
+ "auth.rate_limit.address": clientIp.address,
68
+ "auth.rate_limit.address_source": clientIp.source,
69
+ });
66
70
  return HttpServerResponse.fromWeb(yield* authResponse(auth, web, options).pipe(Effect.catch(providerFailure)));
67
71
  }).pipe(
68
72
  Effect.catch(() =>
@@ -2,9 +2,9 @@ import { Schema } from "effect";
2
2
  import type { RoleSet } from "@shivaedev/access/roleSet.ts";
3
3
  import { SessionUserSchema } from "#identity.ts";
4
4
  import type { GetSession } from "#server/adapters/betterAuthSessions.ts";
5
- import type { SessionProvider, SessionShape } from "#server/session.ts";
5
+ import type { SessionProvider, SessionShape, UserSessionShape } from "#server/session.ts";
6
6
 
7
- const AuthSession = Schema.NullOr(Schema.Struct({ user: SessionUserSchema }));
7
+ const AuthSession = Schema.NullOr(Schema.Struct({ session: Schema.Struct({ expiresAt: Schema.Date }), user: SessionUserSchema }));
8
8
  type SessionLookup = (options: {
9
9
  readonly asResponse: false;
10
10
  readonly headers: Headers;
@@ -17,7 +17,7 @@ export function mountedSessions(
17
17
  lookup: unknown,
18
18
  admit: <TSession extends SessionShape>(getSession: GetSession<TSession>) => SessionProvider<TSession>,
19
19
  roles?: RoleSet,
20
- ) {
20
+ ): { readonly roles?: RoleSet; readonly provider: SessionProvider<UserSessionShape> } {
21
21
  const getSession = Schema.decodeUnknownSync(SessionLookup)(lookup);
22
22
  return {
23
23
  ...(roles === undefined ? {} : { roles }),
@@ -13,13 +13,14 @@ function unavailable() {
13
13
  export const listSessions = Effect.fn("Identity.listSessions")(function* (input: typeof SessionListInput.Type) {
14
14
  yield* requirePermission(yield* SessionUser, ManageSessions);
15
15
  const sql = yield* SqlClient.SqlClient;
16
+ const now = DateTime.toDateUtc(yield* DateTime.now);
16
17
  const cursor = input.cursor;
17
18
  const before = cursor === undefined ? sql`true` : sql`(s."updatedAt", s.id) < (${DateTime.toDateUtc(cursor.lastActivityAt)}, ${cursor.id})`;
18
19
  const read = SqlSchema.findAll({
19
20
  execute: () => sql`select s.id, s."createdAt" as "startedAt", s."updatedAt" as "lastActivityAt", s."expiresAt",
20
21
  json_build_object('id', u.id, 'name', u.name, 'email', u.email) as "user"
21
22
  from "session" s join "user" u on u.id = s."userId"
22
- where s."expiresAt" > now() and ${before}
23
+ where s."expiresAt" > ${now} and ${before}
23
24
  order by s."updatedAt" desc, s.id desc limit ${input.limit + 1}`,
24
25
  Request: Schema.Void,
25
26
  Result: SignedInSession,
@@ -1,12 +1,13 @@
1
- import { Effect, Schema } from "effect";
1
+ import { DateTime, Effect, Schema } from "effect";
2
2
  import { SqlClient } from "effect/sql";
3
3
 
4
4
  const SweepResult = Schema.Tuple([Schema.Struct({ removed: Schema.NumberFromString })]);
5
5
 
6
6
  export const sweepExpiredSessions = Effect.gen(function* () {
7
7
  const sql = yield* SqlClient.SqlClient;
8
+ const now = DateTime.toDateUtc(yield* DateTime.now);
8
9
  const rows = yield* sql`with expired as (
9
- delete from "session" where "expiresAt" <= now() returning 1
10
+ delete from "session" where "expiresAt" <= ${now} returning 1
10
11
  ) select count(*)::text as removed from expired`;
11
12
  const [result] = yield* Schema.decodeUnknownEffect(SweepResult)(rows);
12
13
  return result.removed;
@@ -1,8 +1,15 @@
1
- import { Effect } from "effect";
2
- import { SqlClient } from "effect/sql";
1
+ import { DateTime, Effect, Schema } from "effect";
2
+ import { SqlClient, SqlSchema } from "effect/sql";
3
+
4
+ const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
3
5
 
4
6
  export const authTestDatabase = Effect.gen(function* () {
5
7
  const sql = (yield* SqlClient.SqlClient).withoutTransforms();
8
+ const readSessions = SqlSchema.findAll({
9
+ execute: (userId) => sql`select id, "expiresAt" from "session" where "userId" = ${userId} order by id`,
10
+ Request: Schema.String,
11
+ Result: StoredSession,
12
+ });
6
13
  return {
7
14
  expireSessions: (userId?: string) =>
8
15
  sql`update "session" set "expiresAt" = now() - interval '1 second' ${userId === undefined ? sql.literal("") : sql`where "userId" = ${userId}`}`.pipe(
@@ -15,6 +22,11 @@ export const authTestDatabase = Effect.gen(function* () {
15
22
  id: string;
16
23
  userId: string;
17
24
  }>`select s.id, s."userId", u.email from "session" s join "user" u on u.id = s."userId" order by u.email, s.id`,
25
+ sessionsFor: Effect.fnUntraced(function* (userId: string) {
26
+ const sessions = yield* readSessions(userId);
27
+ const now = yield* DateTime.now;
28
+ return sessions.map((session) => ({ ...session, expired: DateTime.toEpochMillis(session.expiresAt) <= DateTime.toEpochMillis(now) }));
29
+ }),
18
30
  users: sql<{ email: string; id: string }>`select id, email from "user" order by email`,
19
31
  };
20
32
  });
@@ -1 +0,0 @@
1
- {"version":3,"file":"signInPolicy.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/signInPolicy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAErG,OAAO,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AAEtC,OAAO,EAAe,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAIrG,MAAM,MAAM,SAAS,GAAG,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;AAwB1E,wBAAgB,mBAAmB,CAAC,CAAC,EAAE,OAAO,EAAE,iBAAiB,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAuC5I"}
@@ -1 +0,0 @@
1
- {"version":3,"file":"signInPolicy.js","sourceRoot":"","sources":["../../../src/server/better-auth/signInPolicy.ts"],"names":[],"mappings":"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"}