@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
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
5
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
7
|
+
import { userDirectoryReads } from "#server/better-auth/userDirectoryReads.ts";
|
|
8
|
+
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
9
|
+
import type { AuthTableOptions } from "./tables.ts";
|
|
10
|
+
|
|
11
|
+
export function betterAuthUserDirectory<TRole extends string>(
|
|
12
|
+
access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
|
|
13
|
+
options?: AuthTableOptions,
|
|
14
|
+
) {
|
|
15
|
+
return Layer.effect(UserDirectory)(
|
|
16
|
+
Effect.gen(function* () {
|
|
17
|
+
const sql = yield* SqlClient.SqlClient;
|
|
18
|
+
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
19
|
+
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
20
|
+
const reads = yield* userDirectoryReads(access, options);
|
|
21
|
+
return {
|
|
22
|
+
...reads,
|
|
23
|
+
assignRole: (userId: string, role: string) =>
|
|
24
|
+
Schema.decodeUnknownEffect(access.Role)(role).pipe(
|
|
25
|
+
Effect.mapError(() => new AuthUnavailable({ message: "User role is not declared by the application" })),
|
|
26
|
+
Effect.flatMap((declared) => assignRole(access, userId, declared, options)),
|
|
27
|
+
Effect.provideService(SqlClient.SqlClient, sql),
|
|
28
|
+
Effect.provideService(Reactivity.Reactivity, reactivity),
|
|
29
|
+
),
|
|
30
|
+
};
|
|
31
|
+
}),
|
|
32
|
+
);
|
|
33
|
+
}
|
|
@@ -6,9 +6,9 @@ import {
|
|
|
6
6
|
type GetSession,
|
|
7
7
|
type SessionWithProviderAccounts,
|
|
8
8
|
} from "#server/adapters/betterAuthSessions.ts";
|
|
9
|
+
import { type BearerSessionsOptions, sessionHeaders } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
9
10
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
10
11
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
11
|
-
import { type BearerSessionsOptions, sessionHeaders } from "./bearerSessions.ts";
|
|
12
12
|
import { fromStorage, type PolicyStorage, type SignInGate } from "./signInGate.ts";
|
|
13
13
|
|
|
14
14
|
interface SessionStorage extends PolicyStorage {
|
|
@@ -2,10 +2,12 @@ import { Effect, Option, Schema } from "effect";
|
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
4
4
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
5
|
-
import {
|
|
5
|
+
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
6
6
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
7
7
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
8
|
-
import {
|
|
8
|
+
import { AssignRoles, LastRoleAssigner } from "#roles.ts";
|
|
9
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
10
|
+
import { roleKeys, userKeys } from "#users.ts";
|
|
9
11
|
|
|
10
12
|
function unavailable() {
|
|
11
13
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
@@ -48,7 +50,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
yield* sql`update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
|
|
51
|
-
yield* invalidateOnCommit([
|
|
53
|
+
yield* invalidateOnCommit(invalidationKeys([userKeys.item(userId), roleKeys.item(userId)]));
|
|
52
54
|
return true;
|
|
53
55
|
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
54
56
|
});
|
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { Duration, Effect } from "effect";
|
|
1
|
+
import type { Duration, Effect, Redacted } from "effect";
|
|
3
2
|
import type { BetterAuthHookError } from "./databaseHooks.ts";
|
|
4
3
|
|
|
5
4
|
interface Message {
|
|
6
|
-
readonly url: string
|
|
7
|
-
readonly user:
|
|
5
|
+
readonly url: Redacted.Redacted<string>;
|
|
6
|
+
readonly user: {
|
|
7
|
+
id: string;
|
|
8
|
+
email: string;
|
|
9
|
+
name: string;
|
|
10
|
+
};
|
|
8
11
|
}
|
|
9
12
|
|
|
10
13
|
export type AuthEmail = Message &
|
|
11
14
|
(
|
|
12
|
-
| { readonly _tag: "ConfirmAccount"; readonly token: string }
|
|
13
|
-
| { readonly _tag: "ApproveEmailChange"; readonly token: string
|
|
14
|
-
| { readonly _tag: "ConfirmNewAddress"; readonly token: string
|
|
15
|
-
| { readonly _tag: "ResetPassword"; readonly token: string }
|
|
15
|
+
| { readonly _tag: "ConfirmAccount"; readonly token: Redacted.Redacted<string> }
|
|
16
|
+
| { readonly _tag: "ApproveEmailChange"; readonly token: Redacted.Redacted<string>; readonly newEmail: string }
|
|
17
|
+
| { readonly _tag: "ConfirmNewAddress"; readonly token: Redacted.Redacted<string>; readonly newEmail: string }
|
|
18
|
+
| { readonly _tag: "ResetPassword"; readonly token: Redacted.Redacted<string> }
|
|
16
19
|
| { readonly _tag: "AccountAlreadyExists" }
|
|
17
20
|
);
|
|
18
21
|
|
|
@@ -1,36 +1,17 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
-
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
-
import { type MountedAuth, type MountRouteOptions, response } from "#server/better-auth/adapters/response.ts";
|
|
5
|
-
import { providerFailure } from "#server/providerFailure.ts";
|
|
6
|
-
import { clientIpHeaders } from "./clientIp.ts";
|
|
1
|
+
import { Context, Effect } from "effect";
|
|
2
|
+
import { HttpRouter, type HttpServerError, type HttpServerRequest, type HttpServerResponse } from "effect/http";
|
|
7
3
|
|
|
8
|
-
export
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") })),
|
|
23
|
-
),
|
|
24
|
-
Effect.catch(providerFailure),
|
|
25
|
-
),
|
|
26
|
-
);
|
|
27
|
-
}).pipe(
|
|
28
|
-
Effect.catch(() =>
|
|
29
|
-
Effect.succeed(
|
|
30
|
-
HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") }),
|
|
31
|
-
),
|
|
32
|
-
),
|
|
33
|
-
),
|
|
34
|
-
),
|
|
35
|
-
);
|
|
36
|
-
}
|
|
4
|
+
export class AuthRouteHandler extends Context.Service<
|
|
5
|
+
AuthRouteHandler,
|
|
6
|
+
{
|
|
7
|
+
readonly basePath?: `/${string}` | "" | undefined;
|
|
8
|
+
readonly handle: Effect.Effect<HttpServerResponse.HttpServerResponse, HttpServerError.RequestError, HttpServerRequest.HttpServerRequest>;
|
|
9
|
+
}
|
|
10
|
+
>()("@shivaedev/identity/AuthRouteHandler") {}
|
|
11
|
+
|
|
12
|
+
export const mountRoutes = HttpRouter.use((router) =>
|
|
13
|
+
Effect.gen(function* () {
|
|
14
|
+
const handler = yield* AuthRouteHandler;
|
|
15
|
+
yield* router.add("*", `${handler.basePath ?? "/api/auth"}/*`, handler.handle);
|
|
16
|
+
}),
|
|
17
|
+
);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DateTime, Effect, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
-
import { migrateBetterAuth } from "
|
|
3
|
+
import { migrateBetterAuth } from "#server/better-auth/adapters/migrate.ts";
|
|
4
4
|
|
|
5
5
|
const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
|
|
6
6
|
|
|
@@ -1,37 +1,78 @@
|
|
|
1
1
|
import type { AuthContext } from "better-auth";
|
|
2
2
|
import type { testUtils } from "better-auth/plugins";
|
|
3
3
|
import { Clock, Effect } from "effect";
|
|
4
|
+
import { signedSessionToken, testUserEmail } from "#server/better-auth/adapters/testingCredentials.ts";
|
|
4
5
|
|
|
5
6
|
type TestContext = ReturnType<ReturnType<typeof testUtils>["init"]>["context"];
|
|
7
|
+
type UserFields = NonNullable<Parameters<TestContext["test"]["createUser"]>[0]>;
|
|
8
|
+
type Login = Awaited<ReturnType<TestContext["test"]["login"]>>;
|
|
6
9
|
type AccountContext = Pick<AuthContext, "internalAdapter">;
|
|
10
|
+
type SessionContext = AccountContext & Pick<AuthContext, "sessionConfig" | "secret" | "authCookies" | "baseURL">;
|
|
11
|
+
|
|
12
|
+
function saveUser(context: AccountContext, fields: UserFields) {
|
|
13
|
+
return Effect.flatMap(testUserEmail, (email) =>
|
|
14
|
+
Effect.promise(() =>
|
|
15
|
+
context.internalAdapter.createUser({ email, emailVerified: true, image: null, name: "Test User", ...fields }, { method: "test" }),
|
|
16
|
+
),
|
|
17
|
+
);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function cookieSameSite(value: string | undefined) {
|
|
21
|
+
switch (value?.toLowerCase()) {
|
|
22
|
+
case "strict":
|
|
23
|
+
return "Strict";
|
|
24
|
+
case "none":
|
|
25
|
+
return "None";
|
|
26
|
+
default:
|
|
27
|
+
return "Lax";
|
|
28
|
+
}
|
|
29
|
+
}
|
|
7
30
|
|
|
8
31
|
export const signedInUser = Effect.fnUntraced(function* (
|
|
9
|
-
auth: { readonly $context: Promise<
|
|
32
|
+
auth: { readonly $context: Promise<SessionContext> },
|
|
10
33
|
{
|
|
11
34
|
providerAccounts = [],
|
|
12
35
|
...fields
|
|
13
|
-
}:
|
|
36
|
+
}: UserFields & {
|
|
14
37
|
readonly providerAccounts?: readonly { readonly providerId: string; readonly accountId: string }[];
|
|
15
38
|
},
|
|
16
|
-
) {
|
|
17
|
-
const
|
|
18
|
-
const user = yield*
|
|
39
|
+
): Effect.fn.Return<Login> {
|
|
40
|
+
const context = yield* Effect.promise(() => auth.$context);
|
|
41
|
+
const user = yield* saveUser(context, fields);
|
|
19
42
|
for (const { providerId, accountId } of providerAccounts) {
|
|
20
|
-
yield* Effect.promise(() => internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
43
|
+
yield* Effect.promise(() => context.internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
21
44
|
}
|
|
22
45
|
return yield* signInAgain(auth, user.id);
|
|
23
46
|
});
|
|
24
47
|
|
|
25
48
|
export const signInAgain = Effect.fnUntraced(function* (
|
|
26
|
-
auth: { readonly $context: Promise<
|
|
49
|
+
auth: { readonly $context: Promise<SessionContext> },
|
|
27
50
|
userId: string,
|
|
28
|
-
) {
|
|
29
|
-
const {
|
|
51
|
+
): Effect.fn.Return<Login> {
|
|
52
|
+
const { internalAdapter, sessionConfig, authCookies, secret, baseURL } = yield* Effect.promise(() => auth.$context);
|
|
30
53
|
const now = yield* Clock.currentTimeMillis;
|
|
31
|
-
const
|
|
54
|
+
const session = yield* Effect.promise(() => internalAdapter.createSession(userId, false, {}, true));
|
|
32
55
|
const expiresAt = new Date(now + sessionConfig.expiresIn * 1000);
|
|
33
|
-
yield* Effect.promise(() => internalAdapter.updateSession(
|
|
34
|
-
|
|
56
|
+
yield* Effect.promise(() => internalAdapter.updateSession(session.token, { expiresAt }));
|
|
57
|
+
const user = yield* Effect.promise(() => internalAdapter.findUserById(userId));
|
|
58
|
+
if (user === null) {
|
|
59
|
+
return yield* Effect.die(`User not found: ${userId}`);
|
|
60
|
+
}
|
|
61
|
+
const value = yield* signedSessionToken(session.token, secret);
|
|
62
|
+
const { name, attributes } = authCookies.sessionToken;
|
|
63
|
+
const cookies: Login["cookies"] = [
|
|
64
|
+
{
|
|
65
|
+
domain: URL.canParse(baseURL) ? new URL(baseURL).hostname : "localhost",
|
|
66
|
+
httpOnly: attributes.httpOnly ?? true,
|
|
67
|
+
name,
|
|
68
|
+
path: attributes.path || "/",
|
|
69
|
+
sameSite: cookieSameSite(attributes.sameSite),
|
|
70
|
+
secure: attributes.secure ?? false,
|
|
71
|
+
value,
|
|
72
|
+
...(attributes.maxAge ? { expires: Math.floor(now / 1000) + attributes.maxAge } : {}),
|
|
73
|
+
},
|
|
74
|
+
];
|
|
75
|
+
return { cookies, headers: new Headers({ cookie: `${name}=${value}` }), session: { ...session, expiresAt }, token: session.token, user };
|
|
35
76
|
});
|
|
36
77
|
|
|
37
78
|
export async function storedProviderAccounts(auth: { readonly $context: Promise<AccountContext> }, userId: string) {
|
|
@@ -48,12 +89,21 @@ export async function storedProviderAccounts(auth: { readonly $context: Promise<
|
|
|
48
89
|
}
|
|
49
90
|
|
|
50
91
|
export const passwordUser = Effect.fnUntraced(function* (
|
|
51
|
-
auth: { readonly $context: Promise<
|
|
52
|
-
{
|
|
92
|
+
auth: { readonly $context: Promise<AccountContext & { readonly password: Pick<AuthContext["password"], "hash"> }> },
|
|
93
|
+
{
|
|
94
|
+
password,
|
|
95
|
+
passwordHash,
|
|
96
|
+
...fields
|
|
97
|
+
}: UserFields & { readonly email: string } & (
|
|
98
|
+
| { readonly password: string; readonly passwordHash?: never }
|
|
99
|
+
| { readonly passwordHash: string; readonly password?: never }
|
|
100
|
+
),
|
|
53
101
|
) {
|
|
54
|
-
const
|
|
55
|
-
const user = yield*
|
|
56
|
-
const hash = yield* Effect.promise(() =>
|
|
57
|
-
yield* Effect.promise(() =>
|
|
102
|
+
const context = yield* Effect.promise(() => auth.$context);
|
|
103
|
+
const user = yield* saveUser(context, fields);
|
|
104
|
+
const hash = passwordHash ?? (yield* Effect.promise(() => context.password.hash(password)));
|
|
105
|
+
yield* Effect.promise(() =>
|
|
106
|
+
context.internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id }),
|
|
107
|
+
);
|
|
58
108
|
return user;
|
|
59
109
|
});
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
6
|
+
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
7
|
+
|
|
8
|
+
function unavailable() {
|
|
9
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends string>(
|
|
13
|
+
access: Pick<AccessPolicy<TRole>, "Role">,
|
|
14
|
+
options?: AuthTableOptions,
|
|
15
|
+
) {
|
|
16
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
17
|
+
const { user } = tables(options);
|
|
18
|
+
const readPage = SqlSchema.findAll({
|
|
19
|
+
execute: ({ cursor, limit }) => sql`select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
20
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
21
|
+
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
22
|
+
Request: UserListInput,
|
|
23
|
+
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
24
|
+
});
|
|
25
|
+
const readRole = SqlSchema.findOneOption({
|
|
26
|
+
execute: (id) => sql`select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
27
|
+
Request: Schema.String,
|
|
28
|
+
Result: Schema.Struct({ role: access.Role }),
|
|
29
|
+
});
|
|
30
|
+
const readNames = SqlSchema.findAll({
|
|
31
|
+
execute: (ids) => sql`select id, ${sql(user.name)} as name from ${sql(user.table)} where id in ${sql.in(ids)} order by id`,
|
|
32
|
+
Request: Schema.Array(Schema.String),
|
|
33
|
+
Result: AccountName,
|
|
34
|
+
});
|
|
35
|
+
return {
|
|
36
|
+
list: Effect.fn("UserDirectory.list")(function* (input: typeof UserListInput.Type) {
|
|
37
|
+
const rows = yield* readPage(input).pipe(Effect.mapError(unavailable));
|
|
38
|
+
const users = rows.slice(0, input.limit);
|
|
39
|
+
return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
|
|
40
|
+
}),
|
|
41
|
+
names: (ids: readonly string[]) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
42
|
+
role: Effect.fn("UserDirectory.role")(function* (id: string) {
|
|
43
|
+
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
44
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "User not found" });
|
|
45
|
+
}),
|
|
46
|
+
};
|
|
47
|
+
});
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type { Auth } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
-
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
3
|
|
|
6
4
|
export interface UserProfile {
|
|
7
5
|
readonly id: string;
|
|
@@ -9,22 +7,18 @@ export interface UserProfile {
|
|
|
9
7
|
readonly name: string;
|
|
10
8
|
}
|
|
11
9
|
|
|
10
|
+
export interface UserProfileStorage {
|
|
11
|
+
readonly findByIds: (userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable>;
|
|
12
|
+
}
|
|
13
|
+
|
|
12
14
|
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (
|
|
13
|
-
|
|
15
|
+
storage: UserProfileStorage,
|
|
14
16
|
userIds: readonly string[],
|
|
15
17
|
): Effect.fn.Return<readonly UserProfile[], AuthUnavailable> {
|
|
16
18
|
const ids = [...new Set(userIds)];
|
|
17
19
|
if (ids.length === 0) {
|
|
18
20
|
return [];
|
|
19
21
|
}
|
|
20
|
-
const users = yield*
|
|
21
|
-
const { adapter } = await auth.$context;
|
|
22
|
-
return adapter.findMany<UserProfile>({
|
|
23
|
-
limit: ids.length,
|
|
24
|
-
model: "user",
|
|
25
|
-
select: ["id", "name", "image"],
|
|
26
|
-
where: [{ field: "id", operator: "in", value: ids }],
|
|
27
|
-
});
|
|
28
|
-
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
22
|
+
const users = yield* storage.findByIds(ids);
|
|
29
23
|
return users.map(({ id, name, image }) => ({ id, image: image ?? null, name }));
|
|
30
24
|
});
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Context, Effect, Option, Schema } from "effect";
|
|
2
|
+
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
|
|
4
|
+
import { providerAccountsUser } from "./providerAccountsUser.ts";
|
|
5
|
+
import type { SessionShape } from "./session.ts";
|
|
6
|
+
|
|
7
|
+
export const currentSessionContext = Effect.fnUntraced(function* <TSession extends SessionShape, R>(
|
|
8
|
+
id: string,
|
|
9
|
+
lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, R>,
|
|
10
|
+
) {
|
|
11
|
+
const session = yield* lookup;
|
|
12
|
+
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
13
|
+
return yield* new Unauthorized({ message: "Authentication required" });
|
|
14
|
+
}
|
|
15
|
+
let context = yield* Effect.context<never>();
|
|
16
|
+
if (Option.isSome(Context.getOption(context, SessionUser))) {
|
|
17
|
+
context = Context.add(context, SessionUser, Schema.decodeUnknownSync(SessionUserSchema)(session.value.user));
|
|
18
|
+
}
|
|
19
|
+
if (Option.isSome(Context.getOption(context, SessionUserWithProviderAccounts))) {
|
|
20
|
+
context = Context.add(context, SessionUserWithProviderAccounts, yield* providerAccountsUser(session.value.user));
|
|
21
|
+
}
|
|
22
|
+
return context;
|
|
23
|
+
});
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
import { Context, type Effect, type Option, Schema } from "effect";
|
|
2
|
+
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { SessionUserValue } from "#identity.ts";
|
|
4
|
+
|
|
5
|
+
export const OauthGrant = Schema.Struct({ clientId: Schema.String, scopes: Schema.Array(Schema.String) });
|
|
6
|
+
export type OauthGrant = typeof OauthGrant.Type;
|
|
7
|
+
|
|
8
|
+
export class OauthGrants extends Context.Service<
|
|
9
|
+
OauthGrants,
|
|
10
|
+
{
|
|
11
|
+
readonly list: (
|
|
12
|
+
userId: string,
|
|
13
|
+
page: { readonly limit: number; readonly offset?: number },
|
|
14
|
+
) => Effect.Effect<readonly OauthGrant[], AuthUnavailable>;
|
|
15
|
+
readonly revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
16
|
+
readonly revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
17
|
+
readonly resolveGrant: (
|
|
18
|
+
grantId: string,
|
|
19
|
+
userId: string,
|
|
20
|
+
clientId: string,
|
|
21
|
+
) => Effect.Effect<Option.Option<{ readonly user: SessionUserValue; readonly scopes: readonly string[] }>, AuthUnavailable>;
|
|
22
|
+
}
|
|
23
|
+
>()("@shivaedev/identity/OauthGrants") {}
|
package/src/server/origin.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { Headers, HttpServerRequest } from "effect/http";
|
|
3
|
-
import { localTransport } from "#server/local.ts";
|
|
4
3
|
import { transportHeaders } from "#server/transportHeaders.ts";
|
|
5
4
|
export interface OriginRequest {
|
|
6
5
|
readonly headers: Headers.Headers;
|
|
@@ -14,15 +13,6 @@ export interface TrustedOriginsOptions {
|
|
|
14
13
|
readonly missing: "allow" | "reject";
|
|
15
14
|
readonly sameOrigin?: { readonly trustedProxy?: string | undefined };
|
|
16
15
|
}
|
|
17
|
-
export function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy {
|
|
18
|
-
const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
|
|
19
|
-
return (request) =>
|
|
20
|
-
Option.match(request.origin, {
|
|
21
|
-
onNone: () => options.missing === "allow",
|
|
22
|
-
onSome: (value) =>
|
|
23
|
-
options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
16
|
export function originRequest(headers: Headers.Headers, rpc: string, remoteAddress: Option.Option<string> = Option.none()): OriginRequest {
|
|
27
17
|
return {
|
|
28
18
|
headers,
|
|
@@ -5,12 +5,10 @@ import type { RpcMiddleware } from "effect/rpc";
|
|
|
5
5
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
6
6
|
import { forbidden } from "@shivaedev/access/refusal.ts";
|
|
7
7
|
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
8
|
-
import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
9
8
|
import type { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
10
9
|
import { Identity, SessionUser } from "#identity.ts";
|
|
11
10
|
import type { IdentityFailures } from "#middleware.ts";
|
|
12
11
|
import { hasPermission } from "#permission.ts";
|
|
13
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
14
12
|
import { recheckSession } from "./recheckSession.ts";
|
|
15
13
|
import { revalidateStream } from "./revalidateStream.ts";
|
|
16
14
|
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
@@ -25,11 +23,11 @@ export function permissionLayer<TMiddleware>(
|
|
|
25
23
|
return Layer.effect(
|
|
26
24
|
middleware,
|
|
27
25
|
Effect.map(SessionPolicy, (policy) => {
|
|
28
|
-
const guard: RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never> = (effect, { headers, rpc
|
|
26
|
+
const guard: RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never> = (effect, { headers, rpc }) => {
|
|
29
27
|
const lookup = Effect.tap(recheckSession(headers, rpc._tag), (session) =>
|
|
30
28
|
Option.isSome(session) && !hasPermission(session.value.user, permission) ? Effect.fail(forbidden(permission)) : Effect.void,
|
|
31
29
|
);
|
|
32
|
-
return
|
|
30
|
+
return effect.pipe(
|
|
33
31
|
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, lookup))),
|
|
34
32
|
(invocation) =>
|
|
35
33
|
Effect.andThen(
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import type { Rpc } from "effect/rpc";
|
|
3
|
+
import { type QuerySubscription, querySubscription } from "@shivaedev/contract/querySubscription.ts";
|
|
4
|
+
import { CurrentViewer, type PolicyChannels } from "@shivaedev/contract/readPolicy.ts";
|
|
5
|
+
import type { MissingReadPolicy, QueryReadDenied } from "@shivaedev/contract/readPolicyErrors.ts";
|
|
6
|
+
import type { QueryReference } from "@shivaedev/contract/serverMetadata.ts";
|
|
7
|
+
import { Identity } from "#identity.ts";
|
|
8
|
+
|
|
9
|
+
export function resolveChanges<TRpc extends Rpc.Any>(
|
|
10
|
+
rpc: TRpc,
|
|
11
|
+
references: readonly QueryReference[],
|
|
12
|
+
): Effect.Effect<
|
|
13
|
+
QuerySubscription<PolicyChannels<TRpc>["error"], PolicyChannels<TRpc>["services"]>,
|
|
14
|
+
PolicyChannels<TRpc>["error"] | MissingReadPolicy | QueryReadDenied,
|
|
15
|
+
PolicyChannels<TRpc>["services"]
|
|
16
|
+
>;
|
|
17
|
+
export function resolveChanges(rpc: Rpc.Any, references: readonly QueryReference[]) {
|
|
18
|
+
return Effect.fnUntraced(function* () {
|
|
19
|
+
const identity = yield* Effect.serviceOption(Identity);
|
|
20
|
+
const current = yield* CurrentViewer;
|
|
21
|
+
const viewer = Option.orElse(identity, () => current);
|
|
22
|
+
return yield* querySubscription(rpc, references, viewer);
|
|
23
|
+
})();
|
|
24
|
+
}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { Effect, Option } from "effect";
|
|
1
|
+
import { Effect, type Option } from "effect";
|
|
2
2
|
import { type Rpc, RpcSchema } from "effect/rpc";
|
|
3
|
-
import {
|
|
3
|
+
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { currentSessionContext } from "./currentSessionContext.ts";
|
|
4
5
|
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
5
6
|
import type { SessionShape } from "./session.ts";
|
|
6
7
|
import { revalidateSession } from "./socketSession.ts";
|
|
@@ -14,12 +15,7 @@ export function revalidateStream<TSession extends SessionShape, TLookupRequireme
|
|
|
14
15
|
if (!RpcSchema.isStreamSchema(rpc.successSchema)) {
|
|
15
16
|
return effect;
|
|
16
17
|
}
|
|
17
|
-
const check = Effect.
|
|
18
|
-
const session = yield* lookup;
|
|
19
|
-
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
20
|
-
return yield* new Unauthorized({ message: "Authentication required" });
|
|
21
|
-
}
|
|
22
|
-
});
|
|
18
|
+
const check = Effect.asVoid(currentSessionContext(id, lookup));
|
|
23
19
|
return Effect.flatMap(SessionPolicy, (policy) =>
|
|
24
20
|
Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds")),
|
|
25
21
|
);
|
package/src/server/session.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
-
import {
|
|
3
|
+
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
4
|
import { type AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
5
5
|
import {
|
|
6
6
|
Identity,
|
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
type SessionUserWithProviderAccountsValue,
|
|
13
13
|
} from "#identity.ts";
|
|
14
14
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
15
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
16
15
|
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
17
16
|
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
18
17
|
import { lookupSession, sessionRequest } from "./lookupSession.ts";
|
|
@@ -39,16 +38,17 @@ export function authenticatedLayer() {
|
|
|
39
38
|
Effect.map(
|
|
40
39
|
SessionPolicy,
|
|
41
40
|
(policy) =>
|
|
42
|
-
(effect, { headers, rpc
|
|
41
|
+
(effect, { headers, rpc }) =>
|
|
43
42
|
Effect.gen(function* () {
|
|
44
43
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
45
44
|
if (Option.isNone(session)) {
|
|
46
45
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
47
46
|
}
|
|
48
47
|
const id = yield* identified(session.value.user.id);
|
|
49
|
-
return yield*
|
|
48
|
+
return yield* effect.pipe(
|
|
50
49
|
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
51
50
|
Effect.provideService(Identity, { id }),
|
|
51
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
52
52
|
Effect.annotateLogs({ userId: id }),
|
|
53
53
|
);
|
|
54
54
|
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
@@ -61,17 +61,18 @@ export function maybeAuthenticatedLayer() {
|
|
|
61
61
|
Effect.map(
|
|
62
62
|
SessionPolicy,
|
|
63
63
|
(policy) =>
|
|
64
|
-
(effect, { headers, rpc
|
|
64
|
+
(effect, { headers, rpc }) =>
|
|
65
65
|
Effect.gen(function* () {
|
|
66
66
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
67
67
|
if (Option.isNone(session)) {
|
|
68
|
-
const invocation =
|
|
68
|
+
const invocation = effect.pipe(Effect.provideService(CurrentViewer, Option.none()));
|
|
69
69
|
return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
|
|
70
70
|
}
|
|
71
71
|
const id = yield* identified(session.value.user.id);
|
|
72
|
-
return yield*
|
|
72
|
+
return yield* effect.pipe(
|
|
73
73
|
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
74
74
|
Effect.provideService(OptionalIdentity, Option.some({ id })),
|
|
75
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
75
76
|
Effect.annotateLogs({ userId: id }),
|
|
76
77
|
);
|
|
77
78
|
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
@@ -92,6 +93,7 @@ export function withSessionUser(headers: Headers.Headers, operation: string) {
|
|
|
92
93
|
const id = yield* identified(session.value.user.id);
|
|
93
94
|
return yield* effect.pipe(
|
|
94
95
|
Effect.provideService(Identity, { id }),
|
|
96
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
95
97
|
Effect.provideService(SessionUser, user),
|
|
96
98
|
Effect.annotateLogs({ userId: id }),
|
|
97
99
|
);
|
|
@@ -103,8 +105,8 @@ export function authenticatedUserLayer() {
|
|
|
103
105
|
Effect.map(
|
|
104
106
|
SessionPolicy,
|
|
105
107
|
(policy) =>
|
|
106
|
-
(effect, { headers, rpc
|
|
107
|
-
|
|
108
|
+
(effect, { headers, rpc }) =>
|
|
109
|
+
effect.pipe(
|
|
108
110
|
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)))),
|
|
109
111
|
withSessionUser(headers, rpc._tag),
|
|
110
112
|
Effect.provideService(SessionPolicy, policy),
|
|
@@ -122,7 +124,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
122
124
|
Effect.map(
|
|
123
125
|
SessionPolicy,
|
|
124
126
|
(policy) =>
|
|
125
|
-
(effect, { headers, rpc
|
|
127
|
+
(effect, { headers, rpc }) =>
|
|
126
128
|
Effect.gen(function* () {
|
|
127
129
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
128
130
|
if (Option.isNone(session)) {
|
|
@@ -131,9 +133,10 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
131
133
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
132
134
|
const { id } = user;
|
|
133
135
|
yield* identified(id);
|
|
134
|
-
return yield*
|
|
136
|
+
return yield* effect.pipe(
|
|
135
137
|
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
136
138
|
Effect.provideService(Identity, { id }),
|
|
139
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
137
140
|
Effect.provideService(SessionUser, user),
|
|
138
141
|
Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts }),
|
|
139
142
|
Effect.annotateLogs({ userId: id }),
|
package/src/server/tracing.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { Cause,
|
|
1
|
+
import { Cause, Effect, ErrorReporter, Exit, Layer, Option, Predicate, Random } from "effect";
|
|
2
2
|
import { Headers } from "effect/http";
|
|
3
|
-
import { KeyScope } from "@shivaedev/contract/serverMetadata.ts";
|
|
4
3
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
4
|
import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
|
|
6
5
|
import { isSensitiveKey, REDACTED, redactText, type SensitiveKey } from "@shivaedev/errors/sensitive.ts";
|
|
7
6
|
import { RequestId } from "#identity.ts";
|
|
8
|
-
import {
|
|
9
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
7
|
+
import { RequestTracing } from "#middleware.ts";
|
|
10
8
|
export interface RequestTracingOptions {
|
|
11
9
|
readonly header?: string;
|
|
12
10
|
readonly sensitive?: SensitiveKey;
|
|
@@ -61,11 +59,8 @@ export function requestTracingLayer(options: RequestTracingOptions = {}): Layer.
|
|
|
61
59
|
Effect.gen(function* () {
|
|
62
60
|
const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
|
|
63
61
|
yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
);
|
|
67
|
-
const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
|
|
68
|
-
return yield* invocation.pipe(
|
|
62
|
+
|
|
63
|
+
return yield* effect.pipe(
|
|
69
64
|
Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))),
|
|
70
65
|
Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)),
|
|
71
66
|
Effect.provideService(RequestId, requestId),
|