@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,26 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import { SqlClient } 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 } from "#server/better-auth/adapters/tables.ts";
|
|
6
|
+
export declare const userDirectoryReads: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">, options?: AuthTableOptions | undefined) => Effect.Effect<{
|
|
7
|
+
list: (input: {
|
|
8
|
+
readonly cursor?: string;
|
|
9
|
+
readonly limit: number;
|
|
10
|
+
}) => Effect.Effect<{
|
|
11
|
+
next: Option.Option<string>;
|
|
12
|
+
users: {
|
|
13
|
+
readonly createdAt: import("effect/DateTime").Utc;
|
|
14
|
+
readonly email: string;
|
|
15
|
+
readonly id: string;
|
|
16
|
+
readonly name: string;
|
|
17
|
+
readonly role: TRole;
|
|
18
|
+
}[];
|
|
19
|
+
}, AuthUnavailable, never>;
|
|
20
|
+
names: (ids: readonly string[]) => Effect.Effect<{
|
|
21
|
+
readonly id: string;
|
|
22
|
+
readonly name: string;
|
|
23
|
+
}[], AuthUnavailable, never>;
|
|
24
|
+
role: (id: string) => Effect.Effect<TRole, AuthUnavailable | NotFound, never>;
|
|
25
|
+
}, never, SqlClient.SqlClient>;
|
|
26
|
+
//# sourceMappingURL=userDirectoryReads.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,wCAAwC,CAAC;AAOvF,eAAO,MAAM,kBAAkB,GAAgC,KAAK,SAAS,MAAM;;;;;;;;;;;;;;iBA6BpE,SAAS,MAAM,EAAE;;;;;8BAM9B,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
5
|
+
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
6
|
+
function unavailable() {
|
|
7
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
8
|
+
}
|
|
9
|
+
export const userDirectoryReads = Effect.fnUntraced(function* (access, options) {
|
|
10
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
11
|
+
const { user } = tables(options);
|
|
12
|
+
const readPage = SqlSchema.findAll({
|
|
13
|
+
execute: ({ cursor, limit }) => sql `select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
14
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
15
|
+
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
16
|
+
Request: UserListInput,
|
|
17
|
+
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
18
|
+
});
|
|
19
|
+
const readRole = SqlSchema.findOneOption({
|
|
20
|
+
execute: (id) => sql `select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
21
|
+
Request: Schema.String,
|
|
22
|
+
Result: Schema.Struct({ role: access.Role }),
|
|
23
|
+
});
|
|
24
|
+
const readNames = SqlSchema.findAll({
|
|
25
|
+
execute: (ids) => sql `select id, ${sql(user.name)} as name from ${sql(user.table)} where id in ${sql.in(ids)} order by id`,
|
|
26
|
+
Request: Schema.Array(Schema.String),
|
|
27
|
+
Result: AccountName,
|
|
28
|
+
});
|
|
29
|
+
return {
|
|
30
|
+
list: Effect.fn("UserDirectory.list")(function* (input) {
|
|
31
|
+
const rows = yield* readPage(input).pipe(Effect.mapError(unavailable));
|
|
32
|
+
const users = rows.slice(0, input.limit);
|
|
33
|
+
return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none(), users };
|
|
34
|
+
}),
|
|
35
|
+
names: (ids) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
36
|
+
role: Effect.fn("UserDirectory.role")(function* (id) {
|
|
37
|
+
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
38
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "User not found" });
|
|
39
|
+
}),
|
|
40
|
+
};
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=userDirectoryReads.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { Auth } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
3
|
export interface UserProfile {
|
|
@@ -6,9 +5,8 @@ export interface UserProfile {
|
|
|
6
5
|
readonly image: string | null;
|
|
7
6
|
readonly name: string;
|
|
8
7
|
}
|
|
9
|
-
export
|
|
10
|
-
readonly
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
}, userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable, never>;
|
|
8
|
+
export interface UserProfileStorage {
|
|
9
|
+
readonly findByIds: (userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable>;
|
|
10
|
+
}
|
|
11
|
+
export declare const userProfiles: (storage: UserProfileStorage, userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable, never>;
|
|
14
12
|
//# sourceMappingURL=userProfiles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userProfiles.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"userProfiles.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAErE,MAAM,WAAW,WAAW;IAC3B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IAClC,QAAQ,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,SAAS,WAAW,EAAE,EAAE,eAAe,CAAC,CAAC;CAC3G;AAED,eAAO,MAAM,YAAY,4HAUvB,CAAC"}
|
|
@@ -1,19 +1,10 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
-
|
|
3
|
-
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (auth, userIds) {
|
|
2
|
+
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (storage, userIds) {
|
|
4
3
|
const ids = [...new Set(userIds)];
|
|
5
4
|
if (ids.length === 0) {
|
|
6
5
|
return [];
|
|
7
6
|
}
|
|
8
|
-
const users = yield*
|
|
9
|
-
const { adapter } = await auth.$context;
|
|
10
|
-
return adapter.findMany({
|
|
11
|
-
limit: ids.length,
|
|
12
|
-
model: "user",
|
|
13
|
-
select: ["id", "name", "image"],
|
|
14
|
-
where: [{ field: "id", operator: "in", value: ids }],
|
|
15
|
-
});
|
|
16
|
-
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
7
|
+
const users = yield* storage.findByIds(ids);
|
|
17
8
|
return users.map(({ id, name, image }) => ({ id, image: image ?? null, name }));
|
|
18
9
|
});
|
|
19
10
|
//# sourceMappingURL=userProfiles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userProfiles.js","sourceRoot":"","sources":["../../../src/server/better-auth/userProfiles.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"userProfiles.js","sourceRoot":"","sources":["../../../src/server/better-auth/userProfiles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAahC,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,EACvE,OAA2B,EAC3B,OAA0B;IAE1B,MAAM,GAAG,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAClC,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IAC5C,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,IAAI,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACjF,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Context, Effect, Option } from "effect";
|
|
2
|
+
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { SessionShape } from "./session.ts";
|
|
4
|
+
export declare const currentSessionContext: <TSession extends SessionShape, R>(id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, R>) => Effect.Effect<Context.Context<never>, AuthUnavailable | Forbidden | Unauthorized, R>;
|
|
5
|
+
//# sourceMappingURL=currentSessionContext.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"currentSessionContext.d.ts","sourceRoot":"","sources":["../../src/server/currentSessionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGnG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,eAAO,MAAM,qBAAqB,GAAgC,QAAQ,SAAS,YAAY,EAAE,CAAC,qLAgBhG,CAAC"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Context, Effect, Option, Schema } from "effect";
|
|
2
|
+
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
|
|
4
|
+
import { providerAccountsUser } from "./providerAccountsUser.js";
|
|
5
|
+
export const currentSessionContext = Effect.fnUntraced(function* (id, lookup) {
|
|
6
|
+
const session = yield* lookup;
|
|
7
|
+
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
8
|
+
return yield* new Unauthorized({ message: "Authentication required" });
|
|
9
|
+
}
|
|
10
|
+
let context = yield* Effect.context();
|
|
11
|
+
if (Option.isSome(Context.getOption(context, SessionUser))) {
|
|
12
|
+
context = Context.add(context, SessionUser, Schema.decodeUnknownSync(SessionUserSchema)(session.value.user));
|
|
13
|
+
}
|
|
14
|
+
if (Option.isSome(Context.getOption(context, SessionUserWithProviderAccounts))) {
|
|
15
|
+
context = Context.add(context, SessionUserWithProviderAccounts, yield* providerAccountsUser(session.value.user));
|
|
16
|
+
}
|
|
17
|
+
return context;
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=currentSessionContext.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"currentSessionContext.js","sourceRoot":"","sources":["../../src/server/currentSessionContext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,EAAwC,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,+BAA+B,EAAE,MAAM,cAAc,CAAC;AAC/F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AAGjE,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/D,EAAU,EACV,MAA8E;IAE9E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;QAC5D,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC;IAC7C,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC;QAC5D,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9G,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,OAAO,EAAE,+BAA+B,CAAC,CAAC,EAAE,CAAC;QAChF,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,+BAA+B,EAAE,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAClH,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
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
|
+
export declare const OauthGrant: Schema.Struct<{
|
|
5
|
+
readonly clientId: Schema.String;
|
|
6
|
+
readonly scopes: Schema.$Array<Schema.String>;
|
|
7
|
+
}>;
|
|
8
|
+
export type OauthGrant = typeof OauthGrant.Type;
|
|
9
|
+
declare const OauthGrants_base: Context.ServiceClass<OauthGrants, "@shivaedev/identity/OauthGrants", {
|
|
10
|
+
readonly list: (userId: string, page: {
|
|
11
|
+
readonly limit: number;
|
|
12
|
+
readonly offset?: number;
|
|
13
|
+
}) => Effect.Effect<readonly OauthGrant[], AuthUnavailable>;
|
|
14
|
+
readonly revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
15
|
+
readonly revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
16
|
+
readonly resolveGrant: (grantId: string, userId: string, clientId: string) => Effect.Effect<Option.Option<{
|
|
17
|
+
readonly user: SessionUserValue;
|
|
18
|
+
readonly scopes: readonly string[];
|
|
19
|
+
}>, AuthUnavailable>;
|
|
20
|
+
}>;
|
|
21
|
+
export declare class OauthGrants extends OauthGrants_base {
|
|
22
|
+
}
|
|
23
|
+
export {};
|
|
24
|
+
//# sourceMappingURL=oauthGrants.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthGrants.d.ts","sourceRoot":"","sources":["../../src/server/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,eAAO,MAAM,UAAU;;;EAAkF,CAAC;AAC1G,MAAM,MAAM,UAAU,GAAG,OAAO,UAAU,CAAC,IAAI,CAAC;;mBAK/B,CACd,MAAM,EAAE,MAAM,EACd,IAAI,EAAE;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KACtD,MAAM,CAAC,MAAM,CAAC,SAAS,UAAU,EAAE,EAAE,eAAe,CAAC;2BACnC,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC;+BACtE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,eAAe,CAAC;2BAC5D,CACtB,OAAO,EAAE,MAAM,EACf,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,KACZ,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC;QAAE,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAA;KAAE,CAAC,EAAE,eAAe,CAAC;;AAb7H,qBAAa,WAAY,SAAQ,gBAeK;CAAG"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Context, Schema } from "effect";
|
|
2
|
+
export const OauthGrant = Schema.Struct({ clientId: Schema.String, scopes: Schema.Array(Schema.String) });
|
|
3
|
+
export class OauthGrants extends Context.Service()("@shivaedev/identity/OauthGrants") {
|
|
4
|
+
}
|
|
5
|
+
//# sourceMappingURL=oauthGrants.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oauthGrants.js","sourceRoot":"","sources":["../../src/server/oauthGrants.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4B,MAAM,EAAE,MAAM,QAAQ,CAAC;AAInE,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;AAG1G,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAe7C,CAAC,iCAAiC,CAAC;CAAG"}
|
package/dist/server/origin.d.ts
CHANGED
|
@@ -14,7 +14,6 @@ export interface TrustedOriginsOptions {
|
|
|
14
14
|
readonly trustedProxy?: string | undefined;
|
|
15
15
|
};
|
|
16
16
|
}
|
|
17
|
-
export declare function trustedOrigins(options: TrustedOriginsOptions): OriginPolicy;
|
|
18
17
|
export declare function originRequest(headers: Headers.Headers, rpc: string, remoteAddress?: Option.Option<string>): OriginRequest;
|
|
19
18
|
export declare const transportOriginRequest: (headers: Headers.Headers, rpc: string) => Effect.Effect<OriginRequest, never, never>;
|
|
20
19
|
//# sourceMappingURL=origin.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"origin.d.ts","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"origin.d.ts","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IAC/C,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACrB;AACD,MAAM,MAAM,YAAY,GAAG,CAAC,OAAO,EAAE,aAAa,KAAK,OAAO,CAAC;AAC/D,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IAClC,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,QAAQ,CAAC;IACrC,QAAQ,CAAC,UAAU,CAAC,EAAE;QAAE,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;KAAE,CAAC;CACrE;AACD,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,aAAa,GAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAiB,GAAG,aAAa,CAOxI;AAED,eAAO,MAAM,sBAAsB,uFAQjC,CAAC"}
|
package/dist/server/origin.js
CHANGED
|
@@ -1,14 +1,6 @@
|
|
|
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
|
-
export function trustedOrigins(options) {
|
|
6
|
-
const sameOrigin = options.sameOrigin === undefined ? undefined : localTransport(options.sameOrigin.trustedProxy);
|
|
7
|
-
return (request) => Option.match(request.origin, {
|
|
8
|
-
onNone: () => options.missing === "allow",
|
|
9
|
-
onSome: (value) => options.allow.includes(value) || sameOrigin?.({ headers: request.headers, remoteAddress: request.remoteAddress ?? Option.none() }) === true,
|
|
10
|
-
});
|
|
11
|
-
}
|
|
12
4
|
export function originRequest(headers, rpc, remoteAddress = Option.none()) {
|
|
13
5
|
return {
|
|
14
6
|
headers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"origin.js","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"origin.js","sourceRoot":"","sources":["../../src/server/origin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAa/D,MAAM,UAAU,aAAa,CAAC,OAAwB,EAAE,GAAW,EAAE,aAAa,GAA0B,MAAM,CAAC,IAAI,EAAE;IACxH,OAAO;QACN,OAAO;QACP,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,EAAE,QAAQ,CAAC;QACtC,aAAa;QACb,GAAG;KACH,CAAC;AACH,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAClI,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC;IACjF,OAAO,aAAa,CACnB,SAAS,EACT,GAAG,EACH,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CACvD,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAIlE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAIvD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,wBAAgB,eAAe,CAAC,WAAW,EAC1C,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,QAAQ,GAAG,WAAW,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC,GAAG;IACpH,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CAChC,kDAwBD;AAYD,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,IAC7C,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC,eAExH,iBAAiB,CAAC,iBAAiB,KAC1C,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAW/G"}
|
|
@@ -3,10 +3,8 @@ import { HttpServerResponse } from "effect/http";
|
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
import { forbidden } from "@shivaedev/access/refusal.ts";
|
|
5
5
|
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
6
|
-
import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
7
6
|
import { Identity, SessionUser } from "#identity.ts";
|
|
8
7
|
import { hasPermission } from "#permission.ts";
|
|
9
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
10
8
|
import { recheckSession } from "./recheckSession.js";
|
|
11
9
|
import { revalidateStream } from "./revalidateStream.js";
|
|
12
10
|
import { SessionPolicy } from "./SessionPolicy.js";
|
|
@@ -14,9 +12,9 @@ import { withSessionUser } from "./session.js";
|
|
|
14
12
|
export function permissionLayer(middleware) {
|
|
15
13
|
const permission = middleware.permission;
|
|
16
14
|
return Layer.effect(middleware, Effect.map(SessionPolicy, (policy) => {
|
|
17
|
-
const guard = (effect, { headers, rpc
|
|
15
|
+
const guard = (effect, { headers, rpc }) => {
|
|
18
16
|
const lookup = Effect.tap(recheckSession(headers, rpc._tag), (session) => Option.isSome(session) && !hasPermission(session.value.user, permission) ? Effect.fail(forbidden(permission)) : Effect.void);
|
|
19
|
-
return
|
|
17
|
+
return effect.pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, lookup))), (invocation) => Effect.andThen(Effect.flatMap(SessionUser, (user) => requirePermission(user, permission)), invocation), withSessionUser(headers, rpc._tag), Effect.provideService(SessionPolicy, policy));
|
|
20
18
|
};
|
|
21
19
|
return guard;
|
|
22
20
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAA0B,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import type { Rpc } from "effect/rpc";
|
|
3
|
+
import { type QuerySubscription } from "@shivaedev/contract/querySubscription.ts";
|
|
4
|
+
import { 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
|
+
export declare function resolveChanges<TRpc extends Rpc.Any>(rpc: TRpc, references: readonly QueryReference[]): Effect.Effect<QuerySubscription<PolicyChannels<TRpc>["error"], PolicyChannels<TRpc>["services"]>, PolicyChannels<TRpc>["error"] | MissingReadPolicy | QueryReadDenied, PolicyChannels<TRpc>["services"]>;
|
|
8
|
+
//# sourceMappingURL=resolveChanges.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveChanges.d.ts","sourceRoot":"","sources":["../../src/server/resolveChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAiB,KAAK,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACvF,OAAO,KAAK,EAAE,iBAAiB,EAAE,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAClG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAG5E,wBAAgB,cAAc,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EAClD,GAAG,EAAE,IAAI,EACT,UAAU,EAAE,SAAS,cAAc,EAAE,GACnC,MAAM,CAAC,MAAM,CACf,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,EAClF,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EACnE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAChC,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import { querySubscription } from "@shivaedev/contract/querySubscription.ts";
|
|
3
|
+
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
|
+
import { Identity } from "#identity.ts";
|
|
5
|
+
export function resolveChanges(rpc, references) {
|
|
6
|
+
return Effect.fnUntraced(function* () {
|
|
7
|
+
const identity = yield* Effect.serviceOption(Identity);
|
|
8
|
+
const current = yield* CurrentViewer;
|
|
9
|
+
const viewer = Option.orElse(identity, () => current);
|
|
10
|
+
return yield* querySubscription(rpc, references, viewer);
|
|
11
|
+
})();
|
|
12
|
+
}
|
|
13
|
+
//# sourceMappingURL=resolveChanges.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveChanges.js","sourceRoot":"","sources":["../../src/server/resolveChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAA0B,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAE,aAAa,EAAuB,MAAM,mCAAmC,CAAC;AAGvF,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAUxC,MAAM,UAAU,cAAc,CAAC,GAAY,EAAE,UAAqC;IACjF,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;QACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;IAC1D,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Effect, Option } from "effect";
|
|
1
|
+
import { Effect, type Option } from "effect";
|
|
2
2
|
import { type Rpc } from "effect/rpc";
|
|
3
|
-
import {
|
|
3
|
+
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
5
5
|
import type { SessionShape } from "./session.ts";
|
|
6
|
-
export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | Unauthorized, R | TLookupRequirements | SessionPolicy>;
|
|
6
|
+
export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized, R | TLookupRequirements | SessionPolicy>;
|
|
7
7
|
//# sourceMappingURL=revalidateStream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAEhF,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,YAAY,EAAE,mBAAmB,EAClF,GAAG,EAAE,GAAG,CAAC,YAAY,EACrB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,EAAE,mBAAmB,CAAC,IAExF,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,uJAS/C"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Effect
|
|
1
|
+
import { Effect } from "effect";
|
|
2
2
|
import { RpcSchema } from "effect/rpc";
|
|
3
|
-
import {
|
|
3
|
+
import { currentSessionContext } from "./currentSessionContext.js";
|
|
4
4
|
import { SessionPolicy } from "./SessionPolicy.js";
|
|
5
5
|
import { revalidateSession } from "./socketSession.js";
|
|
6
6
|
export function revalidateStream(rpc, id, lookup) {
|
|
@@ -8,12 +8,7 @@ export function revalidateStream(rpc, id, lookup) {
|
|
|
8
8
|
if (!RpcSchema.isStreamSchema(rpc.successSchema)) {
|
|
9
9
|
return effect;
|
|
10
10
|
}
|
|
11
|
-
const check = Effect.
|
|
12
|
-
const session = yield* lookup;
|
|
13
|
-
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
14
|
-
return yield* new Unauthorized({ message: "Authentication required" });
|
|
15
|
-
}
|
|
16
|
-
});
|
|
11
|
+
const check = Effect.asVoid(currentSessionContext(id, lookup));
|
|
17
12
|
return Effect.flatMap(SessionPolicy, (policy) => Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds")));
|
|
18
13
|
};
|
|
19
14
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAe,MAAM,QAAQ,CAAC;AAC7C,OAAO,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AAEjD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAC/B,GAAqB,EACrB,EAAU,EACV,MAAgG;IAEhG,OAAO,CAAU,MAA8B,EAAE,EAAE;QAClD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAqB,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,0BAA0B,IAAI,YAAY,CAAC,CAAC,CACrG,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
|
package/dist/server/session.d.ts
CHANGED
|
@@ -18,7 +18,7 @@ export declare function maybeAuthenticatedLayer(): Layer.Layer<MaybeAuthenticate
|
|
|
18
18
|
export interface UserSessionShape extends SessionShape {
|
|
19
19
|
readonly user: SessionUserValue;
|
|
20
20
|
}
|
|
21
|
-
export declare function withSessionUser(headers: Headers.Headers, operation: string): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | Unauthorized, SessionPolicy | Exclude<Exclude<R, Identity>, SessionUser>>;
|
|
21
|
+
export declare function withSessionUser(headers: Headers.Headers, operation: string): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | Unauthorized, SessionPolicy | Exclude<Exclude<Exclude<R, Identity>, never>, SessionUser>>;
|
|
22
22
|
export declare function authenticatedUserLayer(): Layer.Layer<AuthenticatedUser, never, SessionPolicy>;
|
|
23
23
|
export interface ProviderAccountsSessionShape extends UserSessionShape {
|
|
24
24
|
readonly user: SessionUserWithProviderAccountsValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EACN,QAAQ,EAER,WAAW,EAEX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,OAAO,EACN,QAAQ,EAER,WAAW,EAEX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAE7H,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;KACpB,CAAC;CACF;AACD,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,YAAY;IAC7D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;CACpG;AACD,eAAO,MAAM,cAAc,qMAGzB,CAAC;AAIH,wBAAgB,kBAAkB,qDAsBjC;AACD,wBAAgB,uBAAuB,0DAuBtC;AACD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACrD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CAChC;AACD,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,IAClE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,0LAe/C;AACD,wBAAgB,sBAAsB,yDAcrC;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IACrE,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;CACpD;AACD,wBAAgB,0CAA0C,6EA0BzD"}
|
package/dist/server/session.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
3
3
|
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { Identity, OptionalIdentity, SessionUser, SessionUserSchema, SessionUserWithProviderAccounts, } from "#identity.ts";
|
|
5
5
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
6
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
7
6
|
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
8
7
|
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
9
8
|
import { lookupSession, sessionRequest } from "./lookupSession.js";
|
|
@@ -17,24 +16,24 @@ function identified(id) {
|
|
|
17
16
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
18
17
|
}
|
|
19
18
|
export function authenticatedLayer() {
|
|
20
|
-
return Layer.effect(Authenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
19
|
+
return Layer.effect(Authenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
21
20
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
22
21
|
if (Option.isNone(session)) {
|
|
23
22
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
24
23
|
}
|
|
25
24
|
const id = yield* identified(session.value.user.id);
|
|
26
|
-
return yield*
|
|
25
|
+
return yield* effect.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.annotateLogs({ userId: id }));
|
|
27
26
|
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
28
27
|
}
|
|
29
28
|
export function maybeAuthenticatedLayer() {
|
|
30
|
-
return Layer.effect(MaybeAuthenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
29
|
+
return Layer.effect(MaybeAuthenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
31
30
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
32
31
|
if (Option.isNone(session)) {
|
|
33
|
-
const invocation =
|
|
32
|
+
const invocation = effect.pipe(Effect.provideService(CurrentViewer, Option.none()));
|
|
34
33
|
return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
|
|
35
34
|
}
|
|
36
35
|
const id = yield* identified(session.value.user.id);
|
|
37
|
-
return yield*
|
|
36
|
+
return yield* effect.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(OptionalIdentity, Option.some({ id })), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.annotateLogs({ userId: id }));
|
|
38
37
|
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
39
38
|
}
|
|
40
39
|
export function withSessionUser(headers, operation) {
|
|
@@ -45,14 +44,14 @@ export function withSessionUser(headers, operation) {
|
|
|
45
44
|
}
|
|
46
45
|
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
47
46
|
const id = yield* identified(session.value.user.id);
|
|
48
|
-
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.annotateLogs({ userId: id }));
|
|
47
|
+
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.provideService(SessionUser, user), Effect.annotateLogs({ userId: id }));
|
|
49
48
|
});
|
|
50
49
|
}
|
|
51
50
|
export function authenticatedUserLayer() {
|
|
52
|
-
return Layer.effect(AuthenticatedUser, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
51
|
+
return Layer.effect(AuthenticatedUser, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => effect.pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)))), withSessionUser(headers, rpc._tag), Effect.provideService(SessionPolicy, policy))));
|
|
53
52
|
}
|
|
54
53
|
export function authenticatedUserWithProviderAccountsLayer() {
|
|
55
|
-
return Layer.effect(AuthenticatedUserWithProviderAccounts, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
54
|
+
return Layer.effect(AuthenticatedUserWithProviderAccounts, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
56
55
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
57
56
|
if (Option.isNone(session)) {
|
|
58
57
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
@@ -60,7 +59,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
60
59
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
61
60
|
const { id } = user;
|
|
62
61
|
yield* identified(id);
|
|
63
|
-
return yield*
|
|
62
|
+
return yield* effect.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.provideService(SessionUser, user), Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts }), Effect.annotateLogs({ userId: id }));
|
|
64
63
|
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
65
64
|
}
|
|
66
65
|
//# sourceMappingURL=session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,EAA6B,MAAM,QAAQ,CAAC;AAI9F,OAAO,EAAwC,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEzG,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;CAClC;AA8CD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAepG"}
|
package/dist/server/tracing.js
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 } 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
|
const ACCEPTED_REQUEST_ID = /^[A-Za-z0-9._:-]{1,128}$/u;
|
|
11
9
|
function hex(byte) {
|
|
12
10
|
return byte.toString(16).padStart(2, "0");
|
|
@@ -48,9 +46,7 @@ export function requestTracingLayer(options = {}) {
|
|
|
48
46
|
return Layer.succeed(RequestTracing, (effect, { headers, payload, rpc }) => Effect.gen(function* () {
|
|
49
47
|
const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
|
|
50
48
|
yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
|
|
51
|
-
|
|
52
|
-
const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
|
|
53
|
-
return yield* invocation.pipe(Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))), Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)), Effect.provideService(RequestId, requestId), Effect.annotateLogs({ requestId, "rpc.method": rpc._tag }), Effect.withLogSpan("rpc.duration"));
|
|
49
|
+
return yield* effect.pipe(Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))), Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)), Effect.provideService(RequestId, requestId), Effect.annotateLogs({ requestId, "rpc.method": rpc._tag }), Effect.withLogSpan("rpc.duration"));
|
|
54
50
|
}));
|
|
55
51
|
}
|
|
56
52
|
//# sourceMappingURL=tracing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"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"}
|