@shivaedev/identity 0.35.0 → 0.37.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 +47 -0
- package/README.md +60 -36
- package/dist/client/SessionMemory.d.ts.map +1 -1
- package/dist/client/SessionMemory.js +7 -0
- package/dist/client/SessionMemory.js.map +1 -1
- package/dist/client/{adapters/changeEmail.d.ts → changeEmail.d.ts} +1 -1
- package/dist/client/changeEmail.d.ts.map +1 -0
- package/dist/client/changeEmail.js.map +1 -0
- package/dist/server/account-preferences/Rows.d.ts +34 -1
- package/dist/server/account-preferences/Rows.d.ts.map +1 -1
- package/dist/server/accountPreferencesMigration.d.ts.map +1 -0
- package/dist/server/accountPreferencesMigration.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.d.ts +1 -1
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +2 -2
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/better-auth/SeedOptions.d.ts.map +1 -0
- package/dist/server/better-auth/SeedOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/accountRoleSeed.d.ts +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.js +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.d.ts +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.js +2 -2
- package/dist/server/better-auth/adapters/migrationPlan.js.map +1 -1
- package/dist/server/better-auth/{adapters/assertSchema.d.ts → assertSchema.d.ts} +1 -1
- package/dist/server/better-auth/assertSchema.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/assertSchema.js → assertSchema.js} +2 -2
- package/dist/server/better-auth/assertSchema.js.map +1 -0
- package/dist/server/better-auth/assertSeedDatabase.d.ts.map +1 -0
- package/dist/server/better-auth/assertSeedDatabase.js.map +1 -0
- package/dist/server/better-auth/assignRole.d.ts +1 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +2 -2
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/changeHooks.d.ts +3 -0
- package/dist/server/better-auth/changeHooks.d.ts.map +1 -0
- package/dist/server/better-auth/changeHooks.js +36 -0
- package/dist/server/better-auth/changeHooks.js.map +1 -0
- package/dist/server/better-auth/clientIpHeaders.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/clientIpHeaders.js → clientIpHeaders.js} +1 -1
- package/dist/server/better-auth/clientIpHeaders.js.map +1 -0
- package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +1 -0
- package/dist/server/better-auth/closeRoleEndpoints.js.map +1 -0
- package/dist/server/better-auth/{adapters/columnDrift.d.ts → columnDrift.d.ts} +1 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/columnDrift.js → columnDrift.js} +1 -1
- package/dist/server/better-auth/columnDrift.js.map +1 -0
- package/dist/server/better-auth/defineSeed.d.ts +4 -0
- package/dist/server/better-auth/defineSeed.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/defineSeed.js → defineSeed.js} +2 -2
- package/dist/server/better-auth/defineSeed.js.map +1 -0
- package/dist/server/better-auth/{adapters/migrate.d.ts → migrate.d.ts} +1 -1
- package/dist/server/better-auth/migrate.d.ts.map +1 -0
- package/dist/server/better-auth/migrate.js.map +1 -0
- package/dist/server/better-auth/{adapters/migrations → migrations}/generate.d.ts +1 -1
- package/dist/server/better-auth/migrations/generate.d.ts.map +1 -0
- package/dist/server/better-auth/migrations/generate.js.map +1 -0
- package/dist/server/better-auth/{adapters/mount.d.ts → mount.d.ts} +5 -5
- package/dist/server/better-auth/mount.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/mount.js → mount.js} +7 -5
- package/dist/server/better-auth/mount.js.map +1 -0
- package/dist/server/better-auth/mountSettings.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/mountSettings.js → mountSettings.js} +1 -1
- package/dist/server/better-auth/mountSettings.js.map +1 -0
- package/dist/server/better-auth/preferencesClient.d.ts.map +1 -0
- package/dist/server/better-auth/preferencesClient.js.map +1 -0
- package/dist/server/better-auth/routeHandler.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/routeHandler.js → routeHandler.js} +1 -1
- package/dist/server/better-auth/routeHandler.js.map +1 -0
- package/dist/server/better-auth/seedUsers.d.ts +1 -1
- package/dist/server/better-auth/seedUsers.d.ts.map +1 -1
- package/dist/server/better-auth/seedUsers.js.map +1 -1
- package/dist/server/better-auth/sessionAdministration.js +1 -1
- package/dist/server/better-auth/sessionAdministration.js.map +1 -1
- package/dist/server/better-auth/storedRoleOptions.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/storedRoleOptions.js → storedRoleOptions.js} +1 -1
- package/dist/server/better-auth/storedRoleOptions.js.map +1 -0
- package/dist/server/better-auth/sweepExpiredSessions.d.ts.map +1 -1
- package/dist/server/better-auth/sweepExpiredSessions.js +17 -6
- package/dist/server/better-auth/sweepExpiredSessions.js.map +1 -1
- package/dist/server/better-auth/tables.d.ts.map +1 -0
- package/dist/server/better-auth/tables.js.map +1 -0
- package/dist/server/better-auth/testDatabase.d.ts +2 -1
- package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
- package/dist/server/better-auth/testDatabase.js +2 -1
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/better-auth/userDataExport.d.ts.map +1 -0
- package/dist/server/better-auth/userDataExport.js.map +1 -0
- package/dist/server/better-auth/{adapters/userDirectory.d.ts → userDirectory.d.ts} +1 -1
- package/dist/server/better-auth/userDirectory.d.ts.map +1 -0
- package/dist/server/better-auth/userDirectory.js.map +1 -0
- package/dist/server/better-auth/userDirectoryReads.d.ts +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.js +2 -2
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -1
- package/dist/server/{adapters/currentSessionContext.d.ts → currentSessionContext.d.ts} +2 -2
- package/dist/server/currentSessionContext.d.ts.map +1 -0
- package/dist/server/{adapters/currentSessionContext.js → currentSessionContext.js} +2 -2
- package/dist/server/currentSessionContext.js.map +1 -0
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +3 -1
- package/dist/server/lookupSession.js.map +1 -1
- package/dist/server/machineTokenMigration.d.ts.map +1 -0
- package/dist/server/machineTokenMigration.js.map +1 -0
- package/dist/server/resolveRole.js +1 -1
- package/dist/server/resolveRole.js.map +1 -1
- package/dist/server/revalidateStream.js +1 -1
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts +2 -2
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +4 -4
- package/dist/server/session.js.map +1 -1
- package/dist/server/subjectResolverLayer.js +3 -3
- package/dist/server/subjectResolverLayer.js.map +1 -1
- package/dist/server/trustedOrigins.d.ts.map +1 -0
- package/dist/server/trustedOrigins.js.map +1 -0
- package/dist/server/trustedProxyRanges.d.ts.map +1 -0
- package/dist/server/trustedProxyRanges.js.map +1 -0
- package/package.json +13 -13
- package/src/client/SessionMemory.ts +7 -0
- package/src/server/adapters/betterAuthSessions.ts +3 -2
- package/src/server/better-auth/adapters/accountRoleSeed.ts +1 -1
- package/src/server/better-auth/adapters/migrationPlan.ts +2 -2
- package/src/server/better-auth/{adapters/assertSchema.ts → assertSchema.ts} +2 -2
- package/src/server/better-auth/assignRole.ts +2 -2
- package/src/server/better-auth/changeHooks.ts +49 -0
- package/src/server/better-auth/{adapters/clientIpHeaders.ts → clientIpHeaders.ts} +1 -1
- package/src/server/better-auth/{adapters/columnDrift.ts → columnDrift.ts} +2 -2
- package/src/server/better-auth/{adapters/defineSeed.ts → defineSeed.ts} +3 -3
- package/src/server/better-auth/{adapters/migrate.ts → migrate.ts} +1 -1
- package/src/server/better-auth/{adapters/migrations → migrations}/generate.ts +1 -1
- package/src/server/better-auth/{adapters/mount.ts → mount.ts} +7 -5
- package/src/server/better-auth/{adapters/mountSettings.ts → mountSettings.ts} +1 -1
- package/src/server/better-auth/{adapters/routeHandler.ts → routeHandler.ts} +1 -1
- package/src/server/better-auth/seedUsers.ts +1 -1
- package/src/server/better-auth/sessionAdministration.ts +1 -1
- package/src/server/better-auth/{adapters/storedRoleOptions.ts → storedRoleOptions.ts} +1 -1
- package/src/server/better-auth/sweepExpiredSessions.ts +17 -6
- package/src/server/better-auth/testDatabase.ts +2 -1
- package/src/server/better-auth/{adapters/userDirectory.ts → userDirectory.ts} +1 -1
- package/src/server/better-auth/userDirectoryReads.ts +2 -2
- package/src/server/{adapters/currentSessionContext.ts → currentSessionContext.ts} +3 -2
- package/src/server/lookupSession.ts +5 -1
- package/src/server/resolveRole.ts +1 -1
- package/src/server/revalidateStream.ts +1 -1
- package/src/server/session.ts +5 -4
- package/src/server/subjectResolverLayer.ts +3 -3
- package/dist/client/adapters/changeEmail.d.ts.map +0 -1
- package/dist/client/adapters/changeEmail.js.map +0 -1
- package/dist/server/adapters/accountPreferencesMigration.d.ts.map +0 -1
- package/dist/server/adapters/accountPreferencesMigration.js.map +0 -1
- package/dist/server/adapters/currentSessionContext.d.ts.map +0 -1
- package/dist/server/adapters/currentSessionContext.js.map +0 -1
- package/dist/server/adapters/machineTokenMigration.d.ts.map +0 -1
- package/dist/server/adapters/machineTokenMigration.js.map +0 -1
- package/dist/server/adapters/trustedOrigins.d.ts.map +0 -1
- package/dist/server/adapters/trustedOrigins.js.map +0 -1
- package/dist/server/adapters/trustedProxyRanges.d.ts.map +0 -1
- package/dist/server/adapters/trustedProxyRanges.js.map +0 -1
- package/dist/server/better-auth/adapters/SeedOptions.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/SeedOptions.js.map +0 -1
- package/dist/server/better-auth/adapters/assertSchema.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/assertSchema.js.map +0 -1
- package/dist/server/better-auth/adapters/assertSeedDatabase.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/assertSeedDatabase.js.map +0 -1
- package/dist/server/better-auth/adapters/clientIpHeaders.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/clientIpHeaders.js.map +0 -1
- package/dist/server/better-auth/adapters/closeRoleEndpoints.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/closeRoleEndpoints.js.map +0 -1
- package/dist/server/better-auth/adapters/columnDrift.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/columnDrift.js.map +0 -1
- package/dist/server/better-auth/adapters/defineSeed.d.ts +0 -4
- package/dist/server/better-auth/adapters/defineSeed.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/defineSeed.js.map +0 -1
- package/dist/server/better-auth/adapters/migrate.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/migrate.js.map +0 -1
- package/dist/server/better-auth/adapters/migrations/generate.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/migrations/generate.js.map +0 -1
- package/dist/server/better-auth/adapters/mount.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/mount.js.map +0 -1
- package/dist/server/better-auth/adapters/mountSettings.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/mountSettings.js.map +0 -1
- package/dist/server/better-auth/adapters/preferencesClient.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/preferencesClient.js.map +0 -1
- package/dist/server/better-auth/adapters/routeHandler.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/routeHandler.js.map +0 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +0 -1
- package/dist/server/better-auth/adapters/tables.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/tables.js.map +0 -1
- package/dist/server/better-auth/adapters/userDataExport.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/userDataExport.js.map +0 -1
- package/dist/server/better-auth/adapters/userDirectory.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/userDirectory.js.map +0 -1
- /package/dist/client/{adapters/changeEmail.js → changeEmail.js} +0 -0
- /package/dist/server/{adapters/accountPreferencesMigration.d.ts → accountPreferencesMigration.d.ts} +0 -0
- /package/dist/server/{adapters/accountPreferencesMigration.js → accountPreferencesMigration.js} +0 -0
- /package/dist/server/better-auth/{adapters/SeedOptions.d.ts → SeedOptions.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/SeedOptions.js → SeedOptions.js} +0 -0
- /package/dist/server/better-auth/{adapters/assertSeedDatabase.d.ts → assertSeedDatabase.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/assertSeedDatabase.js → assertSeedDatabase.js} +0 -0
- /package/dist/server/better-auth/{adapters/clientIpHeaders.d.ts → clientIpHeaders.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/closeRoleEndpoints.d.ts → closeRoleEndpoints.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/closeRoleEndpoints.js → closeRoleEndpoints.js} +0 -0
- /package/dist/server/better-auth/{adapters/migrate.js → migrate.js} +0 -0
- /package/dist/server/better-auth/{adapters/migrations → migrations}/generate.js +0 -0
- /package/dist/server/better-auth/{adapters/mountSettings.d.ts → mountSettings.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/preferencesClient.d.ts → preferencesClient.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/preferencesClient.js → preferencesClient.js} +0 -0
- /package/dist/server/better-auth/{adapters/routeHandler.d.ts → routeHandler.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/storedRoleOptions.d.ts → storedRoleOptions.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/tables.d.ts → tables.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/tables.js → tables.js} +0 -0
- /package/dist/server/better-auth/{adapters/userDataExport.d.ts → userDataExport.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/userDataExport.js → userDataExport.js} +0 -0
- /package/dist/server/better-auth/{adapters/userDirectory.js → userDirectory.js} +0 -0
- /package/dist/server/{adapters/machineTokenMigration.d.ts → machineTokenMigration.d.ts} +0 -0
- /package/dist/server/{adapters/machineTokenMigration.js → machineTokenMigration.js} +0 -0
- /package/dist/server/{adapters/trustedOrigins.d.ts → trustedOrigins.d.ts} +0 -0
- /package/dist/server/{adapters/trustedOrigins.js → trustedOrigins.js} +0 -0
- /package/dist/server/{adapters/trustedProxyRanges.d.ts → trustedProxyRanges.d.ts} +0 -0
- /package/dist/server/{adapters/trustedProxyRanges.js → trustedProxyRanges.js} +0 -0
- /package/src/client/{adapters/changeEmail.ts → changeEmail.ts} +0 -0
- /package/src/server/{adapters/accountPreferencesMigration.ts → accountPreferencesMigration.ts} +0 -0
- /package/src/server/better-auth/{adapters/SeedOptions.ts → SeedOptions.ts} +0 -0
- /package/src/server/better-auth/{adapters/assertSeedDatabase.ts → assertSeedDatabase.ts} +0 -0
- /package/src/server/better-auth/{adapters/closeRoleEndpoints.ts → closeRoleEndpoints.ts} +0 -0
- /package/src/server/better-auth/{adapters/preferencesClient.ts → preferencesClient.ts} +0 -0
- /package/src/server/better-auth/{adapters/tables.ts → tables.ts} +0 -0
- /package/src/server/better-auth/{adapters/userDataExport.ts → userDataExport.ts} +0 -0
- /package/src/server/{adapters/machineTokenMigration.ts → machineTokenMigration.ts} +0 -0
- /package/src/server/{adapters/trustedOrigins.ts → trustedOrigins.ts} +0 -0
- /package/src/server/{adapters/trustedProxyRanges.ts → trustedProxyRanges.ts} +0 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,52 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.37.0 - 2026-11-21
|
|
4
|
+
|
|
5
|
+
### Breaking
|
|
6
|
+
|
|
7
|
+
- import from `@shivaedev/identity/client/changeEmail.ts` instead of `@shivaedev/identity/client/adapters/changeEmail.ts`, which moved out of `adapters/`.
|
|
8
|
+
- import from `@shivaedev/identity/server/accountPreferencesMigration.ts` instead of `@shivaedev/identity/server/adapters/accountPreferencesMigration.ts`, which moved out of `adapters/`.
|
|
9
|
+
- import from `@shivaedev/identity/server/currentSessionContext.ts` instead of `@shivaedev/identity/server/adapters/currentSessionContext.ts`, which moved out of `adapters/`.
|
|
10
|
+
- import from `@shivaedev/identity/server/machineTokenMigration.ts` instead of `@shivaedev/identity/server/adapters/machineTokenMigration.ts`, which moved out of `adapters/`.
|
|
11
|
+
- import from `@shivaedev/identity/server/trustedOrigins.ts` instead of `@shivaedev/identity/server/adapters/trustedOrigins.ts`, which moved out of `adapters/`.
|
|
12
|
+
- import from `@shivaedev/identity/server/trustedProxyRanges.ts` instead of `@shivaedev/identity/server/adapters/trustedProxyRanges.ts`, which moved out of `adapters/`.
|
|
13
|
+
- import from `@shivaedev/identity/server/better-auth/SeedOptions.ts` instead of `@shivaedev/identity/server/better-auth/adapters/SeedOptions.ts`, which moved out of `adapters/`.
|
|
14
|
+
- import from `@shivaedev/identity/server/better-auth/assertSchema.ts` instead of `@shivaedev/identity/server/better-auth/adapters/assertSchema.ts`, which moved out of `adapters/`.
|
|
15
|
+
- import from `@shivaedev/identity/server/better-auth/assertSeedDatabase.ts` instead of `@shivaedev/identity/server/better-auth/adapters/assertSeedDatabase.ts`, which moved out of `adapters/`.
|
|
16
|
+
- import from `@shivaedev/identity/server/better-auth/clientIpHeaders.ts` instead of `@shivaedev/identity/server/better-auth/adapters/clientIpHeaders.ts`, which moved out of `adapters/`.
|
|
17
|
+
- import from `@shivaedev/identity/server/better-auth/closeRoleEndpoints.ts` instead of `@shivaedev/identity/server/better-auth/adapters/closeRoleEndpoints.ts`, which moved out of `adapters/`.
|
|
18
|
+
- import from `@shivaedev/identity/server/better-auth/columnDrift.ts` instead of `@shivaedev/identity/server/better-auth/adapters/columnDrift.ts`, which moved out of `adapters/`.
|
|
19
|
+
- import from `@shivaedev/identity/server/better-auth/defineSeed.ts` instead of `@shivaedev/identity/server/better-auth/adapters/defineSeed.ts`, which moved out of `adapters/`.
|
|
20
|
+
- import from `@shivaedev/identity/server/better-auth/migrate.ts` instead of `@shivaedev/identity/server/better-auth/adapters/migrate.ts`, which moved out of `adapters/`.
|
|
21
|
+
- import from `@shivaedev/identity/server/better-auth/migrations/generate.ts` instead of `@shivaedev/identity/server/better-auth/adapters/migrations/generate.ts`, which moved out of `adapters/`.
|
|
22
|
+
- import from `@shivaedev/identity/server/better-auth/mount.ts` instead of `@shivaedev/identity/server/better-auth/adapters/mount.ts`, which moved out of `adapters/`.
|
|
23
|
+
- import from `@shivaedev/identity/server/better-auth/mountSettings.ts` instead of `@shivaedev/identity/server/better-auth/adapters/mountSettings.ts`, which moved out of `adapters/`.
|
|
24
|
+
- import from `@shivaedev/identity/server/better-auth/preferencesClient.ts` instead of `@shivaedev/identity/server/better-auth/adapters/preferencesClient.ts`, which moved out of `adapters/`.
|
|
25
|
+
- import from `@shivaedev/identity/server/better-auth/routeHandler.ts` instead of `@shivaedev/identity/server/better-auth/adapters/routeHandler.ts`, which moved out of `adapters/`.
|
|
26
|
+
- import from `@shivaedev/identity/server/better-auth/storedRoleOptions.ts` instead of `@shivaedev/identity/server/better-auth/adapters/storedRoleOptions.ts`, which moved out of `adapters/`.
|
|
27
|
+
- import from `@shivaedev/identity/server/better-auth/tables.ts` instead of `@shivaedev/identity/server/better-auth/adapters/tables.ts`, which moved out of `adapters/`.
|
|
28
|
+
- import from `@shivaedev/identity/server/better-auth/userDataExport.ts` instead of `@shivaedev/identity/server/better-auth/adapters/userDataExport.ts`, which moved out of `adapters/`.
|
|
29
|
+
- import from `@shivaedev/identity/server/better-auth/userDirectory.ts` instead of `@shivaedev/identity/server/better-auth/adapters/userDirectory.ts`, which moved out of `adapters/`.
|
|
30
|
+
|
|
31
|
+
## 0.36.0 - 2026-11-20
|
|
32
|
+
|
|
33
|
+
### Added
|
|
34
|
+
|
|
35
|
+
- `forgetSession` also wipes the stored query results when its Layer supplies contract's `QueryStorageProvider`, so a signed-out answer, another user, a passed expiry and `session.signOut` clear them with the memory.
|
|
36
|
+
|
|
37
|
+
### Changed
|
|
38
|
+
|
|
39
|
+
- every `Unauthorized` it raises says "Sign in to continue", as access's `unauthorized()` does, instead of "Authentication required". A request from an origin the session policy refuses says "Open this application from its own address to continue." and the server logs a warning that names the refused origin and the RPC. A user without a stored role is told "Your account has no role yet. Ask an administrator to assign one.", a missing user "This user no longer exists." and a missing session "This session has already ended."
|
|
40
|
+
|
|
41
|
+
### Fixed
|
|
42
|
+
|
|
43
|
+
- Sign-ups, profile changes, sign-ins and sign-outs made through a Better Auth mount now announce identity's `userKeys` and `sessionKeys`, so open users and sessions lists refresh without a reload. A mount created inside `transact` announces on that transaction's commit and a rollback announces nothing; a startup mount announces right after Better Auth's own commit. Applications need no hooks of their own, and their own Better Auth hooks keep running.
|
|
44
|
+
- `sweepExpiredSessions` announces `sessionKeys.list` when it removes expired sessions.
|
|
45
|
+
|
|
46
|
+
### Breaking
|
|
47
|
+
|
|
48
|
+
- code that compared the message of identity's `Unauthorized`, `Forbidden` or `NotFound` with the old text branches on the tag instead.
|
|
49
|
+
|
|
3
50
|
## 0.35.0 - 2026-11-20
|
|
4
51
|
|
|
5
52
|
### Added
|
package/README.md
CHANGED
|
@@ -129,13 +129,13 @@ Each stream asks the rule again at every recheck, with its own subject. A delega
|
|
|
129
129
|
|
|
130
130
|
`AccountPreferences` exposes authenticated `get`, `set` and `capture` operations for the caller's timezone, locale and units (`metric` or `imperial`). `set` replaces all three values. `capture` only creates a missing record, preserving saved preferences on subsequent sign-ins. An account without a record reads `UTC`, `en` and `metric`. The module uses `selfSubject`, so a caller cannot select another account with a subject header. `AccountPreferenceValues`, `AccountTimezone` and the `accountPreferenceKeys` collection come from `@shivaedev/identity/accountPreferenceValues.ts`.
|
|
131
131
|
|
|
132
|
-
`AccountPreferences` from `@shivaedev/identity/AccountPreferences.ts` is a defined module, which is server code: register it as `module: AccountPreferences` in an `AppModule` with `accountPreferencesStore` from `@shivaedev/identity/server/account-preferences/store.ts` as its services, and apply `accountPreferencesMigration` from `@shivaedev/identity/server/
|
|
132
|
+
`AccountPreferences` from `@shivaedev/identity/AccountPreferences.ts` is a defined module, which is server code: register it as `module: AccountPreferences` in an `AppModule` with `accountPreferencesStore` from `@shivaedev/identity/server/account-preferences/store.ts` as its services, and apply `accountPreferencesMigration` from `@shivaedev/identity/server/accountPreferencesMigration.ts` as one of its numbered migrations. The store needs only the application's `SqlClient`. The host supplies subject middleware as for other subject contracts, and each operation reads the authorized account from `Subject`. Browser code imports the client contract under the same name from `@shivaedev/identity/generated/AccountPreferences.ts`, which holds no server code:
|
|
133
133
|
|
|
134
134
|
```ts
|
|
135
135
|
import { Migrator } from "effect/sql";
|
|
136
136
|
import { AccountPreferences } from "@shivaedev/identity/AccountPreferences.ts";
|
|
137
137
|
import { accountPreferencesStore } from "@shivaedev/identity/server/account-preferences/store.ts";
|
|
138
|
-
import { accountPreferencesMigration } from "@shivaedev/identity/server/
|
|
138
|
+
import { accountPreferencesMigration } from "@shivaedev/identity/server/accountPreferencesMigration.ts";
|
|
139
139
|
import type { AppModule } from "@shivaedev/server/AppModule.ts";
|
|
140
140
|
|
|
141
141
|
export const preferencesModule = {
|
|
@@ -149,7 +149,7 @@ To capture browser defaults, enable `{ accountPreferences: true }` in `betterAut
|
|
|
149
149
|
|
|
150
150
|
```ts
|
|
151
151
|
import { createAuthClient } from "better-auth/client";
|
|
152
|
-
import { preferencesClient } from "@shivaedev/identity/server/better-auth/
|
|
152
|
+
import { preferencesClient } from "@shivaedev/identity/server/better-auth/preferencesClient.ts";
|
|
153
153
|
|
|
154
154
|
export const auth = createAuthClient({ plugins: [preferencesClient()] });
|
|
155
155
|
```
|
|
@@ -179,13 +179,14 @@ Pass `requestServices` beside `services` and `handlers` to `appHost`, or put it
|
|
|
179
179
|
|
|
180
180
|
Declare authentication middleware for actor-only boundaries. When a request acts on an account's data, declare its subject on the contract instead of accepting an owner id and checking it in each handler.
|
|
181
181
|
|
|
182
|
-
Provide one `SessionPolicy` Layer as the host's `sessions` input. Middleware, permission routes and session resolution read that service from the Effect environment. For a Better Auth provider, adapt its existing session lookup
|
|
182
|
+
Provide one `SessionPolicy` Layer as the host's `sessions` input. Middleware, permission routes and session resolution read that service from the Effect environment. For a Better Auth provider, adapt its existing session lookup. The lookup returns Better Auth's Promise, so the module lives in `adapters/`:
|
|
183
183
|
|
|
184
184
|
```ts
|
|
185
|
+
// src/server/adapters/sessions.ts
|
|
185
186
|
import { Layer } from "effect";
|
|
186
187
|
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
187
188
|
import { betterAuthSessions } from "@shivaedev/identity/server/adapters/betterAuthSessions.ts";
|
|
188
|
-
import { trustedOrigins } from "@shivaedev/identity/server/
|
|
189
|
+
import { trustedOrigins } from "@shivaedev/identity/server/trustedOrigins.ts";
|
|
189
190
|
import { auth } from "./auth.ts";
|
|
190
191
|
|
|
191
192
|
export const sessions = Layer.succeed(SessionPolicy, {
|
|
@@ -194,7 +195,7 @@ export const sessions = Layer.succeed(SessionPolicy, {
|
|
|
194
195
|
});
|
|
195
196
|
```
|
|
196
197
|
|
|
197
|
-
`trustedOrigins({ allow, missing })` accepts an exact allowlist and supports `missing: "reject"` or `"allow"`; a custom `OriginPolicy` can decide from the RPC name or transport headers. A denied policy fails with `Forbidden` before provider lookup. On `appHost`, that same `allow` list admits sibling browser origins through the HTTP RPC guard and credentialed CORS on RPC and mounted auth routes. Responses reflect the exact Origin with `Access-Control-Allow-Credentials: true`; undeclared origins get no credentialed CORS. Wildcards and patterns are not expanded. A custom policy without a `trustedOrigins` list does not enable credentialed CORS.
|
|
198
|
+
`trustedOrigins({ allow, missing })` accepts an exact allowlist and supports `missing: "reject"` or `"allow"`; a custom `OriginPolicy` can decide from the RPC name or transport headers. A denied policy fails with `Forbidden` before provider lookup and logs a warning that names the refused origin and the RPC, so an origin missing from the allowlist shows in the server's logs. On `appHost`, that same `allow` list admits sibling browser origins through the HTTP RPC guard and credentialed CORS on RPC and mounted auth routes. Responses reflect the exact Origin with `Access-Control-Allow-Credentials: true`; undeclared origins get no credentialed CORS. Wildcards and patterns are not expanded. A custom policy without a `trustedOrigins` list does not enable credentialed CORS.
|
|
198
199
|
|
|
199
200
|
To also accept the transport guard's same-origin requests, pass `sameOrigin: { trustedProxy }`, with the same proxy IP addresses or CIDR ranges as the host. This admits direct loopback HTTP and the forwarded HTTP or HTTPS authority only from a matching transport peer. Session resolution supplies that peer from the HTTP request, including the WebSocket upgrade; RPC message headers cannot supply it. Missing Origins still follow `missing`. Leave `sameOrigin` absent when an explicit public-origin allowlist should be the only authority.
|
|
200
201
|
|
|
@@ -217,7 +218,7 @@ The application's `auth` owns its storage and session configuration. A null look
|
|
|
217
218
|
|
|
218
219
|
### Local owners and machine callers
|
|
219
220
|
|
|
220
|
-
`localOwner` supplies a single configured person for a loopback application. Apply `machineTokenMigration` from `@shivaedev/identity/server/
|
|
221
|
+
`localOwner` supplies a single configured person for a loopback application. Apply `machineTokenMigration` from `@shivaedev/identity/server/machineTokenMigration.ts` through the application's numbered PostgreSQL migrations, then create the provider with the application's `SqlClient` and Effect's `SecureRandom` and `Digest` services from `effect/crypto`:
|
|
221
222
|
|
|
222
223
|
```ts
|
|
223
224
|
import { Layer, Redacted } from "effect";
|
|
@@ -252,7 +253,7 @@ Call `local.machines.revoke(machine.id)` from authorized application code. Every
|
|
|
252
253
|
```ts
|
|
253
254
|
import { Effect } from "effect";
|
|
254
255
|
import { betterAuthDatabase } from "@shivaedev/identity/server/better-auth/adapters/database.ts";
|
|
255
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
256
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
256
257
|
import { memoryStore } from "@shivaedev/rate-limit/memoryStore.ts";
|
|
257
258
|
|
|
258
259
|
const authentication = Effect.gen(function* () {
|
|
@@ -271,16 +272,35 @@ const authentication = Effect.gen(function* () {
|
|
|
271
272
|
|
|
272
273
|
The adapter captures the SQL transaction at creation. An adapter created at startup does not join a later `transact` around an `auth.api` call: its auth writes commit independently and survive the application's rollback. For a shared boundary, create the adapter inside `transact`, and use it only within that transaction. Create the mount there too when its Effect hooks must share the application transaction:
|
|
273
274
|
|
|
275
|
+
`auth.api` answers with Promises, so the call goes through a module in `adapters/` that returns an Effect:
|
|
276
|
+
|
|
277
|
+
```ts
|
|
278
|
+
// src/server/adapters/signUpEmail.ts
|
|
279
|
+
import { Effect } from "effect";
|
|
280
|
+
|
|
281
|
+
interface EmailAccount {
|
|
282
|
+
readonly email: string;
|
|
283
|
+
readonly name: string;
|
|
284
|
+
readonly password: string;
|
|
285
|
+
}
|
|
286
|
+
|
|
287
|
+
export const signUpEmail = <TCreated>(
|
|
288
|
+
auth: { readonly api: { readonly signUpEmail: (request: { readonly body: EmailAccount }) => Promise<TCreated> } },
|
|
289
|
+
body: EmailAccount,
|
|
290
|
+
) => Effect.tryPromise(() => auth.api.signUpEmail({ body }));
|
|
291
|
+
```
|
|
292
|
+
|
|
274
293
|
```ts
|
|
275
294
|
import { SqlClient } from "effect/sql";
|
|
276
295
|
import { transact } from "@shivaedev/sql/transact.ts";
|
|
296
|
+
import { signUpEmail } from "#server/adapters/signUpEmail.ts";
|
|
277
297
|
|
|
278
298
|
const register = (body: { email: string; name: string; password: string }) =>
|
|
279
299
|
Effect.gen(function* () {
|
|
280
300
|
const sql = yield* SqlClient.SqlClient;
|
|
281
301
|
const database = yield* betterAuthDatabase();
|
|
282
302
|
const { auth } = yield* betterAuthMount({ database, emailAndPassword: { enabled: true } });
|
|
283
|
-
const created = yield*
|
|
303
|
+
const created = yield* signUpEmail(auth, body);
|
|
284
304
|
yield* sql`insert into registrations (email) values (${created.user.email})`;
|
|
285
305
|
return created.user;
|
|
286
306
|
}).pipe(transact(), Effect.scoped);
|
|
@@ -294,12 +314,12 @@ Run this Effect in the host's scope; the application SQL Layer manages its conne
|
|
|
294
314
|
|
|
295
315
|
The mount reads `BETTER_AUTH_SECRET` unless options supply `secret`. `PUBLIC_URL` supplies the default base URL, trusted origin and HTTPS secure-cookie setting. With it unset, `baseURL.allowedHosts` defaults to `["127.0.0.1:*", "localhost:*"]` over HTTP and `trustedOrigins` defaults to `["http://127.0.0.1:*", "http://localhost:*"]`, accepting both loopback names on any port through a development proxy. Explicit `baseURL` (including `baseURL.allowedHosts`) and `trustedOrigins` options each replace their corresponding default; their lists are not merged. RPC Origin policy remains an application choice.
|
|
296
316
|
|
|
297
|
-
`AUTH_RATE_LIMIT_ENABLED` is a Config boolean that defaults to true and takes precedence over `options.rateLimit.enabled`. Buckets belong to the host-provided `Store` from `@shivaedev/rate-limit/Store.ts`. Better Auth chooses the rules and client-IP keys; the mount prefixes keys with `identity:auth:` and always uses that Store, overriding Better Auth's `storage` and `customStorage` options. Memory budgets are shared by mounts using the same store and reset when a new host builds a fresh memory store. PostgreSQL budgets are shared across hosts using the same database; include `postgresMigration` from `@shivaedev/rate-limit/
|
|
317
|
+
`AUTH_RATE_LIMIT_ENABLED` is a Config boolean that defaults to true and takes precedence over `options.rateLimit.enabled`. Buckets belong to the host-provided `Store` from `@shivaedev/rate-limit/Store.ts`. Better Auth chooses the rules and client-IP keys; the mount prefixes keys with `identity:auth:` and always uses that Store, overriding Better Auth's `storage` and `customStorage` options. Memory budgets are shared by mounts using the same store and reset when a new host builds a fresh memory store. PostgreSQL budgets are shared across hosts using the same database; include `postgresMigration` from `@shivaedev/rate-limit/postgresMigration.ts` in the application's numbered migrations and provide `postgresStore` from `@shivaedev/rate-limit/adapters/postgresStore.ts`. Both stores start each window at the first admitted request; refused attempts leave the window unchanged. A refusal returns HTTP 429 with the remaining time rounded up to whole seconds in `X-Retry-After`; a store failure returns HTTP 503.
|
|
298
318
|
|
|
299
|
-
The mount also requires the current account password on `/change-email`. Use `changeEmail` from `@shivaedev/identity/client/
|
|
319
|
+
The mount also requires the current account password on `/change-email`. Use `changeEmail` from `@shivaedev/identity/client/changeEmail.ts` with the application's Better Auth client. The browser-safe adapter returns an input-to-Effect function whose `ChangeEmailInput` requires `newEmail` and `password` and accepts an optional `callbackURL`. It maps refusals through `authCall` to typed auth failures, including `INVALID_PASSWORD`.
|
|
300
320
|
|
|
301
321
|
```ts
|
|
302
|
-
import { changeEmail } from "@shivaedev/identity/client/
|
|
322
|
+
import { changeEmail } from "@shivaedev/identity/client/changeEmail.ts";
|
|
303
323
|
|
|
304
324
|
const submitEmailChange = changeEmail(authClient);
|
|
305
325
|
yield* submitEmailChange({ newEmail, password: currentPassword });
|
|
@@ -329,7 +349,7 @@ Pass Effect hooks in the mount's second argument under `databaseHooks`. The shap
|
|
|
329
349
|
import type { BetterAuthOptions } from "better-auth";
|
|
330
350
|
import { Context, Effect } from "effect";
|
|
331
351
|
import type { BetterAuthHookError } from "@shivaedev/identity/server/better-auth/databaseHooks.ts";
|
|
332
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
352
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
333
353
|
|
|
334
354
|
class SessionAdmission extends Context.Service<
|
|
335
355
|
SessionAdmission,
|
|
@@ -356,6 +376,8 @@ Fail a `before` hook with `{ code: "MEMBERS_ONLY", message: "Membership is requi
|
|
|
356
376
|
|
|
357
377
|
Effect hook SQL uses the hook runtime's Effect context; it does not inherit Better Auth's internal write transaction. In a startup mount, a `before` hook's application SQL can commit even when that hook refuses the operation and Better Auth rolls back its auth rows. Use the transaction-local adapter and mount composition above when those writes must roll back together. Completing an `after` hook does not mean the outer application transaction has committed.
|
|
358
378
|
|
|
379
|
+
The mount announces identity's change keys after Better Auth writes a user or a session, so live readers of `userKeys` and `sessionKeys` refresh after a sign-up, a profile change, a sign-in or a sign-out; the application writes nothing for it. A mount created inside `transact` binds the announcement to that transaction's commit, and a rollback announces nothing. A startup mount announces in a transaction of its own after Better Auth's write commits, so a reader can briefly see the new row before its screen refreshes. The announcement needs the application's `SqlClient` and `Reactivity` in the mount's context, as `appHost`'s `application` Effect provides.
|
|
380
|
+
|
|
359
381
|
Native callbacks in the first argument run before the corresponding Effect callbacks. A native `before` returning `false` stops the Effect callback too. Data changes compose in order. Identity's sign-in policy still runs after the application's session hook.
|
|
360
382
|
|
|
361
383
|
#### Application password-reset hook
|
|
@@ -380,7 +402,7 @@ import { Effect, Redacted } from "effect";
|
|
|
380
402
|
import { role } from "@shivaedev/access/role.ts";
|
|
381
403
|
import { roleSet } from "@shivaedev/access/roleSet.ts";
|
|
382
404
|
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
383
|
-
import { defineSeed } from "@shivaedev/identity/server/better-auth/
|
|
405
|
+
import { defineSeed } from "@shivaedev/identity/server/better-auth/defineSeed.ts";
|
|
384
406
|
|
|
385
407
|
const roles = roleSet(role("member", []));
|
|
386
408
|
const seed = defineSeed({
|
|
@@ -400,7 +422,7 @@ For provisioning outside a seed, provide `betterAuthUserProvisioning(auth)` from
|
|
|
400
422
|
|
|
401
423
|
### User directory
|
|
402
424
|
|
|
403
|
-
Applications use the `UserDirectory` port from `@shivaedev/identity/server/UserDirectory.ts` instead of reading auth tables. Provide `betterAuthUserDirectory(AppAccess, authOptions)` from `@shivaedev/identity/server/better-auth/
|
|
425
|
+
Applications use the `UserDirectory` port from `@shivaedev/identity/server/UserDirectory.ts` instead of reading auth tables. Provide `betterAuthUserDirectory(AppAccess, authOptions)` from `@shivaedev/identity/server/better-auth/userDirectory.ts` with the application's SQL Layer. Setting `authOptions.user.modelName` to `"users"` directs directory reads to that table, including the admin Users view and its pagination. The adapter follows Better Auth's configured user model, name, email, creation and modification columns, and additional-field or plugin role mapping. It shares an existing Reactivity service when supplied and creates one otherwise.
|
|
404
426
|
|
|
405
427
|
```ts
|
|
406
428
|
import { UserDirectory } from "@shivaedev/identity/server/UserDirectory.ts";
|
|
@@ -441,7 +463,7 @@ import { roleSet } from "@shivaedev/access/roleSet.ts";
|
|
|
441
463
|
import { AssignRoles } from "@shivaedev/identity/roles.ts";
|
|
442
464
|
import { accountRoleSeed } from "@shivaedev/identity/server/better-auth/adapters/accountRoleSeed.ts";
|
|
443
465
|
import { ProviderAccounts } from "@shivaedev/identity/server/better-auth/allowedAccounts.ts";
|
|
444
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
466
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
445
467
|
|
|
446
468
|
const Member = role("member", []);
|
|
447
469
|
const Operator = role("operator", [AssignRoles]);
|
|
@@ -490,12 +512,12 @@ const mounted = yield* betterAuthMount(
|
|
|
490
512
|
);
|
|
491
513
|
const sessions = Layer.succeed(SessionPolicy, {
|
|
492
514
|
origin: trustedOrigins({ allow: [publicOrigin, ...nativeOrigins], missing: "allow" }),
|
|
493
|
-
|
|
515
|
+
...mounted.sessions,
|
|
494
516
|
});
|
|
495
517
|
const host = appHost({ group, handlers, routes: mounted.routes, sessions, nativeOrigins });
|
|
496
518
|
```
|
|
497
519
|
|
|
498
|
-
Always
|
|
520
|
+
Always take the provider from the mount's `sessions`, or wrap a custom lookup in `admittedSessions`, even without a sign-in policy: both apply the mount's credential selection to the same request-local identity, profile and role middleware used by cookies. A same-origin request or a request without an Origin carrying the session cookie uses only that cookie, even if invalid or revoked; its bearer header cannot switch accounts or rescue it. Otherwise the signed bearer is resolved by Better Auth. Missing, unsigned, tampered, expired and revoked bearer sessions produce `Unauthorized` at protected RPCs.
|
|
499
521
|
|
|
500
522
|
A native client signs in through `/api/auth/sign-in/email` with `credentials: "omit"` and its bundled Origin, reads the signed credential from the `set-auth-token` response header, and sends that exact value as `Authorization: Bearer <credential>` with `credentials: "omit"` on later auth and RPC requests. Persist it only in OS-backed secure storage, such as iOS Keychain or Android Keystore-backed storage; never use localStorage, sessionStorage or IndexedDB. Browser responses keep HttpOnly cookies and omit the plugin's token header and JSON token fields. Clients without a bundled Origin receive cookie responses.
|
|
501
523
|
|
|
@@ -529,8 +551,8 @@ import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
|
529
551
|
import { Effect, Layer } from "effect";
|
|
530
552
|
import { allowedAccounts } from "@shivaedev/identity/server/better-auth/allowedAccounts.ts";
|
|
531
553
|
import { betterAuthDatabase } from "@shivaedev/identity/server/better-auth/adapters/database.ts";
|
|
532
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
533
|
-
import { trustedOrigins } from "@shivaedev/identity/server/
|
|
554
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
555
|
+
import { trustedOrigins } from "@shivaedev/identity/server/trustedOrigins.ts";
|
|
534
556
|
|
|
535
557
|
const authentication = Effect.gen(function* () {
|
|
536
558
|
const database = yield* betterAuthDatabase();
|
|
@@ -541,7 +563,7 @@ const authentication = Effect.gen(function* () {
|
|
|
541
563
|
yield* mounted.revokeUnadmitted;
|
|
542
564
|
const sessions = Layer.succeed(SessionPolicy, {
|
|
543
565
|
origin: trustedOrigins({ allow: ["https://app.example"], missing: "reject" }),
|
|
544
|
-
|
|
566
|
+
...mounted.sessions,
|
|
545
567
|
});
|
|
546
568
|
return { ...mounted, sessions };
|
|
547
569
|
});
|
|
@@ -594,7 +616,7 @@ The same module exports `loopbackOnly(effect)` for local page routes, reading `H
|
|
|
594
616
|
|
|
595
617
|
`trustedProxyPeer(trustedProxy?)` compiles the guard's proxy address list into an `(address: string) => boolean` predicate. Use it with the transport's remote address when another route needs the same proxy trust decision. It supports the same IP addresses, CIDR ranges and IPv4-mapped IPv6 peers as `appHost`; absent or malformed configuration matches no peer. It does not read forwarded headers.
|
|
596
618
|
|
|
597
|
-
`trustedProxyRanges(trustedProxy?)` from `@shivaedev/identity/server/
|
|
619
|
+
`trustedProxyRanges(trustedProxy?)` from `@shivaedev/identity/server/trustedProxyRanges.ts` returns the equivalent IP addresses and CIDR ranges used by that matcher. Mapped IPv6 addresses and CIDRs become IPv4 entries: `::ffff:127.0.0.0/104` becomes `127.0.0.0/8`, including hexadecimal mapped forms. Broader IPv6 ranges retain both native IPv6 and mapped IPv4 coverage. Missing or malformed configuration returns an empty list. Pass these ranges to a forwarded-header integration after checking the transport with `trustedProxyPeer`.
|
|
598
620
|
|
|
599
621
|
Declare expected refusals with the shared tagged error schemas from [`@shivaedev/errors`](https://github.com/ShivaeDev/platform/tree/main/packages/errors#readme). They work with native RPC without authentication middleware.
|
|
600
622
|
|
|
@@ -636,6 +658,7 @@ import { AuthenticatedUserWithProviderAccounts } from "@shivaedev/identity/middl
|
|
|
636
658
|
import { AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
637
659
|
import { authenticatedUserWithProviderAccountsLayer } from "@shivaedev/identity/server/session.ts";
|
|
638
660
|
|
|
661
|
+
// src/server/adapters/sessions.ts: the lookups return Better Auth's Promises.
|
|
639
662
|
const sessions = Layer.succeed(SessionPolicy, {
|
|
640
663
|
origin: trustedOrigins({ allow: ["https://app.example"], missing: "reject" }),
|
|
641
664
|
...mounted.sessions,
|
|
@@ -680,7 +703,7 @@ import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
|
680
703
|
import { permission } from "@shivaedev/access/permission.ts";
|
|
681
704
|
import { role } from "@shivaedev/access/role.ts";
|
|
682
705
|
import { roleSet } from "@shivaedev/access/roleSet.ts";
|
|
683
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
706
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
684
707
|
|
|
685
708
|
const UseTools = permission("tools.use");
|
|
686
709
|
const Access = roleSet(role("member", []), role("operator", [UseTools]));
|
|
@@ -753,7 +776,7 @@ const signOut = Atom.fn<void>()(() =>
|
|
|
753
776
|
|
|
754
777
|
After each verified answer the session memory keeps the user id, the session id, the permissions and the session's `expiresAt`, never a credential: the cookie stays the browser's. At launch the session atom answers at once with that remembered session, marked as refreshing, so `SessionBoundary` renders, connects and opens the live socket while `get-session` is on the wire. With `remember`, the atom's value is `RememberedSession | null` from `@shivaedev/identity/client/SessionMemory.ts` for remembered and fresh answers alike, so a screen cannot read a field the launch does not have. The reader must return the provider's `session.id` and `session.expiresAt`; Better Auth's `getSession` does.
|
|
755
778
|
|
|
756
|
-
When the check answers, the same user keeps the session generation and gets the fresh permissions; another user replaces the memory and starts a new generation; a signed-out answer wipes the memory before the atom answers `null`, so the signed-out screen never renders with a session still remembered. A check that fails, for example without a network, keeps the remembered session rendering instead of failing the launch. Past the remembered `expiresAt` the memory is wiped and ignored, and the launch waits for the check. Wrap the sign-out request in `session.signOut`: when the request succeeds the memory is wiped at once, so a relaunch starts without a remembered session even when the session check after the sign-out never answers. `forgetSession` in the same module is the one wipe behind sign-out, another user, a signed-out answer and a passed expiry.
|
|
779
|
+
When the check answers, the same user keeps the session generation and gets the fresh permissions; another user replaces the memory and starts a new generation; a signed-out answer wipes the memory before the atom answers `null`, so the signed-out screen never renders with a session still remembered. A check that fails, for example without a network, keeps the remembered session rendering instead of failing the launch. Past the remembered `expiresAt` the memory is wiped and ignored, and the launch waits for the check. Wrap the sign-out request in `session.signOut`: when the request succeeds the memory is wiped at once, so a relaunch starts without a remembered session even when the session check after the sign-out never answers. `forgetSession` in the same module is the one wipe behind sign-out, another user, a signed-out answer and a passed expiry. When the `remember` Layer also supplies contract's `QueryStorageProvider`, such as `Layer.merge(browserSessionMemory, browserQueryStorage)`, `forgetSession` wipes the device's stored query results too; React's [stored results](https://github.com/ShivaeDev/platform/tree/main/packages/react#keep-query-results-across-a-reload) describe the rest.
|
|
757
780
|
|
|
758
781
|
What this means for the people using the app: until the check answers, the shell renders with the remembered user and permissions. After someone signs out elsewhere or their session is revoked, a device still shows its shell at its next launch for one round trip, and while it stays offline until the session's expiry; the host still refuses every call from the ended session, so only what the device already holds can show. A user id and their grants rest in the browser's local storage. When the refreshed session changes the grants, React's `PermissionBoundary` reruns the router's guards, so a screen that needs a removed grant is replaced by the refusal without a navigation.
|
|
759
782
|
|
|
@@ -765,9 +788,9 @@ An application moving from Prisma can keep Prisma in charge of its auth tables w
|
|
|
765
788
|
|
|
766
789
|
```ts
|
|
767
790
|
import { Effect } from "effect";
|
|
768
|
-
import { assertBetterAuthSchema } from "@shivaedev/identity/server/better-auth/
|
|
791
|
+
import { assertBetterAuthSchema } from "@shivaedev/identity/server/better-auth/assertSchema.ts";
|
|
769
792
|
import { betterAuthDatabase } from "@shivaedev/identity/server/better-auth/adapters/database.ts";
|
|
770
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
793
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
771
794
|
|
|
772
795
|
const authOptions = {
|
|
773
796
|
account: { modelName: "Account" },
|
|
@@ -796,7 +819,7 @@ Start with a disposable PostgreSQL database containing only your previously ship
|
|
|
796
819
|
|
|
797
820
|
```ts
|
|
798
821
|
import { FileSystem } from "effect";
|
|
799
|
-
import { generateBetterAuthMigration } from "@shivaedev/identity/server/better-auth/
|
|
822
|
+
import { generateBetterAuthMigration } from "@shivaedev/identity/server/better-auth/migrations/generate.ts";
|
|
800
823
|
|
|
801
824
|
const fs = yield* FileSystem.FileSystem;
|
|
802
825
|
const source = yield* generateBetterAuthMigration({ emailAndPassword: { enabled: true } });
|
|
@@ -822,7 +845,7 @@ If an application-authored numbered migration calls `auth.api`, create its adapt
|
|
|
822
845
|
After applying all numbered migrations in an isolated story database, check them against the current options:
|
|
823
846
|
|
|
824
847
|
```ts
|
|
825
|
-
import { assertBetterAuthSchema } from "@shivaedev/identity/server/better-auth/
|
|
848
|
+
import { assertBetterAuthSchema } from "@shivaedev/identity/server/better-auth/assertSchema.ts";
|
|
826
849
|
|
|
827
850
|
yield* assertBetterAuthSchema(authOptions, { defaultRole: "member" });
|
|
828
851
|
```
|
|
@@ -841,7 +864,7 @@ Identity declares `user.additionalFields.role` when the mount has `roles` and `d
|
|
|
841
864
|
|
|
842
865
|
```ts
|
|
843
866
|
import { assignRole } from "@shivaedev/identity/server/better-auth/assignRole.ts";
|
|
844
|
-
import { generateBetterAuthMigration } from "@shivaedev/identity/server/better-auth/
|
|
867
|
+
import { generateBetterAuthMigration } from "@shivaedev/identity/server/better-auth/migrations/generate.ts";
|
|
845
868
|
|
|
846
869
|
const migrationSource = yield* generateBetterAuthMigration(authOptions, { defaultRole: "member" });
|
|
847
870
|
|
|
@@ -939,6 +962,7 @@ The application host installs `CommandGuard` from `@shivaedev/contract/CommandGu
|
|
|
939
962
|
Set `streamRevalidationInterval` in the `SessionPolicy` Layer to an Effect `Duration.Input` to change the interval for middleware using that policy:
|
|
940
963
|
|
|
941
964
|
```ts
|
|
965
|
+
// src/server/adapters/sessions.ts
|
|
942
966
|
import { Layer } from "effect";
|
|
943
967
|
import { SessionPolicy } from "@shivaedev/identity/server/SessionPolicy.ts";
|
|
944
968
|
const sessions = Layer.succeed(SessionPolicy, {
|
|
@@ -989,7 +1013,7 @@ Each domain supplies a `UserDataExport` from `server/userDataExport.ts`: the sch
|
|
|
989
1013
|
import { Effect } from "effect";
|
|
990
1014
|
import { SqlClient } from "effect/sql";
|
|
991
1015
|
import { accountExport } from "@shivaedev/identity/server/accountExport.ts";
|
|
992
|
-
import { betterAuthUserDataExport } from "@shivaedev/identity/server/better-auth/
|
|
1016
|
+
import { betterAuthUserDataExport } from "@shivaedev/identity/server/better-auth/userDataExport.ts";
|
|
993
1017
|
|
|
994
1018
|
const notesExport = {
|
|
995
1019
|
tables: [{ schema: "public", table: "notes" }],
|
|
@@ -1020,7 +1044,7 @@ Use `authTestDatabase` from `@shivaedev/identity/server/better-auth/testDatabase
|
|
|
1020
1044
|
`authTestDatabase` also exposes `sessionsFor(userId)`, returning that user’s stored sessions as `{ id, expiresAt, expired }`. `expiresAt` is a native Effect UTC value; `expired` compares it with Effect’s current clock. Expired sessions remain visible until removed. Revocation deletes a session, so its id disappears from this readout; it keeps no revocation history. For expiry stories, advance `TestClock` to the minted session’s expiry instead of rewriting storage timestamps. Identity’s Better Auth session provider, session administration list and expired-session sweep use Effect’s clock. Sessions minted by `signedInUser` take their expiry from Effect’s Clock and Better Auth’s configured session lifetime. Better Auth’s own auth endpoints, direct `testUtils` calls and session refresh still use the provider’s clock.
|
|
1021
1045
|
|
|
1022
1046
|
```ts
|
|
1023
|
-
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/
|
|
1047
|
+
import { betterAuthMount } from "@shivaedev/identity/server/better-auth/mount.ts";
|
|
1024
1048
|
import { signedInUser } from "@shivaedev/test-kits/identity/adapters/betterAuth.ts";
|
|
1025
1049
|
|
|
1026
1050
|
const mounted = yield* betterAuthMount(options, {
|
|
@@ -1104,11 +1128,11 @@ const mounted = yield* betterAuthMount(options, {
|
|
|
1104
1128
|
|
|
1105
1129
|
The wiring replaces the four delivery callbacks and preserves the other Better Auth settings. Enable the flows through native options: `emailAndPassword.enabled`, `emailVerification.sendOnSignUp` or `emailAndPassword.requireEmailVerification`, and `user.changeEmail.enabled`. Better Auth calls `onExistingUserSignUp` only with its generic duplicate-signup response enabled, such as with `requireEmailVerification`.
|
|
1106
1130
|
|
|
1107
|
-
Auth emails reserve one delivery attempt per account id and message kind for one minute by default in PostgreSQL. Provide the application's PostgreSQL Layer (`SqlClient` and `Reactivity`) to the mount. Include `postgresMigration` from `@shivaedev/rate-limit/
|
|
1131
|
+
Auth emails reserve one delivery attempt per account id and message kind for one minute by default in PostgreSQL. Provide the application's PostgreSQL Layer (`SqlClient` and `Reactivity`) to the mount. Include `postgresMigration` from `@shivaedev/rate-limit/postgresMigration.ts` in the application's numbered migration loader before enabling `emails`. `window` accepts an Effect Duration input and remains the default for every kind. The optional `windows` map overrides that duration by `AuthEmail["_tag"]`; omitted kinds still use `window`, or one minute when it is absent. Different accounts and different kinds have separate windows; changing the destination address does not change the account key. Concurrent requests share the reservation, and another delivery is allowed at expiry. Suppressed requests return normally. A failed delivery keeps its reservation until expiry. The window uses database time and survives mount rebuilds and process restarts. Mounts sharing a database share the reservation, regardless of the `Store` supplied for request rate limits. It complements Better Auth's request rate limits. Delivery Effects use the same `BetterAuthHookError` and request runtime as database hooks.
|
|
1108
1132
|
|
|
1109
1133
|
### Sweep expired sessions in a worker
|
|
1110
1134
|
|
|
1111
|
-
Better Auth removes an expired session when it is presented. Use `sweepExpiredSessions` from `@shivaedev/identity/server/better-auth/sweepExpiredSessions.ts` to remove expired rows that are never presented again. The Effect reads the application's `SqlClient`, deletes sessions whose `expiresAt` is at or before Effect's current time, and returns the number removed. It preserves live sessions and needs no Better Auth mount or auth pool. It assumes the default Better Auth PostgreSQL table and column mappings.
|
|
1135
|
+
Better Auth removes an expired session when it is presented. Use `sweepExpiredSessions` from `@shivaedev/identity/server/better-auth/sweepExpiredSessions.ts` to remove expired rows that are never presented again. The Effect reads the application's `SqlClient`, deletes sessions whose `expiresAt` is at or before Effect's current time, and returns the number removed. It announces `sessionKeys.list` when it removes a session. It preserves live sessions and needs no Better Auth mount or auth pool. It assumes the default Better Auth PostgreSQL table and column mappings.
|
|
1112
1136
|
|
|
1113
1137
|
Register the Effect with a worker schedule, as the starter does at midnight UTC. SQL and result-decoding failures stay in the Effect's error channel.
|
|
1114
1138
|
|
|
@@ -1126,14 +1150,14 @@ Import the module that defines the name; there is no package-root entry. Paths b
|
|
|
1126
1150
|
| `server/adapters/permissionRoute.ts` | `permissionRoute`: HTTP route guards. |
|
|
1127
1151
|
| `server/session.ts` | `authenticatedLayer`, `maybeAuthenticatedLayer`, `authenticatedUserLayer`, `authenticatedUserWithProviderAccountsLayer`, `withSessionUser`, `resolveSession`: session middleware implementations and the identity boundary. |
|
|
1128
1152
|
| `server/adapters/betterAuthSessions.ts` | `betterAuthSessions(getSession, getProviderAccounts?)`: a session provider from Better Auth lookups. |
|
|
1129
|
-
| `server/
|
|
1153
|
+
| `server/trustedOrigins.ts` | `trustedOrigins({ allow, missing })`: an exact Origin allowlist. |
|
|
1130
1154
|
| `server/adapters/local.ts` | `localRpcGuard`, `loopbackOnly`, `sameOrigin`, `trustedProxyPeer`: loopback and proxy guards. |
|
|
1131
|
-
| `server/
|
|
1155
|
+
| `server/trustedProxyRanges.ts` | `trustedProxyRanges(trustedProxy?)`: normalized proxy ranges. |
|
|
1132
1156
|
| `server/adapters/proxyRanges.ts` | `proxyRanges(value)`: parse configured proxy ranges. |
|
|
1133
1157
|
| `server/transportHeaders.ts` | `transportHeaders(rpcHeaders)`: the headers used for a transport-level decision. |
|
|
1134
1158
|
| `server/tracing.ts` | `requestTracingLayer({ header?, sensitive? })`: the `RequestTracing` implementation. |
|
|
1135
1159
|
| `server/resolveChanges.ts` | `resolveChanges`: authorized change subscriptions for custom change handlers. |
|
|
1136
|
-
| `server/better-auth/
|
|
1160
|
+
| `server/better-auth/mount.ts` | `betterAuthMount(options, { preset?, enabledPaths?, emails?, onPasswordReset?, signIn?, bearerSessions?, roles?, defaultRole?, roleSeed? })`, returning `{ auth, profiles, routes, sessions, admittedSessions, admitsUser, revokeUnadmitted }`: native auth routes and the sign-in policy. |
|
|
1137
1161
|
| `server/better-auth/adapters/database.ts` | `betterAuthDatabase()`: Better Auth storage on the application PostgreSQL client. |
|
|
1138
1162
|
| `server/better-auth/emails.ts` | `AuthEmail`, `BetterAuthEmails`: typed delivery messages, app routes and per-account delivery windows for the mount. |
|
|
1139
1163
|
| `server/better-auth/allowedAccounts.ts` | `ProviderAccounts`, `AllowedAccounts`, `allowedAccounts`: provider-account list Schemas and the non-empty `AUTH_ALLOWED_ACCOUNTS` Config. |
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionMemory.d.ts","sourceRoot":"","sources":["../../src/client/SessionMemory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;;;;
|
|
1
|
+
{"version":3,"file":"SessionMemory.d.ts","sourceRoot":"","sources":["../../src/client/SessionMemory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,OAAO,EAAQ,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;;;;AAI7D,qBAAa,wBAAyB,SAAQ,8BAA6C;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC;CAAG;;oBAKxG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,wBAAwB,CAAC;mBAC9C,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,IAAI,EAAE,wBAAwB,CAAC;oBACrD,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,wBAAwB,CAAC;;AALlF,qBAAa,aAAc,SAAQ,kBAOK;CAAG;AAE3C,MAAM,WAAW,eAAe;IAC/B,QAAQ,CAAC,OAAO,EAAE;QAAE,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;QAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;IACpE,QAAQ,CAAC,IAAI,EAAE;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,CAAA;KAAE,CAAC;CACjG;AAED,eAAO,MAAM,iBAAiB;;;;;;;;;;;;EAG5B,CAAC;AACH,MAAM,MAAM,iBAAiB,GAAG,OAAO,iBAAiB,CAAC,IAAI,CAAC;AAO9D,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,aAAa,CAOlE,CAAC;AAQH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,EAAE,KAAK,EAAE,aAAa,CAQ9F,CAAC;AAEH,eAAO,MAAM,eAAe;;;;;;;;;;;;+BAiB1B,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Clock, Context, Data, Effect, Option, Schema } from "effect";
|
|
2
2
|
import { Permission } from "@shivaedev/access/permission.ts";
|
|
3
|
+
import { clearStoredQueries } from "@shivaedev/contract/adapters/storedQueryAccess.ts";
|
|
4
|
+
import { QueryStorageProvider } from "@shivaedev/contract/QueryStorage.ts";
|
|
3
5
|
export class SessionMemoryUnavailable extends Data.TaggedError("SessionMemoryUnavailable") {
|
|
4
6
|
}
|
|
5
7
|
export class SessionMemory extends Context.Service()("@shivaedev/identity/SessionMemory") {
|
|
@@ -11,9 +13,14 @@ export const RememberedSession = Schema.Struct({
|
|
|
11
13
|
const Stored = Schema.fromJsonString(RememberedSession);
|
|
12
14
|
const decodeStored = Schema.decodeEffect(Stored);
|
|
13
15
|
const encodeStored = Schema.encodeEffect(Stored);
|
|
16
|
+
// A Layer that also supplies query storage gets the device's stored query results wiped with the memory, by every path that forgets.
|
|
14
17
|
export const forgetSession = Effect.gen(function* () {
|
|
15
18
|
const memory = yield* SessionMemory;
|
|
16
19
|
yield* Effect.ignore(memory.clear);
|
|
20
|
+
const queries = yield* Effect.serviceOption(QueryStorageProvider);
|
|
21
|
+
if (Option.isSome(queries)) {
|
|
22
|
+
yield* clearStoredQueries().pipe(Effect.provideService(QueryStorageProvider, queries.value));
|
|
23
|
+
}
|
|
17
24
|
});
|
|
18
25
|
const stored = Effect.gen(function* () {
|
|
19
26
|
const memory = yield* SessionMemory;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SessionMemory.js","sourceRoot":"","sources":["../../src/client/SessionMemory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"SessionMemory.js","sourceRoot":"","sources":["../../src/client/SessionMemory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AACvF,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;AAE3E,MAAM,OAAO,wBAAyB,SAAQ,IAAI,CAAC,WAAW,CAAC,0BAA0B,CAA8B;CAAG;AAE1H,MAAM,OAAO,aAAc,SAAQ,OAAO,CAAC,OAAO,EAO/C,CAAC,mCAAmC,CAAC;CAAG;AAO3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,cAAc,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;IAC/E,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;CACrG,CAAC,CAAC;AAGH,MAAM,MAAM,GAAG,MAAM,CAAC,cAAc,CAAC,iBAAiB,CAAC,CAAC;AACxD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AACjD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAEjD,qIAAqI;AACrI,MAAM,CAAC,MAAM,aAAa,GAA8C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC3F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IAClE,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,oBAAoB,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9F,CAAC;AACF,CAAC,CAAC,CAAC;AAEH,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IACnE,OAAO,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC;AACtG,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAA0E,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACvH,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IACjC,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;IAC3C,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,GAAG,GAAG,CAAC,CAAC;IAC9F,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,KAAK,CAAC,CAAC,aAAa,CAAC;IACtB,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAA8B;IACzF,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACrB,KAAK,CAAC,CAAC,aAAa,CAAC;QACrB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC;IACpC,MAAM,UAAU,GAAsB;QACrC,OAAO,EAAE,EAAE,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE;QACvE,IAAI,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE;KACnF,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC/B,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3E,KAAK,CAAC,CAAC,aAAa,CAAC;IACtB,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,KAAK,CAAC,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IAClF,OAAO,UAAU,CAAC;AACnB,CAAC,CAAC,CAAC"}
|
|
@@ -8,5 +8,5 @@ export declare function changeEmail<A, E extends object>(client: {
|
|
|
8
8
|
readonly changeEmail: (input: ChangeEmailInput, options: {
|
|
9
9
|
readonly signal: AbortSignal;
|
|
10
10
|
}) => Promise<AuthActionResult<A, E>>;
|
|
11
|
-
}): (input: ChangeEmailInput) => import("effect/Effect").Effect<A, import("
|
|
11
|
+
}): (input: ChangeEmailInput) => import("effect/Effect").Effect<A, import("./AuthFailure.ts").AuthFailure | import("./AuthFailure.ts").AuthFailureWithCodes<never>, never>;
|
|
12
12
|
//# sourceMappingURL=changeEmail.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changeEmail.d.ts","sourceRoot":"","sources":["../../src/client/changeEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAY,MAAM,8BAA8B,CAAC;AAE/E,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE;IACxD,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;KAAE,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAC9H,0KAEA"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changeEmail.js","sourceRoot":"","sources":["../../src/client/changeEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAQ/E,MAAM,UAAU,WAAW,CAAsB,MAEhD;IACA,OAAO,QAAQ,CAAC,CAAC,KAAuB,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AAC7F,CAAC"}
|
|
@@ -50,7 +50,40 @@ declare const StoredPreferences_base: import("effect/schema/VariantSchema").Clas
|
|
|
50
50
|
declare class StoredPreferences extends StoredPreferences_base {
|
|
51
51
|
}
|
|
52
52
|
export declare const AccountPreferenceRows: import("effect/Context").Service<"@shivaedev/identity/AccountPreferenceRows", import("@shivaedev/sql/batchedDelete.ts").BatchedDelete<typeof StoredPreferences> & Omit<import("@shivaedev/sql/versionedRepository.ts").NativeRepository<typeof StoredPreferences, "id">, "delete" | "update" | "updateVoid"> & {
|
|
53
|
-
readonly delete: ((id: string) => import("effect/Effect").Effect<void, Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>) & ((where: import("@shivaedev/sql/
|
|
53
|
+
readonly delete: ((id: string) => import("effect/Effect").Effect<void, Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>) & ((where: import("@shivaedev/sql/deleteFilter.ts").DeleteFilter<typeof StoredPreferences>) => import("effect/Effect").Effect<void, Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>) & ((where: Partial<import("@shivaedev/sql/tupleIn.ts").TupleFilter<typeof StoredPreferences>> & {
|
|
54
|
+
readonly locale?: string | import("@shivaedev/sql/filterOperators.ts").Listed<string> | ({
|
|
55
|
+
readonly gt?: string;
|
|
56
|
+
readonly gte?: string;
|
|
57
|
+
readonly lt?: string;
|
|
58
|
+
readonly lte?: string;
|
|
59
|
+
} & import("@shivaedev/sql/filterOperators.ts").Without<"in" | "not"> & {
|
|
60
|
+
readonly like?: string;
|
|
61
|
+
}) | undefined;
|
|
62
|
+
readonly timezone?: string | import("@shivaedev/sql/filterOperators.ts").Listed<string> | ({
|
|
63
|
+
readonly gt?: string;
|
|
64
|
+
readonly gte?: string;
|
|
65
|
+
readonly lt?: string;
|
|
66
|
+
readonly lte?: string;
|
|
67
|
+
} & import("@shivaedev/sql/filterOperators.ts").Without<"in" | "not"> & {
|
|
68
|
+
readonly like?: string;
|
|
69
|
+
}) | undefined;
|
|
70
|
+
readonly units?: "imperial" | "metric" | import("@shivaedev/sql/filterOperators.ts").Listed<"imperial" | "metric"> | ({
|
|
71
|
+
readonly gt?: NonNullable<"imperial" | "metric">;
|
|
72
|
+
readonly gte?: NonNullable<"imperial" | "metric">;
|
|
73
|
+
readonly lt?: NonNullable<"imperial" | "metric">;
|
|
74
|
+
readonly lte?: NonNullable<"imperial" | "metric">;
|
|
75
|
+
} & import("@shivaedev/sql/filterOperators.ts").Without<"in" | "not"> & {
|
|
76
|
+
readonly like?: NonNullable<"imperial" | "metric">;
|
|
77
|
+
}) | undefined;
|
|
78
|
+
readonly id?: string | import("@shivaedev/sql/filterOperators.ts").Listed<string> | ({
|
|
79
|
+
readonly gt?: string;
|
|
80
|
+
readonly gte?: string;
|
|
81
|
+
readonly lt?: string;
|
|
82
|
+
readonly lte?: string;
|
|
83
|
+
} & import("@shivaedev/sql/filterOperators.ts").Without<"in" | "not"> & {
|
|
84
|
+
readonly like?: string;
|
|
85
|
+
}) | undefined;
|
|
86
|
+
} & import("@shivaedev/sql/deleteFilter.ts").DefinedEntryRequired) => import("effect/Effect").Effect<void, Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>);
|
|
54
87
|
readonly update: import("@shivaedev/sql/repositoryUpdate.ts").Update<typeof StoredPreferences, "id">;
|
|
55
88
|
readonly updateVoid: import("@shivaedev/sql/repositoryUpdate.ts").UpdateVoid<typeof StoredPreferences, "id">;
|
|
56
89
|
} & import("@shivaedev/sql/batchWrites.ts").BatchWrites<typeof StoredPreferences> & import("@shivaedev/sql/insertFromSelect.ts").SelectWrites<typeof StoredPreferences> & import("@shivaedev/sql/repositoryQueries.ts").Queries<typeof StoredPreferences> & import("@shivaedev/sql/conflictWrites.ts").ConflictWrites<typeof StoredPreferences, "id", never>> & {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Rows.d.ts","sourceRoot":"","sources":["../../../src/server/account-preferences/Rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMhC,cAAM,iBAAkB,SAAQ,sBAG9B;CAAG;AASL,eAAO,MAAM,qBAAqB
|
|
1
|
+
{"version":3,"file":"Rows.d.ts","sourceRoot":"","sources":["../../../src/server/account-preferences/Rows.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMhC,cAAM,iBAAkB,SAAQ,sBAG9B;CAAG;AASL,eAAO,MAAM,qBAAqB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAGhC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accountPreferencesMigration.d.ts","sourceRoot":"","sources":["../../src/server/accountPreferencesMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,2BAA2B,kFAQtC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"accountPreferencesMigration.js","sourceRoot":"","sources":["../../src/server/accountPreferencesMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC9D,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,KAAK,CAAC,CAAC,GAAG,CAAA;;;;;GAKR,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import type { AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
3
|
import type { ProviderAccountValue } from "#identity.ts";
|
|
4
4
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
5
5
|
export type GetSession<TSession extends SessionShape> = (headers: globalThis.Headers) => Promise<TSession | null>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"betterAuthSessions.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAA6B,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"betterAuthSessions.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,MAAM,EAA6B,MAAM,QAAQ,CAAC;AAIlE,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAIxE,MAAM,MAAM,UAAU,CAAC,QAAQ,SAAS,YAAY,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC;AAClH,MAAM,MAAM,mBAAmB,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,OAAO,KAAK,OAAO,CAAC,SAAS,oBAAoB,EAAE,CAAC,CAAC;AAC5G,MAAM,MAAM,2BAA2B,CAAC,QAAQ,SAAS,YAAY,IAAI,QAAQ,GAAG;IACnF,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,GAAG;QAAE,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,EAAE,eAAe,GAAG,YAAY,CAAC,CAAA;KAAE,CAAC;CAChJ,CAAC;AACF,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;AAC/H,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,YAAY,EAC/D,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,EAChC,mBAAmB,EAAE,mBAAmB,GACtC,eAAe,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Clock, Effect, Option, Predicate, Schema } from "effect";
|
|
2
2
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
|
-
import {
|
|
3
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
4
4
|
import { authCall } from "#server/adapters/authCall.ts";
|
|
5
5
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
6
6
|
const ExpiringSession = Schema.Struct({ session: Schema.Struct({ expiresAt: Schema.Date }) });
|
|
@@ -15,7 +15,7 @@ export function betterAuthSessions(getSession, getProviderAccounts) {
|
|
|
15
15
|
return Option.fromNullishOr(session);
|
|
16
16
|
}
|
|
17
17
|
const providerAccounts = authCall(() => getProviderAccounts(transport)).pipe(Effect.catch(({ cause }) => Predicate.hasProperty(cause, "statusCode") && cause.statusCode === HttpStatus.fromLiteral("Unauthorized")
|
|
18
|
-
? Effect.fail(
|
|
18
|
+
? Effect.fail(unauthorized())
|
|
19
19
|
: providerFailure(cause)));
|
|
20
20
|
return Option.some({ ...session, user: { ...session.user, providerAccounts } });
|
|
21
21
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"betterAuthSessions.js","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"betterAuthSessions.js","sourceRoot":"","sources":["../../../src/server/adapters/betterAuthSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAElE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAG5D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAG7D,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AAY9F,MAAM,UAAU,kBAAkB,CAAgC,UAAgC,EAAE,mBAAyC;IAC5I,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB;QACpG,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACzH,IAAI,MAAM,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;YACpH,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,KAAK,IAAI,IAAI,mBAAmB,KAAK,SAAS,EAAE,CAAC;YAC3D,OAAO,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QACtC,CAAC;QACD,MAAM,gBAAgB,GAAG,QAAQ,CAAC,GAAG,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAC3E,MAAM,CAAC,KAAK,CACX,CAAC,EAAE,KAAK,EAAE,EAAwD,EAAE,CACnE,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,KAAK,CAAC,UAAU,KAAK,UAAU,CAAC,WAAW,CAAC,cAAc,CAAC;YACxG,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YAC7B,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAC1B,CACD,CAAC;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,EAAE,iBAAiB,EAAE,CAAC;AACnC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"SeedOptions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/SeedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,WAAW,CAAC,KAAK,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACpD,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;KAAE,CAAC,EAAE,CAAC;CAC9E"}
|