@shivaedev/identity 0.18.0 → 0.20.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 +59 -0
- package/README.md +208 -91
- package/dist/PermissionSession.d.ts +11 -0
- package/dist/PermissionSession.d.ts.map +1 -0
- package/dist/PermissionSession.js +6 -0
- package/dist/PermissionSession.js.map +1 -0
- package/dist/authRefusal.d.ts +18 -0
- package/dist/authRefusal.d.ts.map +1 -0
- package/dist/authRefusal.js +11 -0
- package/dist/authRefusal.js.map +1 -0
- package/dist/client/AuthFailure.d.ts +18 -0
- package/dist/client/AuthFailure.d.ts.map +1 -0
- package/dist/client/AuthFailure.js +15 -0
- package/dist/client/AuthFailure.js.map +1 -0
- package/dist/client/AuthFailureCode.d.ts +4 -0
- package/dist/client/AuthFailureCode.d.ts.map +1 -0
- package/dist/client/AuthFailureCode.js +57 -0
- package/dist/client/AuthFailureCode.js.map +1 -0
- package/dist/client/adapters/authCall.d.ts +8 -0
- package/dist/client/adapters/authCall.d.ts.map +1 -0
- package/dist/client/adapters/authCall.js +31 -0
- package/dist/client/adapters/authCall.js.map +1 -0
- package/dist/client/adapters/authQuery.d.ts +5 -0
- package/dist/client/adapters/authQuery.d.ts.map +1 -0
- package/dist/client/adapters/authQuery.js +9 -0
- package/dist/client/adapters/authQuery.js.map +1 -0
- package/dist/client/adapters/authSession.d.ts +9 -0
- package/dist/client/adapters/authSession.d.ts.map +1 -0
- package/dist/client/adapters/authSession.js +20 -0
- package/dist/client/adapters/authSession.js.map +1 -0
- package/dist/client/adapters/changeEmail.d.ts +12 -0
- package/dist/client/adapters/changeEmail.d.ts.map +1 -0
- package/dist/client/adapters/changeEmail.js +5 -0
- package/dist/client/adapters/changeEmail.js.map +1 -0
- package/dist/roles.d.ts +16 -0
- package/dist/roles.d.ts.map +1 -0
- package/dist/roles.js +6 -0
- package/dist/roles.js.map +1 -0
- package/dist/server/UserDirectory.d.ts +14 -0
- package/dist/server/UserDirectory.d.ts.map +1 -0
- package/dist/server/UserDirectory.js +4 -0
- package/dist/server/UserDirectory.js.map +1 -0
- package/dist/server/{local.d.ts → adapters/local.d.ts} +1 -1
- package/dist/server/adapters/local.d.ts.map +1 -0
- package/dist/server/{local.js → adapters/local.js} +7 -6
- package/dist/server/adapters/local.js.map +1 -0
- package/dist/server/adapters/proxyRanges.d.ts.map +1 -0
- package/dist/server/adapters/proxyRanges.js.map +1 -0
- package/dist/server/adapters/trustedOrigins.d.ts +3 -0
- package/dist/server/adapters/trustedOrigins.d.ts.map +1 -0
- package/dist/server/adapters/trustedOrigins.js +10 -0
- package/dist/server/adapters/trustedOrigins.js.map +1 -0
- package/dist/server/adapters/trustedProxy.d.ts.map +1 -0
- package/dist/server/{trustedProxy.js → adapters/trustedProxy.js} +1 -1
- package/dist/server/adapters/trustedProxy.js.map +1 -0
- package/dist/server/adapters/trustedProxyRanges.d.ts.map +1 -0
- package/dist/server/{trustedProxyRanges.js → adapters/trustedProxyRanges.js} +1 -1
- package/dist/server/adapters/trustedProxyRanges.js.map +1 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.d.ts +9 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.d.ts.map +1 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.js +9 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.js.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts +3 -3
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.js +1 -1
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/acquire.d.ts +7 -0
- package/dist/server/better-auth/adapters/acquire.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/acquire.js +14 -0
- package/dist/server/better-auth/adapters/acquire.js.map +1 -0
- package/dist/server/better-auth/adapters/assertSchema.d.ts.map +1 -0
- package/dist/server/better-auth/{assertSchema.js → adapters/assertSchema.js} +2 -2
- package/dist/server/better-auth/adapters/assertSchema.js.map +1 -0
- package/dist/server/better-auth/adapters/bearerSessions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/bearerSessions.js.map +1 -0
- package/dist/server/better-auth/{clientIp.d.ts → adapters/clientIp.d.ts} +4 -3
- package/dist/server/better-auth/adapters/clientIp.d.ts.map +1 -0
- package/dist/server/better-auth/{clientIp.js → adapters/clientIp.js} +7 -5
- package/dist/server/better-auth/adapters/clientIp.js.map +1 -0
- package/dist/server/better-auth/adapters/closeRoleEndpoints.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/closeRoleEndpoints.js.map +1 -0
- package/dist/server/better-auth/adapters/columnDrift.d.ts.map +1 -0
- package/dist/server/better-auth/{columnDrift.js → adapters/columnDrift.js} +1 -1
- package/dist/server/better-auth/adapters/columnDrift.js.map +1 -0
- package/dist/server/better-auth/adapters/emailOptions.d.ts +2 -2
- package/dist/server/better-auth/adapters/emailOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/emailOptions.js +13 -9
- package/dist/server/better-auth/adapters/emailOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts +7 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +9 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- package/dist/server/better-auth/adapters/migrate.d.ts.map +1 -0
- package/dist/server/better-auth/{migrate.js → adapters/migrate.js} +1 -1
- package/dist/server/better-auth/adapters/migrate.js.map +1 -0
- package/dist/server/better-auth/adapters/migrationPlan.d.ts.map +1 -0
- package/dist/server/better-auth/{migrationPlan.js → adapters/migrationPlan.js} +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.js.map +1 -0
- package/dist/server/better-auth/adapters/migrations/generate.d.ts.map +1 -0
- package/dist/server/better-auth/{migrations → adapters/migrations}/generate.js +1 -1
- package/dist/server/better-auth/adapters/migrations/generate.js.map +1 -0
- package/dist/server/better-auth/{mount.d.ts → adapters/mount.d.ts} +61 -50
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -0
- package/dist/server/better-auth/{mount.js → adapters/mount.js} +40 -24
- package/dist/server/better-auth/adapters/mount.js.map +1 -0
- package/dist/server/better-auth/adapters/mountedSessions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/mountedSessions.js.map +1 -0
- package/dist/server/better-auth/adapters/oauthGrants.d.ts +17 -0
- package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/oauthGrants.js +78 -0
- package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -0
- package/dist/server/better-auth/adapters/oauthProvider.d.ts +18 -0
- package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/oauthProvider.js +36 -0
- package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -0
- package/dist/server/better-auth/adapters/profileStorage.d.ts +6 -0
- package/dist/server/better-auth/adapters/profileStorage.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/profileStorage.js +13 -0
- package/dist/server/better-auth/adapters/profileStorage.js.map +1 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts +3 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.js +56 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.d.ts +4 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.js +14 -0
- package/dist/server/better-auth/adapters/rateLimitStorage.js.map +1 -0
- package/dist/server/better-auth/adapters/response.d.ts +4 -2
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +9 -7
- package/dist/server/better-auth/adapters/response.js.map +1 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.js +2 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/routeHandler.d.ts +5 -0
- package/dist/server/better-auth/adapters/routeHandler.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/routeHandler.js +20 -0
- package/dist/server/better-auth/adapters/routeHandler.js.map +1 -0
- package/dist/server/better-auth/adapters/signInPolicyOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/signInPolicyOptions.js +3 -2
- package/dist/server/better-auth/adapters/signInPolicyOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/tables.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/tables.js.map +1 -0
- package/dist/server/better-auth/adapters/testingCredentials.d.ts +4 -0
- package/dist/server/better-auth/adapters/testingCredentials.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/testingCredentials.js +8 -0
- package/dist/server/better-auth/adapters/testingCredentials.js.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts +7 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.js +20 -0
- package/dist/server/better-auth/adapters/userDirectory.js.map +1 -0
- package/dist/server/better-auth/admittedSessions.d.ts +1 -1
- package/dist/server/better-auth/admittedSessions.d.ts.map +1 -1
- package/dist/server/better-auth/admittedSessions.js +1 -1
- package/dist/server/better-auth/admittedSessions.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +2 -2
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +5 -3
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/emails.d.ts +11 -8
- package/dist/server/better-auth/emails.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts +10 -3
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +7 -17
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/testDatabase.js +1 -1
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/better-auth/testing.d.ts +13 -39
- package/dist/server/better-auth/testing.d.ts.map +1 -1
- package/dist/server/better-auth/testing.js +44 -12
- package/dist/server/better-auth/testing.js.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts +26 -0
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -0
- package/dist/server/better-auth/userDirectoryReads.js +42 -0
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -0
- package/dist/server/better-auth/userProfiles.d.ts +4 -6
- package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
- package/dist/server/better-auth/userProfiles.js +2 -11
- package/dist/server/better-auth/userProfiles.js.map +1 -1
- package/dist/server/currentSessionContext.d.ts +5 -0
- package/dist/server/currentSessionContext.d.ts.map +1 -0
- package/dist/server/currentSessionContext.js +19 -0
- package/dist/server/currentSessionContext.js.map +1 -0
- package/dist/server/oauthGrants.d.ts +24 -0
- package/dist/server/oauthGrants.d.ts.map +1 -0
- package/dist/server/oauthGrants.js +5 -0
- package/dist/server/oauthGrants.js.map +1 -0
- package/dist/server/origin.d.ts +0 -1
- package/dist/server/origin.d.ts.map +1 -1
- package/dist/server/origin.js +0 -8
- package/dist/server/origin.js.map +1 -1
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js +2 -4
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/resolveChanges.d.ts +8 -0
- package/dist/server/resolveChanges.d.ts.map +1 -0
- package/dist/server/resolveChanges.js +13 -0
- package/dist/server/resolveChanges.js.map +1 -0
- package/dist/server/revalidateStream.d.ts +3 -3
- package/dist/server/revalidateStream.d.ts.map +1 -1
- package/dist/server/revalidateStream.js +3 -8
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts +1 -1
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +10 -11
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -7
- package/dist/server/tracing.js.map +1 -1
- package/dist/sessions.d.ts +19 -3
- package/dist/sessions.d.ts.map +1 -1
- package/dist/users.d.ts +29 -0
- package/dist/users.d.ts.map +1 -0
- package/dist/users.js +18 -0
- package/dist/users.js.map +1 -0
- package/package.json +19 -14
- package/src/PermissionSession.ts +7 -0
- package/src/authRefusal.ts +13 -0
- package/src/client/AuthFailure.ts +19 -0
- package/src/client/AuthFailureCode.ts +58 -0
- package/src/client/adapters/authCall.ts +44 -0
- package/src/client/adapters/authQuery.ts +13 -0
- package/src/client/adapters/authSession.ts +30 -0
- package/src/client/adapters/changeEmail.ts +13 -0
- package/src/roles.ts +5 -0
- package/src/server/UserDirectory.ts +14 -0
- package/src/server/{local.ts → adapters/local.ts} +7 -9
- package/src/server/adapters/trustedOrigins.ts +13 -0
- package/src/server/{trustedProxy.ts → adapters/trustedProxy.ts} +1 -1
- package/src/server/{trustedProxyRanges.ts → adapters/trustedProxyRanges.ts} +1 -1
- package/src/server/better-auth/UndeclaredDefaultRole.ts +9 -0
- package/src/server/better-auth/accountRoleSeed.ts +1 -1
- package/src/server/better-auth/adapters/acquire.ts +17 -0
- package/src/server/better-auth/{assertSchema.ts → adapters/assertSchema.ts} +2 -2
- package/src/server/better-auth/{clientIp.ts → adapters/clientIp.ts} +7 -6
- package/src/server/better-auth/{columnDrift.ts → adapters/columnDrift.ts} +1 -1
- package/src/server/better-auth/adapters/emailOptions.ts +21 -9
- package/src/server/better-auth/adapters/hookRuntime.ts +17 -3
- package/src/server/better-auth/{migrate.ts → adapters/migrate.ts} +1 -1
- package/src/server/better-auth/{migrationPlan.ts → adapters/migrationPlan.ts} +1 -1
- package/src/server/better-auth/{migrations → adapters/migrations}/generate.ts +1 -1
- package/src/server/better-auth/{mount.ts → adapters/mount.ts} +66 -29
- package/src/server/better-auth/adapters/oauthGrants.ts +92 -0
- package/src/server/better-auth/adapters/oauthProvider.ts +49 -0
- package/src/server/better-auth/adapters/profileStorage.ts +18 -0
- package/src/server/better-auth/adapters/providerOnlyOptions.ts +63 -0
- package/src/server/better-auth/adapters/rateLimitStorage.ts +23 -0
- package/src/server/better-auth/adapters/response.ts +16 -8
- package/src/server/better-auth/adapters/roleSeedOptions.ts +2 -1
- package/src/server/better-auth/adapters/routeHandler.ts +31 -0
- package/src/server/better-auth/adapters/signInPolicyOptions.ts +3 -2
- package/src/server/better-auth/adapters/storedRoleOptions.ts +1 -1
- package/src/server/better-auth/adapters/testingCredentials.ts +9 -0
- package/src/server/better-auth/adapters/userDirectory.ts +33 -0
- package/src/server/better-auth/admittedSessions.ts +1 -1
- package/src/server/better-auth/assignRole.ts +5 -3
- package/src/server/better-auth/emails.ts +11 -8
- package/src/server/better-auth/mountRoutes.ts +16 -35
- package/src/server/better-auth/testDatabase.ts +1 -1
- package/src/server/better-auth/testing.ts +68 -18
- package/src/server/better-auth/userDirectoryReads.ts +47 -0
- package/src/server/better-auth/userProfiles.ts +6 -12
- package/src/server/currentSessionContext.ts +23 -0
- package/src/server/oauthGrants.ts +23 -0
- package/src/server/origin.ts +0 -10
- package/src/server/permissions.ts +2 -4
- package/src/server/resolveChanges.ts +24 -0
- package/src/server/revalidateStream.ts +4 -8
- package/src/server/session.ts +14 -11
- package/src/server/tracing.ts +4 -9
- package/src/users.ts +19 -0
- package/dist/server/better-auth/assertSchema.d.ts.map +0 -1
- package/dist/server/better-auth/assertSchema.js.map +0 -1
- package/dist/server/better-auth/bearerSessions.d.ts.map +0 -1
- package/dist/server/better-auth/bearerSessions.js.map +0 -1
- package/dist/server/better-auth/clientIp.d.ts.map +0 -1
- package/dist/server/better-auth/clientIp.js.map +0 -1
- package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +0 -1
- package/dist/server/better-auth/closeRoleEndpoints.js.map +0 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +0 -1
- package/dist/server/better-auth/columnDrift.js.map +0 -1
- package/dist/server/better-auth/emailWindow.d.ts +0 -3
- package/dist/server/better-auth/emailWindow.d.ts.map +0 -1
- package/dist/server/better-auth/emailWindow.js +0 -23
- package/dist/server/better-auth/emailWindow.js.map +0 -1
- package/dist/server/better-auth/memoryRateLimit.d.ts +0 -3
- package/dist/server/better-auth/memoryRateLimit.d.ts.map +0 -1
- package/dist/server/better-auth/memoryRateLimit.js +0 -46
- package/dist/server/better-auth/memoryRateLimit.js.map +0 -1
- package/dist/server/better-auth/migrate.d.ts.map +0 -1
- package/dist/server/better-auth/migrate.js.map +0 -1
- package/dist/server/better-auth/migrationPlan.d.ts.map +0 -1
- package/dist/server/better-auth/migrationPlan.js.map +0 -1
- package/dist/server/better-auth/migrations/generate.d.ts.map +0 -1
- package/dist/server/better-auth/migrations/generate.js.map +0 -1
- package/dist/server/better-auth/mount.d.ts.map +0 -1
- package/dist/server/better-auth/mount.js.map +0 -1
- package/dist/server/better-auth/mountedSessions.d.ts.map +0 -1
- package/dist/server/better-auth/mountedSessions.js.map +0 -1
- package/dist/server/better-auth/tables.d.ts.map +0 -1
- package/dist/server/better-auth/tables.js.map +0 -1
- package/dist/server/commandChanges.d.ts +0 -4
- package/dist/server/commandChanges.d.ts.map +0 -1
- package/dist/server/commandChanges.js +0 -48
- package/dist/server/commandChanges.js.map +0 -1
- package/dist/server/local.d.ts.map +0 -1
- package/dist/server/local.js.map +0 -1
- package/dist/server/proxyRanges.d.ts.map +0 -1
- package/dist/server/proxyRanges.js.map +0 -1
- package/dist/server/sessionKeys.d.ts +0 -13
- package/dist/server/sessionKeys.d.ts.map +0 -1
- package/dist/server/sessionKeys.js +0 -27
- package/dist/server/sessionKeys.js.map +0 -1
- package/dist/server/trustedProxy.d.ts.map +0 -1
- package/dist/server/trustedProxy.js.map +0 -1
- package/dist/server/trustedProxyRanges.d.ts.map +0 -1
- package/dist/server/trustedProxyRanges.js.map +0 -1
- package/src/server/better-auth/emailWindow.ts +0 -27
- package/src/server/better-auth/memoryRateLimit.ts +0 -56
- package/src/server/commandChanges.ts +0 -63
- package/src/server/sessionKeys.ts +0 -42
- /package/dist/server/{proxyRanges.d.ts → adapters/proxyRanges.d.ts} +0 -0
- /package/dist/server/{proxyRanges.js → adapters/proxyRanges.js} +0 -0
- /package/dist/server/{trustedProxy.d.ts → adapters/trustedProxy.d.ts} +0 -0
- /package/dist/server/{trustedProxyRanges.d.ts → adapters/trustedProxyRanges.d.ts} +0 -0
- /package/dist/server/better-auth/{assertSchema.d.ts → adapters/assertSchema.d.ts} +0 -0
- /package/dist/server/better-auth/{bearerSessions.d.ts → adapters/bearerSessions.d.ts} +0 -0
- /package/dist/server/better-auth/{bearerSessions.js → adapters/bearerSessions.js} +0 -0
- /package/dist/server/better-auth/{closeRoleEndpoints.d.ts → adapters/closeRoleEndpoints.d.ts} +0 -0
- /package/dist/server/better-auth/{closeRoleEndpoints.js → adapters/closeRoleEndpoints.js} +0 -0
- /package/dist/server/better-auth/{columnDrift.d.ts → adapters/columnDrift.d.ts} +0 -0
- /package/dist/server/better-auth/{migrate.d.ts → adapters/migrate.d.ts} +0 -0
- /package/dist/server/better-auth/{migrationPlan.d.ts → adapters/migrationPlan.d.ts} +0 -0
- /package/dist/server/better-auth/{migrations → adapters/migrations}/generate.d.ts +0 -0
- /package/dist/server/better-auth/{mountedSessions.d.ts → adapters/mountedSessions.d.ts} +0 -0
- /package/dist/server/better-auth/{mountedSessions.js → adapters/mountedSessions.js} +0 -0
- /package/dist/server/better-auth/{tables.d.ts → adapters/tables.d.ts} +0 -0
- /package/dist/server/better-auth/{tables.js → adapters/tables.js} +0 -0
- /package/src/server/{proxyRanges.ts → adapters/proxyRanges.ts} +0 -0
- /package/src/server/better-auth/{bearerSessions.ts → adapters/bearerSessions.ts} +0 -0
- /package/src/server/better-auth/{closeRoleEndpoints.ts → adapters/closeRoleEndpoints.ts} +0 -0
- /package/src/server/better-auth/{mountedSessions.ts → adapters/mountedSessions.ts} +0 -0
- /package/src/server/better-auth/{tables.ts → adapters/tables.ts} +0 -0
|
@@ -1,12 +1,20 @@
|
|
|
1
1
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
2
|
import { APIError } from "better-auth/api";
|
|
3
|
-
import { type Cause, Context, Effect, Result } from "effect";
|
|
3
|
+
import { type Cause, Context, Data, Effect, Result } from "effect";
|
|
4
4
|
import { authCall } from "#server/adapters/authCall.ts";
|
|
5
5
|
import type { BetterAuthHookError } from "#server/better-auth/databaseHooks.ts";
|
|
6
6
|
|
|
7
|
+
export class HookRefusal extends Data.TaggedError("HookRefusal")<BetterAuthHookError> {}
|
|
8
|
+
|
|
9
|
+
interface RequestState<R> {
|
|
10
|
+
cause?: Cause.Cause<never>;
|
|
11
|
+
readonly context: Context.Context<R>;
|
|
12
|
+
refusal?: HookRefusal;
|
|
13
|
+
}
|
|
14
|
+
|
|
7
15
|
export const hookRuntime = Effect.fnUntraced(function* <R>() {
|
|
8
16
|
const context = yield* Effect.context<R>();
|
|
9
|
-
const requests = new AsyncLocalStorage<
|
|
17
|
+
const requests = new AsyncLocalStorage<RequestState<R>>();
|
|
10
18
|
return {
|
|
11
19
|
runHook: async <A>(hook: () => Effect.Effect<A, BetterAuthHookError, R>, signal: AbortSignal | undefined): Promise<A> => {
|
|
12
20
|
const request = requests.getStore();
|
|
@@ -21,6 +29,9 @@ export const hookRuntime = Effect.fnUntraced(function* <R>() {
|
|
|
21
29
|
signal,
|
|
22
30
|
});
|
|
23
31
|
if (Result.isFailure(result)) {
|
|
32
|
+
if (request !== undefined) {
|
|
33
|
+
request.refusal = new HookRefusal(result.failure);
|
|
34
|
+
}
|
|
24
35
|
throw new APIError("FORBIDDEN", { code: result.failure.code, message: result.failure.message });
|
|
25
36
|
}
|
|
26
37
|
return result.success;
|
|
@@ -28,13 +39,16 @@ export const hookRuntime = Effect.fnUntraced(function* <R>() {
|
|
|
28
39
|
runRequest: <A>(request: (signal: AbortSignal) => Promise<A>) =>
|
|
29
40
|
Effect.withFiber((fiber) =>
|
|
30
41
|
Effect.gen(function* () {
|
|
31
|
-
const state:
|
|
42
|
+
const state: RequestState<R> = {
|
|
32
43
|
context: Context.merge(context, fiber.context),
|
|
33
44
|
};
|
|
34
45
|
const exit = yield* Effect.exit(authCall((signal) => requests.run(state, () => request(signal))));
|
|
35
46
|
if (state.cause !== undefined) {
|
|
36
47
|
return yield* Effect.failCause(state.cause);
|
|
37
48
|
}
|
|
49
|
+
if (state.refusal !== undefined) {
|
|
50
|
+
return yield* Effect.fail(state.refusal);
|
|
51
|
+
}
|
|
38
52
|
return yield* exit;
|
|
39
53
|
}),
|
|
40
54
|
),
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect } from "effect";
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
4
5
|
import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
5
|
-
import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.ts";
|
|
6
6
|
|
|
7
7
|
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (
|
|
8
8
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -4,7 +4,7 @@ import { Effect } from "effect";
|
|
|
4
4
|
import { SqlClient } from "effect/sql";
|
|
5
5
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
6
6
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
7
|
-
import { tables } from "
|
|
7
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
8
8
|
|
|
9
9
|
export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (
|
|
10
10
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect } from "effect";
|
|
3
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
3
4
|
import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
4
|
-
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/migrationPlan.ts";
|
|
5
5
|
|
|
6
6
|
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (
|
|
7
7
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -1,45 +1,55 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Config, Effect, Option, Redacted } from "effect";
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Config, Effect, Layer, Option, Redacted, type Scope } from "effect";
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import type { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
5
|
+
import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
|
|
6
|
+
import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
7
|
+
import { PEER_IP_HEADER } from "#server/better-auth/adapters/clientIp.ts";
|
|
8
|
+
import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
|
|
4
9
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
5
10
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
6
11
|
import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
7
12
|
import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
13
|
+
import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
|
|
8
14
|
import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
|
|
15
|
+
import { providerOnlyOptions } from "#server/better-auth/adapters/providerOnlyOptions.ts";
|
|
16
|
+
import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
|
|
9
17
|
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
10
18
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
11
19
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
12
|
-
import {
|
|
13
|
-
import {
|
|
14
|
-
import {
|
|
15
|
-
import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
20
|
+
import { admittedSessions } from "#server/better-auth/admittedSessions.ts";
|
|
21
|
+
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
22
|
+
import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
|
|
23
|
+
import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
24
|
+
import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
|
|
16
25
|
import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
17
26
|
import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
|
|
27
|
+
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
18
28
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
19
|
-
import
|
|
20
|
-
import {
|
|
21
|
-
import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
|
|
22
|
-
import type { BetterAuthDatabaseHooks } from "./databaseHooks.ts";
|
|
23
|
-
import type { BetterAuthEmails } from "./emails.ts";
|
|
24
|
-
import { mountedSessions } from "./mountedSessions.ts";
|
|
25
|
-
import type { BetterAuthPasswordReset } from "./PasswordReset.ts";
|
|
29
|
+
import { acquireAuth } from "./acquire.ts";
|
|
30
|
+
import { authRouteHandler } from "./routeHandler.ts";
|
|
26
31
|
|
|
27
32
|
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
28
33
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
29
34
|
readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
|
|
30
35
|
readonly emails?: BetterAuthEmails<R> | undefined;
|
|
36
|
+
readonly enabledPaths?: readonly string[];
|
|
31
37
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
32
38
|
readonly onPasswordReset?: BetterAuthPasswordReset<R> | undefined;
|
|
39
|
+
readonly preset?: "provider-only";
|
|
33
40
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
34
41
|
} & (
|
|
35
42
|
| { readonly roles?: undefined; readonly roleSeed?: undefined }
|
|
36
43
|
| (StoredRoleOptions & { readonly roles: RoleSet; readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R> })
|
|
37
44
|
);
|
|
38
45
|
|
|
39
|
-
|
|
46
|
+
const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
40
47
|
options: TOptions,
|
|
41
48
|
mount: BetterAuthMountOptions<E, R> = {},
|
|
42
49
|
) {
|
|
50
|
+
if (mount.roles !== undefined) {
|
|
51
|
+
yield* mount.roles.resolve(mount.defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: mount.defaultRole })));
|
|
52
|
+
}
|
|
43
53
|
const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
|
|
44
54
|
const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
|
|
45
55
|
const origin = Option.map(publicUrl, (url) => url.origin);
|
|
@@ -58,11 +68,14 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
58
68
|
const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
|
|
59
69
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
60
70
|
const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
|
|
71
|
+
const base = { ...configured, databaseHooks: seeded.databaseHooks };
|
|
72
|
+
const preset = mount.preset === "provider-only" ? providerOnlyOptions(base, mount.enabledPaths) : base;
|
|
61
73
|
const rateLimit = options.rateLimit;
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
const
|
|
65
|
-
|
|
74
|
+
const prefix = `/${(options.basePath || "/api/auth").replace(/^\/|\/+$/gu, "")}` as const;
|
|
75
|
+
const basePath = prefix === "/" ? "" : prefix;
|
|
76
|
+
const customStorage = yield* rateLimitStorage;
|
|
77
|
+
const { auth, profiles } = yield* acquireAuth({
|
|
78
|
+
...withHardening(withBearerSessions(preset, mount.bearerSessions !== undefined), mount.hardening),
|
|
66
79
|
advanced: {
|
|
67
80
|
useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
|
|
68
81
|
...options.advanced,
|
|
@@ -78,10 +91,9 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
78
91
|
allowedHosts: ["127.0.0.1:*", "localhost:*"],
|
|
79
92
|
protocol: "http" as const,
|
|
80
93
|
})),
|
|
81
|
-
databaseHooks: seeded.databaseHooks,
|
|
82
94
|
rateLimit: {
|
|
83
95
|
...rateLimit,
|
|
84
|
-
|
|
96
|
+
customStorage,
|
|
85
97
|
enabled: rateLimitEnabled,
|
|
86
98
|
},
|
|
87
99
|
secret,
|
|
@@ -89,14 +101,22 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
89
101
|
options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
|
|
90
102
|
user: gate.active ? gated.user : configured.user,
|
|
91
103
|
});
|
|
92
|
-
const authRoutes = mountRoutes(
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
104
|
+
const authRoutes = mountRoutes.pipe(
|
|
105
|
+
Layer.provide(
|
|
106
|
+
Layer.succeed(AuthRouteHandler, {
|
|
107
|
+
basePath,
|
|
108
|
+
handle: authRouteHandler(auth, {
|
|
109
|
+
basePath,
|
|
110
|
+
bearerSessions: mount.bearerSessions,
|
|
111
|
+
clientIpHeader,
|
|
112
|
+
ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
|
|
113
|
+
roles: mount.roles,
|
|
114
|
+
runRequest: runtime.runRequest,
|
|
115
|
+
trustedProxy,
|
|
116
|
+
}),
|
|
117
|
+
}),
|
|
118
|
+
),
|
|
119
|
+
);
|
|
100
120
|
const admit = admittedSessions(gate, () => auth.$context, mount.bearerSessions);
|
|
101
121
|
const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
|
|
102
122
|
const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId: string) {
|
|
@@ -109,5 +129,22 @@ export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <
|
|
|
109
129
|
const revoke = revokeUnadmitted(gate, () => auth.$context);
|
|
110
130
|
const lookupSession: unknown = Reflect.get(auth.api, "getSession");
|
|
111
131
|
const sessions = mountedSessions(lookupSession, admit, mount.roles);
|
|
112
|
-
return { admitsUser, admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
132
|
+
return { admitsUser, admittedSessions: admit, auth, profiles, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
113
133
|
});
|
|
134
|
+
|
|
135
|
+
type Mounted<TOptions extends BetterAuthOptions, E, R> = ReturnType<typeof mountAuth<TOptions, E, R>>;
|
|
136
|
+
|
|
137
|
+
export function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
138
|
+
options: TOptions,
|
|
139
|
+
mount?: BetterAuthMountOptions<E, R> & { readonly emails?: undefined },
|
|
140
|
+
): Effect.Effect<Effect.Success<Mounted<TOptions, E, R>>, Effect.Error<Mounted<TOptions, E, R>>, R | Scope.Scope | Store>;
|
|
141
|
+
export function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
142
|
+
options: TOptions,
|
|
143
|
+
mount: BetterAuthMountOptions<E, R>,
|
|
144
|
+
): Mounted<TOptions, E, R>;
|
|
145
|
+
export function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
146
|
+
options: TOptions,
|
|
147
|
+
mount: BetterAuthMountOptions<E, R> = {},
|
|
148
|
+
) {
|
|
149
|
+
return mountAuth(options, mount);
|
|
150
|
+
}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import type { AuthContext } from "better-auth";
|
|
2
|
+
import { Clock, Effect, Layer, Option, Schema } from "effect";
|
|
3
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { OauthGrant, OauthGrants } from "#server/oauthGrants.ts";
|
|
5
|
+
|
|
6
|
+
export interface OauthGrantAuth {
|
|
7
|
+
readonly $context: Promise<{
|
|
8
|
+
readonly adapter: Pick<AuthContext["adapter"], "findOne" | "findMany"> & {
|
|
9
|
+
readonly transaction: <A>(run: (adapter: Pick<AuthContext["adapter"], "deleteMany">) => Promise<A>) => Promise<A>;
|
|
10
|
+
};
|
|
11
|
+
readonly internalAdapter: Pick<AuthContext["internalAdapter"], "findUserById">;
|
|
12
|
+
}>;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
function unavailable(cause: unknown) {
|
|
16
|
+
return Object.assign(new AuthUnavailable({ message: "OAuth grant storage failed" }), { cause });
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export function betterAuthOauthGrants(options: {
|
|
20
|
+
readonly auth: OauthGrantAuth;
|
|
21
|
+
readonly admitsUser: (userId: string) => Effect.Effect<boolean, AuthUnavailable>;
|
|
22
|
+
}) {
|
|
23
|
+
const { auth, admitsUser } = options;
|
|
24
|
+
const revoke = Effect.fn("Identity.revoke")(function* (userId: string, clientId?: string) {
|
|
25
|
+
yield* Effect.tryPromise({
|
|
26
|
+
catch: unavailable,
|
|
27
|
+
try: async () => {
|
|
28
|
+
const { adapter } = await auth.$context;
|
|
29
|
+
const where = [{ field: "userId", value: userId }, ...(clientId === undefined ? [] : [{ field: "clientId", value: clientId }])];
|
|
30
|
+
await adapter.transaction(async (transaction) => {
|
|
31
|
+
for (const model of ["oauthConsent", "oauthAccessToken", "oauthRefreshToken"]) {
|
|
32
|
+
await transaction.deleteMany({ model, where });
|
|
33
|
+
}
|
|
34
|
+
});
|
|
35
|
+
},
|
|
36
|
+
});
|
|
37
|
+
});
|
|
38
|
+
return Layer.succeed(OauthGrants, {
|
|
39
|
+
list: Effect.fn("OauthGrants.list")(function* (userId: string, page: { readonly limit: number; readonly offset?: number }) {
|
|
40
|
+
const consents = yield* Effect.tryPromise({
|
|
41
|
+
catch: unavailable,
|
|
42
|
+
try: async () => {
|
|
43
|
+
const { adapter } = await auth.$context;
|
|
44
|
+
return adapter.findMany({
|
|
45
|
+
...page,
|
|
46
|
+
model: "oauthConsent",
|
|
47
|
+
sortBy: { direction: "asc", field: "id" },
|
|
48
|
+
where: [{ field: "userId", value: userId }],
|
|
49
|
+
});
|
|
50
|
+
},
|
|
51
|
+
});
|
|
52
|
+
return yield* Schema.decodeUnknownEffect(Schema.Array(OauthGrant))(consents).pipe(Effect.mapError(unavailable));
|
|
53
|
+
}),
|
|
54
|
+
resolveGrant: Effect.fn("OauthGrants.resolveGrant")(function* (grantId: string, userId: string, clientId: string) {
|
|
55
|
+
const now = yield* Clock.currentTimeMillis;
|
|
56
|
+
const subject = yield* Effect.tryPromise({
|
|
57
|
+
catch: unavailable,
|
|
58
|
+
try: async () => {
|
|
59
|
+
const { adapter, internalAdapter } = await auth.$context;
|
|
60
|
+
const user = await internalAdapter.findUserById(userId);
|
|
61
|
+
if (user === null) {
|
|
62
|
+
return null;
|
|
63
|
+
}
|
|
64
|
+
const banExpires: unknown = Reflect.get(user, "banExpires");
|
|
65
|
+
if (Reflect.get(user, "banned") === true && !(banExpires instanceof Date && banExpires.getTime() < now)) {
|
|
66
|
+
return null;
|
|
67
|
+
}
|
|
68
|
+
const consent = await adapter.findOne({
|
|
69
|
+
model: "oauthConsent",
|
|
70
|
+
where: [
|
|
71
|
+
{ field: "id", value: grantId },
|
|
72
|
+
{ field: "userId", value: userId },
|
|
73
|
+
{ field: "clientId", value: clientId },
|
|
74
|
+
],
|
|
75
|
+
});
|
|
76
|
+
return consent === null ? null : { consent, user };
|
|
77
|
+
},
|
|
78
|
+
});
|
|
79
|
+
if (subject === null || !(yield* admitsUser(subject.user.id))) {
|
|
80
|
+
return Option.none();
|
|
81
|
+
}
|
|
82
|
+
const role: unknown = Reflect.get(subject.user, "role");
|
|
83
|
+
const grant = yield* Schema.decodeUnknownEffect(OauthGrant)(subject.consent).pipe(Effect.mapError(unavailable));
|
|
84
|
+
return Option.some({
|
|
85
|
+
scopes: grant.scopes,
|
|
86
|
+
user: { email: subject.user.email, id: subject.user.id, name: subject.user.name, ...(typeof role === "string" ? { role } : {}) },
|
|
87
|
+
});
|
|
88
|
+
}),
|
|
89
|
+
revokeAllClients: (userId) => revoke(userId),
|
|
90
|
+
revokeClient: (userId, clientId) => revoke(userId, clientId),
|
|
91
|
+
});
|
|
92
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import {
|
|
2
|
+
type OAuthClaimExtensionInput,
|
|
3
|
+
type OAuthOptions,
|
|
4
|
+
oauthProvider,
|
|
5
|
+
oauthProviderAuthServerMetadata,
|
|
6
|
+
type Scope,
|
|
7
|
+
} from "@better-auth/oauth-provider";
|
|
8
|
+
import { APIError } from "better-auth/api";
|
|
9
|
+
import { Effect } from "effect";
|
|
10
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
11
|
+
|
|
12
|
+
export type OauthResourceOptions = Omit<OAuthOptions<Scope[]>, "resources" | "clientRegistrationDefaultResources"> & { readonly resource: string };
|
|
13
|
+
|
|
14
|
+
async function grantClaims({ ctx, user, client, referenceId }: OAuthClaimExtensionInput) {
|
|
15
|
+
if (!user) {
|
|
16
|
+
return {};
|
|
17
|
+
}
|
|
18
|
+
const consent = await ctx.context.adapter.findOne<{ id: string }>({
|
|
19
|
+
model: "oauthConsent",
|
|
20
|
+
where: [
|
|
21
|
+
{ field: "userId", value: user.id },
|
|
22
|
+
{ field: "clientId", value: client.clientId },
|
|
23
|
+
{ field: "referenceId", value: referenceId ?? null },
|
|
24
|
+
],
|
|
25
|
+
});
|
|
26
|
+
if (consent === null) {
|
|
27
|
+
throw new APIError("BAD_REQUEST", { error: "invalid_grant", "error_description": "Consent is required" });
|
|
28
|
+
}
|
|
29
|
+
return { "grant_id": consent.id };
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
export function betterAuthOauthProvider({ resource, ...options }: OauthResourceOptions): ReturnType<typeof oauthProvider> {
|
|
33
|
+
return oauthProvider({
|
|
34
|
+
...options,
|
|
35
|
+
clientRegistrationDefaultResources: [resource],
|
|
36
|
+
extensions: [...(options.extensions ?? []), { claims: { accessToken: grantClaims } }],
|
|
37
|
+
resources: [resource],
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export const oauthAuthorizationMetadata = Effect.fn("Identity.oauthAuthorizationMetadata")(function* (
|
|
42
|
+
auth: { readonly api: { readonly "getOAuthServerConfig": (input: { readonly request: Request; readonly asResponse: false }) => Promise<unknown> } },
|
|
43
|
+
request: Request,
|
|
44
|
+
) {
|
|
45
|
+
return yield* Effect.tryPromise({
|
|
46
|
+
catch: (cause) => Object.assign(new AuthUnavailable({ message: "OAuth server metadata failed" }), { cause }),
|
|
47
|
+
try: () => oauthProviderAuthServerMetadata(auth)(request),
|
|
48
|
+
});
|
|
49
|
+
});
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import type { AuthContext } from "better-auth";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import type { UserProfile, UserProfileStorage } from "#server/better-auth/userProfiles.ts";
|
|
4
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
|
+
|
|
6
|
+
export function profileStorage({ adapter }: { readonly adapter: Pick<AuthContext["adapter"], "findMany"> }): UserProfileStorage {
|
|
7
|
+
return {
|
|
8
|
+
findByIds: (userIds) =>
|
|
9
|
+
Effect.tryPromise(() =>
|
|
10
|
+
adapter.findMany<UserProfile>({
|
|
11
|
+
limit: userIds.length,
|
|
12
|
+
model: "user",
|
|
13
|
+
select: ["id", "name", "image"],
|
|
14
|
+
where: [{ field: "id", operator: "in", value: [...userIds] }],
|
|
15
|
+
}),
|
|
16
|
+
).pipe(Effect.catch((error) => providerFailure(error.cause))),
|
|
17
|
+
};
|
|
18
|
+
}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import type { BetterAuthOptions, GenericEndpointContext } from "better-auth";
|
|
2
|
+
|
|
3
|
+
const closedPaths = [
|
|
4
|
+
"/sign-in/email",
|
|
5
|
+
"/sign-up/email",
|
|
6
|
+
"/request-password-reset",
|
|
7
|
+
"/reset-password",
|
|
8
|
+
"/change-password",
|
|
9
|
+
"/verify-password",
|
|
10
|
+
"/change-email",
|
|
11
|
+
"/send-verification-email",
|
|
12
|
+
"/verify-email",
|
|
13
|
+
"/sign-in/magic-link",
|
|
14
|
+
"/magic-link/verify",
|
|
15
|
+
"/admin/set-role",
|
|
16
|
+
"/admin/get-user",
|
|
17
|
+
"/admin/create-user",
|
|
18
|
+
"/admin/update-user",
|
|
19
|
+
"/admin/list-users",
|
|
20
|
+
"/admin/list-user-sessions",
|
|
21
|
+
"/admin/unban-user",
|
|
22
|
+
"/admin/ban-user",
|
|
23
|
+
"/admin/impersonate-user",
|
|
24
|
+
"/admin/stop-impersonating",
|
|
25
|
+
"/admin/revoke-user-session",
|
|
26
|
+
"/admin/revoke-user-sessions",
|
|
27
|
+
"/admin/remove-user",
|
|
28
|
+
"/admin/set-user-password",
|
|
29
|
+
"/admin/has-permission",
|
|
30
|
+
];
|
|
31
|
+
|
|
32
|
+
type AccountHooks = NonNullable<NonNullable<BetterAuthOptions["databaseHooks"]>["account"]>;
|
|
33
|
+
type AccountBefore = NonNullable<NonNullable<AccountHooks["create"]>["before"]>;
|
|
34
|
+
type Before<T> = (data: T, context: GenericEndpointContext | null) => ReturnType<AccountBefore>;
|
|
35
|
+
|
|
36
|
+
function withoutTokens<T extends object>(before?: Before<T>) {
|
|
37
|
+
return async (data: T, context: GenericEndpointContext | null) => {
|
|
38
|
+
const result = await before?.(data, context);
|
|
39
|
+
if (result === false) {
|
|
40
|
+
return false;
|
|
41
|
+
}
|
|
42
|
+
return { data: { ...data, ...(typeof result === "object" ? result.data : {}), accessToken: null, idToken: null, refreshToken: null } };
|
|
43
|
+
};
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export function providerOnlyOptions<TOptions extends BetterAuthOptions>(options: TOptions, enabledPaths: readonly string[] = []): TOptions {
|
|
47
|
+
const account = options.databaseHooks?.account;
|
|
48
|
+
return {
|
|
49
|
+
...options,
|
|
50
|
+
account: { ...options.account, storeAccountCookie: false },
|
|
51
|
+
databaseHooks: {
|
|
52
|
+
...options.databaseHooks,
|
|
53
|
+
account: {
|
|
54
|
+
...account,
|
|
55
|
+
create: { ...account?.create, before: withoutTokens(account?.create?.before) },
|
|
56
|
+
update: { ...account?.update, before: withoutTokens(account?.update?.before) },
|
|
57
|
+
},
|
|
58
|
+
},
|
|
59
|
+
disabledPaths: [...(options.disabledPaths ?? []), ...closedPaths.filter((path) => !enabledPaths.includes(path))],
|
|
60
|
+
emailAndPassword: { ...options.emailAndPassword, enabled: false },
|
|
61
|
+
session: { ...options.session, cookieCache: { ...options.session?.cookieCache, enabled: false } },
|
|
62
|
+
};
|
|
63
|
+
}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import type { BetterAuthRateLimitOptions } from "better-auth";
|
|
2
|
+
import { Clock, Effect } from "effect";
|
|
3
|
+
import { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
4
|
+
|
|
5
|
+
export const rateLimitStorage = Effect.gen(function* () {
|
|
6
|
+
const store = yield* Store;
|
|
7
|
+
const run = Effect.runPromiseWith(yield* Effect.context<Store>());
|
|
8
|
+
const storage: NonNullable<BetterAuthRateLimitOptions["customStorage"]> = {
|
|
9
|
+
consume: (key, rule) =>
|
|
10
|
+
run(
|
|
11
|
+
store.consume({ key: `identity:auth:${key}`, per: rule.max, windowMillis: rule.window * 1000 }).pipe(
|
|
12
|
+
Effect.as({ allowed: true, retryAfter: null }),
|
|
13
|
+
Effect.catchTag("TooManyRequests", (error) =>
|
|
14
|
+
Effect.map(Clock.currentTimeMillis, (now) => ({
|
|
15
|
+
allowed: false,
|
|
16
|
+
retryAfter: Math.max(1, Math.ceil(((error.retryAt ?? now + rule.window * 1000) - now) / 1000)),
|
|
17
|
+
})),
|
|
18
|
+
),
|
|
19
|
+
),
|
|
20
|
+
),
|
|
21
|
+
};
|
|
22
|
+
return storage;
|
|
23
|
+
});
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { type Cause, Effect } from "effect";
|
|
2
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
2
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
-
import { type BearerSessionsOptions, cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/bearerSessions.ts";
|
|
4
|
+
import { type BearerSessionsOptions, cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
5
|
+
import type { HookRefusal } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
4
6
|
import { sessionPermissions } from "#server/better-auth/sessionPermissions.ts";
|
|
5
7
|
|
|
6
8
|
export interface MountedAuth {
|
|
@@ -8,20 +10,21 @@ export interface MountedAuth {
|
|
|
8
10
|
readonly handler: (request: Request) => Promise<Response>;
|
|
9
11
|
}
|
|
10
12
|
export interface MountRouteOptions {
|
|
13
|
+
readonly basePath?: string | undefined;
|
|
11
14
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
12
15
|
readonly clientIpHeader: string;
|
|
13
16
|
readonly ipv6Subnet?: number | undefined;
|
|
14
17
|
readonly roles?: RoleSet | undefined;
|
|
15
|
-
readonly runRequest?: (<A>(request: (signal: AbortSignal) => Promise<A>) => Effect.Effect<A, Cause.UnknownError>) | undefined;
|
|
18
|
+
readonly runRequest?: (<A>(request: (signal: AbortSignal) => Promise<A>) => Effect.Effect<A, Cause.UnknownError | HookRefusal>) | undefined;
|
|
16
19
|
readonly trustedProxy?: string | undefined;
|
|
17
20
|
}
|
|
18
|
-
function replacesSession(request: Request, reply: Response, native: boolean) {
|
|
21
|
+
function replacesSession(request: Request, reply: Response, native: boolean, basePath: string) {
|
|
19
22
|
return (
|
|
20
23
|
native
|
|
21
24
|
&& reply.ok
|
|
22
25
|
&& reply.headers.has("set-auth-token")
|
|
23
26
|
&& request.headers.has("authorization")
|
|
24
|
-
&& new URL(request.url).pathname.startsWith(
|
|
27
|
+
&& new URL(request.url).pathname.startsWith(`${basePath}/sign-in/`)
|
|
25
28
|
);
|
|
26
29
|
}
|
|
27
30
|
async function providerResponse(auth: MountedAuth, web: Request, options: MountRouteOptions) {
|
|
@@ -34,8 +37,9 @@ async function providerResponse(auth: MountedAuth, web: Request, options: MountR
|
|
|
34
37
|
const native = options.bearerSessions.origins.includes(web.headers.get("origin") ?? "") && !hasSessionCookie(web.headers, cookieName);
|
|
35
38
|
const request = new Request(web, { headers });
|
|
36
39
|
const reply = await auth.handler(request);
|
|
37
|
-
|
|
38
|
-
|
|
40
|
+
const basePath = options.basePath ?? "/api/auth";
|
|
41
|
+
if (replacesSession(request, reply, native, basePath)) {
|
|
42
|
+
const revoked = await auth.handler(new Request(new URL(`${basePath}/sign-out`, web.url), { body: "{}", headers, method: "POST" }));
|
|
39
43
|
await revoked.body?.cancel();
|
|
40
44
|
if (!revoked.ok) {
|
|
41
45
|
throw new Error("Session replacement failed");
|
|
@@ -44,13 +48,17 @@ async function providerResponse(auth: MountedAuth, web: Request, options: MountR
|
|
|
44
48
|
return native ? reply : cookieSessionResponse(reply);
|
|
45
49
|
}
|
|
46
50
|
export const response = Effect.fnUntraced(function* (auth: MountedAuth, web: Request, options: MountRouteOptions) {
|
|
47
|
-
const sessionRequest = options.roles !== undefined && new URL(web.url).pathname === "/api/auth/get-session
|
|
51
|
+
const sessionRequest = options.roles !== undefined && new URL(web.url).pathname === `${options.basePath ?? "/api/auth"}/get-session`;
|
|
48
52
|
const url = new URL(web.url);
|
|
49
53
|
if (sessionRequest) {
|
|
50
54
|
url.searchParams.set("disableCookieCache", "true");
|
|
51
55
|
}
|
|
52
56
|
const request = sessionRequest ? new Request(url, web) : web;
|
|
53
57
|
const runRequest = options.runRequest ?? Effect.tryPromise;
|
|
54
|
-
const reply = yield* runRequest((signal) => providerResponse(auth, new Request(request, { signal }), options))
|
|
58
|
+
const reply = yield* runRequest((signal) => providerResponse(auth, new Request(request, { signal }), options)).pipe(
|
|
59
|
+
Effect.catchTag("HookRefusal", ({ code, message }) =>
|
|
60
|
+
Effect.succeed<Response>(Response.json({ code, message }, { status: HttpStatus.fromLiteral("Forbidden") })),
|
|
61
|
+
),
|
|
62
|
+
);
|
|
55
63
|
return sessionRequest && reply.ok && options.roles !== undefined ? yield* sessionPermissions(reply, options.roles) : reply;
|
|
56
64
|
});
|
|
@@ -2,6 +2,7 @@ import type { BetterAuthOptions } from "better-auth";
|
|
|
2
2
|
import { APIError } from "better-auth/api";
|
|
3
3
|
import { Effect, Exit } from "effect";
|
|
4
4
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
|
+
import { authRefusals } from "#authRefusal.ts";
|
|
5
6
|
import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
|
|
6
7
|
|
|
7
8
|
export function roleSeedOptions<E>(options: BetterAuthOptions, seed: AccountRoleSeed<E> | undefined): BetterAuthOptions {
|
|
@@ -28,7 +29,7 @@ export function roleSeedOptions<E>(options: BetterAuthOptions, seed: AccountRole
|
|
|
28
29
|
{ signal: endpoint?.request?.signal },
|
|
29
30
|
);
|
|
30
31
|
if (Exit.isFailure(exit)) {
|
|
31
|
-
throw new APIError("SERVICE_UNAVAILABLE", { code:
|
|
32
|
+
throw new APIError("SERVICE_UNAVAILABLE", { code: authRefusals.roleSeedFailed.wire, message: "Sign-in is temporarily unavailable" });
|
|
32
33
|
}
|
|
33
34
|
return result;
|
|
34
35
|
},
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
+
import { clientIpHeaders } from "#server/better-auth/adapters/clientIp.ts";
|
|
5
|
+
import { type MountedAuth, type MountRouteOptions, response } from "#server/better-auth/adapters/response.ts";
|
|
6
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
7
|
+
|
|
8
|
+
export function authRouteHandler(auth: MountedAuth, options: MountRouteOptions) {
|
|
9
|
+
const setClientIp = clientIpHeaders(options);
|
|
10
|
+
return Effect.gen(function* () {
|
|
11
|
+
const request = yield* HttpServerRequest.HttpServerRequest;
|
|
12
|
+
const web = yield* HttpServerRequest.toWeb(request);
|
|
13
|
+
const clientIp = yield* setClientIp(web);
|
|
14
|
+
yield* Effect.annotateCurrentSpan({
|
|
15
|
+
"auth.rate_limit.address": clientIp.address,
|
|
16
|
+
"auth.rate_limit.address_source": clientIp.source,
|
|
17
|
+
});
|
|
18
|
+
return HttpServerResponse.fromWeb(
|
|
19
|
+
yield* response(auth, web, options).pipe(
|
|
20
|
+
Effect.catchTag("Forbidden", (error) =>
|
|
21
|
+
Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") })),
|
|
22
|
+
),
|
|
23
|
+
Effect.catch(providerFailure),
|
|
24
|
+
),
|
|
25
|
+
);
|
|
26
|
+
}).pipe(
|
|
27
|
+
Effect.catchTag("AuthUnavailable", () =>
|
|
28
|
+
Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") })),
|
|
29
|
+
),
|
|
30
|
+
);
|
|
31
|
+
}
|
|
@@ -2,6 +2,7 @@ import type { BetterAuthOptions, ValidateUserInfoResult, ValidateUserInfoSource
|
|
|
2
2
|
import { APIError } from "better-auth/api";
|
|
3
3
|
import { Effect, Exit } from "effect";
|
|
4
4
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
|
+
import { authRefusals } from "#authRefusal.ts";
|
|
5
6
|
import { fromStorage, type PolicyStorage, type SignInGate } from "#server/better-auth/signInGate.ts";
|
|
6
7
|
|
|
7
8
|
type SessionCreateBefore = NonNullable<NonNullable<NonNullable<NonNullable<BetterAuthOptions["databaseHooks"]>["session"]>["create"]>["before"]>;
|
|
@@ -9,8 +10,8 @@ type ValidateUserInfo = NonNullable<NonNullable<BetterAuthOptions["user"]>["vali
|
|
|
9
10
|
|
|
10
11
|
const REFUSED_MESSAGE = "This account may not sign in";
|
|
11
12
|
const UNAVAILABLE_MESSAGE = "Sign-in is temporarily unavailable";
|
|
12
|
-
const refused: ValidateUserInfoResult = { error:
|
|
13
|
-
const unavailable: ValidateUserInfoResult = { error:
|
|
13
|
+
const refused: ValidateUserInfoResult = { error: authRefusals.signInRefused.wire, errorDescription: REFUSED_MESSAGE };
|
|
14
|
+
const unavailable: ValidateUserInfoResult = { error: authRefusals.signInUnavailable.wire, errorDescription: UNAVAILABLE_MESSAGE };
|
|
14
15
|
|
|
15
16
|
function logged<A, E>(effect: Effect.Effect<A, E>) {
|
|
16
17
|
return Effect.tapCause(effect, (cause) => Effect.logError("Sign-in policy check failed", redact(cause)));
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { generateRandomString, makeSignature } from "better-auth/crypto";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
|
|
4
|
+
export const testUserEmail = Effect.sync(() => `test-${generateRandomString(8)}@example.com`);
|
|
5
|
+
|
|
6
|
+
export const signedSessionToken = Effect.fnUntraced(function* (token: string, secret: string) {
|
|
7
|
+
const signature = yield* Effect.promise(() => makeSignature(token, secret));
|
|
8
|
+
return `${token}.${signature}`;
|
|
9
|
+
});
|