@shivaedev/identity 0.35.0 → 0.37.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +47 -0
- package/README.md +60 -36
- package/dist/client/SessionMemory.d.ts.map +1 -1
- package/dist/client/SessionMemory.js +7 -0
- package/dist/client/SessionMemory.js.map +1 -1
- package/dist/client/{adapters/changeEmail.d.ts → changeEmail.d.ts} +1 -1
- package/dist/client/changeEmail.d.ts.map +1 -0
- package/dist/client/changeEmail.js.map +1 -0
- package/dist/server/account-preferences/Rows.d.ts +34 -1
- package/dist/server/account-preferences/Rows.d.ts.map +1 -1
- package/dist/server/accountPreferencesMigration.d.ts.map +1 -0
- package/dist/server/accountPreferencesMigration.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.d.ts +1 -1
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +2 -2
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/better-auth/SeedOptions.d.ts.map +1 -0
- package/dist/server/better-auth/SeedOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/accountRoleSeed.d.ts +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.js +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.d.ts +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/migrationPlan.js +2 -2
- package/dist/server/better-auth/adapters/migrationPlan.js.map +1 -1
- package/dist/server/better-auth/{adapters/assertSchema.d.ts → assertSchema.d.ts} +1 -1
- package/dist/server/better-auth/assertSchema.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/assertSchema.js → assertSchema.js} +2 -2
- package/dist/server/better-auth/assertSchema.js.map +1 -0
- package/dist/server/better-auth/assertSeedDatabase.d.ts.map +1 -0
- package/dist/server/better-auth/assertSeedDatabase.js.map +1 -0
- package/dist/server/better-auth/assignRole.d.ts +1 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +2 -2
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/changeHooks.d.ts +3 -0
- package/dist/server/better-auth/changeHooks.d.ts.map +1 -0
- package/dist/server/better-auth/changeHooks.js +36 -0
- package/dist/server/better-auth/changeHooks.js.map +1 -0
- package/dist/server/better-auth/clientIpHeaders.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/clientIpHeaders.js → clientIpHeaders.js} +1 -1
- package/dist/server/better-auth/clientIpHeaders.js.map +1 -0
- package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +1 -0
- package/dist/server/better-auth/closeRoleEndpoints.js.map +1 -0
- package/dist/server/better-auth/{adapters/columnDrift.d.ts → columnDrift.d.ts} +1 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/columnDrift.js → columnDrift.js} +1 -1
- package/dist/server/better-auth/columnDrift.js.map +1 -0
- package/dist/server/better-auth/defineSeed.d.ts +4 -0
- package/dist/server/better-auth/defineSeed.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/defineSeed.js → defineSeed.js} +2 -2
- package/dist/server/better-auth/defineSeed.js.map +1 -0
- package/dist/server/better-auth/{adapters/migrate.d.ts → migrate.d.ts} +1 -1
- package/dist/server/better-auth/migrate.d.ts.map +1 -0
- package/dist/server/better-auth/migrate.js.map +1 -0
- package/dist/server/better-auth/{adapters/migrations → migrations}/generate.d.ts +1 -1
- package/dist/server/better-auth/migrations/generate.d.ts.map +1 -0
- package/dist/server/better-auth/migrations/generate.js.map +1 -0
- package/dist/server/better-auth/{adapters/mount.d.ts → mount.d.ts} +5 -5
- package/dist/server/better-auth/mount.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/mount.js → mount.js} +7 -5
- package/dist/server/better-auth/mount.js.map +1 -0
- package/dist/server/better-auth/mountSettings.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/mountSettings.js → mountSettings.js} +1 -1
- package/dist/server/better-auth/mountSettings.js.map +1 -0
- package/dist/server/better-auth/preferencesClient.d.ts.map +1 -0
- package/dist/server/better-auth/preferencesClient.js.map +1 -0
- package/dist/server/better-auth/routeHandler.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/routeHandler.js → routeHandler.js} +1 -1
- package/dist/server/better-auth/routeHandler.js.map +1 -0
- package/dist/server/better-auth/seedUsers.d.ts +1 -1
- package/dist/server/better-auth/seedUsers.d.ts.map +1 -1
- package/dist/server/better-auth/seedUsers.js.map +1 -1
- package/dist/server/better-auth/sessionAdministration.js +1 -1
- package/dist/server/better-auth/sessionAdministration.js.map +1 -1
- package/dist/server/better-auth/storedRoleOptions.d.ts.map +1 -0
- package/dist/server/better-auth/{adapters/storedRoleOptions.js → storedRoleOptions.js} +1 -1
- package/dist/server/better-auth/storedRoleOptions.js.map +1 -0
- package/dist/server/better-auth/sweepExpiredSessions.d.ts.map +1 -1
- package/dist/server/better-auth/sweepExpiredSessions.js +17 -6
- package/dist/server/better-auth/sweepExpiredSessions.js.map +1 -1
- package/dist/server/better-auth/tables.d.ts.map +1 -0
- package/dist/server/better-auth/tables.js.map +1 -0
- package/dist/server/better-auth/testDatabase.d.ts +2 -1
- package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
- package/dist/server/better-auth/testDatabase.js +2 -1
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/better-auth/userDataExport.d.ts.map +1 -0
- package/dist/server/better-auth/userDataExport.js.map +1 -0
- package/dist/server/better-auth/{adapters/userDirectory.d.ts → userDirectory.d.ts} +1 -1
- package/dist/server/better-auth/userDirectory.d.ts.map +1 -0
- package/dist/server/better-auth/userDirectory.js.map +1 -0
- package/dist/server/better-auth/userDirectoryReads.d.ts +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.js +2 -2
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -1
- package/dist/server/{adapters/currentSessionContext.d.ts → currentSessionContext.d.ts} +2 -2
- package/dist/server/currentSessionContext.d.ts.map +1 -0
- package/dist/server/{adapters/currentSessionContext.js → currentSessionContext.js} +2 -2
- package/dist/server/currentSessionContext.js.map +1 -0
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +3 -1
- package/dist/server/lookupSession.js.map +1 -1
- package/dist/server/machineTokenMigration.d.ts.map +1 -0
- package/dist/server/machineTokenMigration.js.map +1 -0
- package/dist/server/resolveRole.js +1 -1
- package/dist/server/resolveRole.js.map +1 -1
- package/dist/server/revalidateStream.js +1 -1
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts +2 -2
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +4 -4
- package/dist/server/session.js.map +1 -1
- package/dist/server/subjectResolverLayer.js +3 -3
- package/dist/server/subjectResolverLayer.js.map +1 -1
- package/dist/server/trustedOrigins.d.ts.map +1 -0
- package/dist/server/trustedOrigins.js.map +1 -0
- package/dist/server/trustedProxyRanges.d.ts.map +1 -0
- package/dist/server/trustedProxyRanges.js.map +1 -0
- package/package.json +13 -13
- package/src/client/SessionMemory.ts +7 -0
- package/src/server/adapters/betterAuthSessions.ts +3 -2
- package/src/server/better-auth/adapters/accountRoleSeed.ts +1 -1
- package/src/server/better-auth/adapters/migrationPlan.ts +2 -2
- package/src/server/better-auth/{adapters/assertSchema.ts → assertSchema.ts} +2 -2
- package/src/server/better-auth/assignRole.ts +2 -2
- package/src/server/better-auth/changeHooks.ts +49 -0
- package/src/server/better-auth/{adapters/clientIpHeaders.ts → clientIpHeaders.ts} +1 -1
- package/src/server/better-auth/{adapters/columnDrift.ts → columnDrift.ts} +2 -2
- package/src/server/better-auth/{adapters/defineSeed.ts → defineSeed.ts} +3 -3
- package/src/server/better-auth/{adapters/migrate.ts → migrate.ts} +1 -1
- package/src/server/better-auth/{adapters/migrations → migrations}/generate.ts +1 -1
- package/src/server/better-auth/{adapters/mount.ts → mount.ts} +7 -5
- package/src/server/better-auth/{adapters/mountSettings.ts → mountSettings.ts} +1 -1
- package/src/server/better-auth/{adapters/routeHandler.ts → routeHandler.ts} +1 -1
- package/src/server/better-auth/seedUsers.ts +1 -1
- package/src/server/better-auth/sessionAdministration.ts +1 -1
- package/src/server/better-auth/{adapters/storedRoleOptions.ts → storedRoleOptions.ts} +1 -1
- package/src/server/better-auth/sweepExpiredSessions.ts +17 -6
- package/src/server/better-auth/testDatabase.ts +2 -1
- package/src/server/better-auth/{adapters/userDirectory.ts → userDirectory.ts} +1 -1
- package/src/server/better-auth/userDirectoryReads.ts +2 -2
- package/src/server/{adapters/currentSessionContext.ts → currentSessionContext.ts} +3 -2
- package/src/server/lookupSession.ts +5 -1
- package/src/server/resolveRole.ts +1 -1
- package/src/server/revalidateStream.ts +1 -1
- package/src/server/session.ts +5 -4
- package/src/server/subjectResolverLayer.ts +3 -3
- package/dist/client/adapters/changeEmail.d.ts.map +0 -1
- package/dist/client/adapters/changeEmail.js.map +0 -1
- package/dist/server/adapters/accountPreferencesMigration.d.ts.map +0 -1
- package/dist/server/adapters/accountPreferencesMigration.js.map +0 -1
- package/dist/server/adapters/currentSessionContext.d.ts.map +0 -1
- package/dist/server/adapters/currentSessionContext.js.map +0 -1
- package/dist/server/adapters/machineTokenMigration.d.ts.map +0 -1
- package/dist/server/adapters/machineTokenMigration.js.map +0 -1
- package/dist/server/adapters/trustedOrigins.d.ts.map +0 -1
- package/dist/server/adapters/trustedOrigins.js.map +0 -1
- package/dist/server/adapters/trustedProxyRanges.d.ts.map +0 -1
- package/dist/server/adapters/trustedProxyRanges.js.map +0 -1
- package/dist/server/better-auth/adapters/SeedOptions.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/SeedOptions.js.map +0 -1
- package/dist/server/better-auth/adapters/assertSchema.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/assertSchema.js.map +0 -1
- package/dist/server/better-auth/adapters/assertSeedDatabase.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/assertSeedDatabase.js.map +0 -1
- package/dist/server/better-auth/adapters/clientIpHeaders.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/clientIpHeaders.js.map +0 -1
- package/dist/server/better-auth/adapters/closeRoleEndpoints.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/closeRoleEndpoints.js.map +0 -1
- package/dist/server/better-auth/adapters/columnDrift.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/columnDrift.js.map +0 -1
- package/dist/server/better-auth/adapters/defineSeed.d.ts +0 -4
- package/dist/server/better-auth/adapters/defineSeed.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/defineSeed.js.map +0 -1
- package/dist/server/better-auth/adapters/migrate.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/migrate.js.map +0 -1
- package/dist/server/better-auth/adapters/migrations/generate.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/migrations/generate.js.map +0 -1
- package/dist/server/better-auth/adapters/mount.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/mount.js.map +0 -1
- package/dist/server/better-auth/adapters/mountSettings.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/mountSettings.js.map +0 -1
- package/dist/server/better-auth/adapters/preferencesClient.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/preferencesClient.js.map +0 -1
- package/dist/server/better-auth/adapters/routeHandler.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/routeHandler.js.map +0 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +0 -1
- package/dist/server/better-auth/adapters/tables.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/tables.js.map +0 -1
- package/dist/server/better-auth/adapters/userDataExport.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/userDataExport.js.map +0 -1
- package/dist/server/better-auth/adapters/userDirectory.d.ts.map +0 -1
- package/dist/server/better-auth/adapters/userDirectory.js.map +0 -1
- /package/dist/client/{adapters/changeEmail.js → changeEmail.js} +0 -0
- /package/dist/server/{adapters/accountPreferencesMigration.d.ts → accountPreferencesMigration.d.ts} +0 -0
- /package/dist/server/{adapters/accountPreferencesMigration.js → accountPreferencesMigration.js} +0 -0
- /package/dist/server/better-auth/{adapters/SeedOptions.d.ts → SeedOptions.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/SeedOptions.js → SeedOptions.js} +0 -0
- /package/dist/server/better-auth/{adapters/assertSeedDatabase.d.ts → assertSeedDatabase.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/assertSeedDatabase.js → assertSeedDatabase.js} +0 -0
- /package/dist/server/better-auth/{adapters/clientIpHeaders.d.ts → clientIpHeaders.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/closeRoleEndpoints.d.ts → closeRoleEndpoints.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/closeRoleEndpoints.js → closeRoleEndpoints.js} +0 -0
- /package/dist/server/better-auth/{adapters/migrate.js → migrate.js} +0 -0
- /package/dist/server/better-auth/{adapters/migrations → migrations}/generate.js +0 -0
- /package/dist/server/better-auth/{adapters/mountSettings.d.ts → mountSettings.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/preferencesClient.d.ts → preferencesClient.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/preferencesClient.js → preferencesClient.js} +0 -0
- /package/dist/server/better-auth/{adapters/routeHandler.d.ts → routeHandler.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/storedRoleOptions.d.ts → storedRoleOptions.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/tables.d.ts → tables.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/tables.js → tables.js} +0 -0
- /package/dist/server/better-auth/{adapters/userDataExport.d.ts → userDataExport.d.ts} +0 -0
- /package/dist/server/better-auth/{adapters/userDataExport.js → userDataExport.js} +0 -0
- /package/dist/server/better-auth/{adapters/userDirectory.js → userDirectory.js} +0 -0
- /package/dist/server/{adapters/machineTokenMigration.d.ts → machineTokenMigration.d.ts} +0 -0
- /package/dist/server/{adapters/machineTokenMigration.js → machineTokenMigration.js} +0 -0
- /package/dist/server/{adapters/trustedOrigins.d.ts → trustedOrigins.d.ts} +0 -0
- /package/dist/server/{adapters/trustedOrigins.js → trustedOrigins.js} +0 -0
- /package/dist/server/{adapters/trustedProxyRanges.d.ts → trustedProxyRanges.d.ts} +0 -0
- /package/dist/server/{adapters/trustedProxyRanges.js → trustedProxyRanges.js} +0 -0
- /package/src/client/{adapters/changeEmail.ts → changeEmail.ts} +0 -0
- /package/src/server/{adapters/accountPreferencesMigration.ts → accountPreferencesMigration.ts} +0 -0
- /package/src/server/better-auth/{adapters/SeedOptions.ts → SeedOptions.ts} +0 -0
- /package/src/server/better-auth/{adapters/assertSeedDatabase.ts → assertSeedDatabase.ts} +0 -0
- /package/src/server/better-auth/{adapters/closeRoleEndpoints.ts → closeRoleEndpoints.ts} +0 -0
- /package/src/server/better-auth/{adapters/preferencesClient.ts → preferencesClient.ts} +0 -0
- /package/src/server/better-auth/{adapters/tables.ts → tables.ts} +0 -0
- /package/src/server/better-auth/{adapters/userDataExport.ts → userDataExport.ts} +0 -0
- /package/src/server/{adapters/machineTokenMigration.ts → machineTokenMigration.ts} +0 -0
- /package/src/server/{adapters/trustedOrigins.ts → trustedOrigins.ts} +0 -0
- /package/src/server/{adapters/trustedProxyRanges.ts → trustedProxyRanges.ts} +0 -0
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Clock, Effect, Option, Predicate, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
-
import {
|
|
4
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
5
|
+
import type { AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
5
6
|
import type { ProviderAccountValue } from "#identity.ts";
|
|
6
7
|
import { authCall } from "#server/adapters/authCall.ts";
|
|
7
8
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
@@ -33,7 +34,7 @@ export function betterAuthSessions<TSession extends SessionShape>(getSession: Ge
|
|
|
33
34
|
Effect.catch(
|
|
34
35
|
({ cause }): Effect.Effect<never, AuthUnavailable | Unauthorized> =>
|
|
35
36
|
Predicate.hasProperty(cause, "statusCode") && cause.statusCode === HttpStatus.fromLiteral("Unauthorized")
|
|
36
|
-
? Effect.fail(
|
|
37
|
+
? Effect.fail(unauthorized())
|
|
37
38
|
: providerFailure(cause),
|
|
38
39
|
),
|
|
39
40
|
);
|
|
@@ -3,8 +3,8 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
5
|
import type { ProviderAccountValue } from "#identity.ts";
|
|
6
|
-
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
7
6
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
7
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/tables.ts";
|
|
8
8
|
|
|
9
9
|
export interface AccountRoleSeed<E> {
|
|
10
10
|
readonly onSignIn: (userId: string) => Effect.Effect<void, E>;
|
|
@@ -3,8 +3,8 @@ import { getMigrations } from "better-auth/db/migration";
|
|
|
3
3
|
import { Effect } from "effect";
|
|
4
4
|
import { SqlClient } from "effect/sql";
|
|
5
5
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
6
|
-
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/
|
|
7
|
-
import { tables } from "#server/better-auth/
|
|
6
|
+
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
7
|
+
import { tables } from "#server/better-auth/tables.ts";
|
|
8
8
|
|
|
9
9
|
export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (
|
|
10
10
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect, Schema } from "effect";
|
|
3
|
-
import { authColumnDrift } from "#server/better-auth/adapters/columnDrift.ts";
|
|
4
3
|
import { betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
5
|
-
import {
|
|
4
|
+
import { authColumnDrift } from "#server/better-auth/columnDrift.ts";
|
|
5
|
+
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
6
6
|
|
|
7
7
|
export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDrift>()("BetterAuthSchemaDrift", {
|
|
8
8
|
missing: Schema.Array(Schema.String),
|
|
@@ -6,7 +6,7 @@ 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
8
|
import { AssignRoles, LastRoleAssigner } from "#roles.ts";
|
|
9
|
-
import { type AuthTableOptions, tables } from "#server/better-auth/
|
|
9
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/tables.ts";
|
|
10
10
|
import { roleKeys, userKeys } from "#users.ts";
|
|
11
11
|
|
|
12
12
|
function unavailable() {
|
|
@@ -32,7 +32,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
|
|
|
32
32
|
});
|
|
33
33
|
const target = yield* readTarget(userId).pipe(Effect.mapError(unavailable));
|
|
34
34
|
if (Option.isNone(target)) {
|
|
35
|
-
return yield* Effect.fail(new NotFound({ message: "
|
|
35
|
+
return yield* Effect.fail(new NotFound({ message: "This user no longer exists." }));
|
|
36
36
|
}
|
|
37
37
|
if (target.value.role === role) {
|
|
38
38
|
return false;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { invalidationKeys, type Key } from "@shivaedev/changes/keys.ts";
|
|
5
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
6
|
+
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
7
|
+
import { sessionKeys } from "#signedInSessions.ts";
|
|
8
|
+
import { userKeys } from "#users.ts";
|
|
9
|
+
|
|
10
|
+
// Inside an application transaction the nested transact joins its commit; otherwise it is a transaction of its own after Better Auth's commit.
|
|
11
|
+
// An announcement that fails must not fail an auth write that may already have committed.
|
|
12
|
+
// A user change also announces the sessions list, which shows each session's user name and email.
|
|
13
|
+
const announce = Effect.fnUntraced(function* (keys: readonly Key[]) {
|
|
14
|
+
const sql = yield* Effect.serviceOption(SqlClient.SqlClient);
|
|
15
|
+
const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
16
|
+
if (Option.isNone(sql) || Option.isNone(reactivity)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
yield* invalidateOnCommit(invalidationKeys(keys)).pipe(
|
|
20
|
+
transact(),
|
|
21
|
+
Effect.catch((error) => Effect.logError("Better Auth change announcement failed; open screens stay stale until they resync", error)),
|
|
22
|
+
Effect.provideService(SqlClient.SqlClient, sql.value),
|
|
23
|
+
Effect.provideService(Reactivity.Reactivity, reactivity.value),
|
|
24
|
+
);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
type Row = { readonly id: string } | null;
|
|
28
|
+
|
|
29
|
+
// Better Auth hands an update's after hook null when the update matched no row, as when a refreshing session was deleted meanwhile.
|
|
30
|
+
function announceRow(row: Row, keys: (id: string) => readonly Key[]) {
|
|
31
|
+
return row === null ? Effect.void : announce(keys(row.id));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function userCreated(user: Row) {
|
|
35
|
+
return announceRow(user, (id) => [userKeys.item(id)]);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function userChanged(user: Row) {
|
|
39
|
+
return announceRow(user, (id) => [userKeys.item(id), sessionKeys.list]);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function sessionChanged(session: Row) {
|
|
43
|
+
return announceRow(session, (id) => [sessionKeys.item(id)]);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export const changeHooks: BetterAuthDatabaseHooks = {
|
|
47
|
+
session: { create: { after: sessionChanged }, delete: { after: sessionChanged }, update: { after: sessionChanged } },
|
|
48
|
+
user: { create: { after: userCreated }, delete: { after: userChanged }, update: { after: userChanged } },
|
|
49
|
+
};
|
|
@@ -2,7 +2,7 @@ import { getIP } from "better-auth/api";
|
|
|
2
2
|
import { Effect, Option } from "effect";
|
|
3
3
|
import { HttpServerRequest } from "effect/http";
|
|
4
4
|
import { trustedProxyPeer } from "#server/adapters/local.ts";
|
|
5
|
-
import { trustedProxyRanges } from "#server/
|
|
5
|
+
import { trustedProxyRanges } from "#server/trustedProxyRanges.ts";
|
|
6
6
|
|
|
7
7
|
export const PEER_IP_HEADER = "x-platform-client-ip";
|
|
8
8
|
|
|
@@ -3,8 +3,8 @@ import { getSchema } from "better-auth/db";
|
|
|
3
3
|
import { matchType } from "better-auth/db/migration";
|
|
4
4
|
import { Effect, Schema } from "effect";
|
|
5
5
|
import { SqlClient } from "effect/sql";
|
|
6
|
-
import type { StoredRoleOptions } from "#server/better-auth/
|
|
7
|
-
import { tables } from "#server/better-auth/
|
|
6
|
+
import type { StoredRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
7
|
+
import { tables } from "#server/better-auth/tables.ts";
|
|
8
8
|
|
|
9
9
|
const Column = Schema.Struct({
|
|
10
10
|
column: Schema.String,
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Config, Effect } from "effect";
|
|
2
2
|
import { memoryStore } from "@shivaedev/rate-limit/memoryStore.ts";
|
|
3
3
|
import { postgresLayer } from "@shivaedev/sql/postgresLayer.ts";
|
|
4
|
-
import { assertSeedDatabase } from "#server/better-auth/adapters/assertSeedDatabase.ts";
|
|
5
4
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
6
|
-
import { betterAuthMount } from "#server/better-auth/adapters/mount.ts";
|
|
7
|
-
import type { SeedOptions } from "#server/better-auth/adapters/SeedOptions.ts";
|
|
8
5
|
import { betterAuthUserProvisioning } from "#server/better-auth/adapters/userProvisioning.ts";
|
|
6
|
+
import { assertSeedDatabase } from "#server/better-auth/assertSeedDatabase.ts";
|
|
7
|
+
import { betterAuthMount } from "#server/better-auth/mount.ts";
|
|
8
|
+
import type { SeedOptions } from "#server/better-auth/SeedOptions.ts";
|
|
9
9
|
import { seedUsers } from "#server/better-auth/seedUsers.ts";
|
|
10
10
|
|
|
11
11
|
export function defineSeed<TRole extends string, E, R>(options: SeedOptions<TRole, E, R>) {
|
|
@@ -2,7 +2,7 @@ import type { BetterAuthOptions } from "better-auth";
|
|
|
2
2
|
import { Effect } from "effect";
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
4
|
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
5
|
-
import type { StoredRoleOptions } from "#server/better-auth/
|
|
5
|
+
import type { StoredRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
6
6
|
|
|
7
7
|
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (
|
|
8
8
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect } from "effect";
|
|
3
3
|
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
4
|
-
import type { StoredRoleOptions } from "#server/better-auth/
|
|
4
|
+
import type { StoredRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
5
5
|
|
|
6
6
|
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (
|
|
7
7
|
options: Omit<BetterAuthOptions, "database">,
|
|
@@ -8,26 +8,27 @@ import type { AccountRoleSeed } from "#server/better-auth/adapters/accountRoleSe
|
|
|
8
8
|
import { acquireAuth } from "#server/better-auth/adapters/acquire.ts";
|
|
9
9
|
import { admittedSessions } from "#server/better-auth/adapters/admittedSessions.ts";
|
|
10
10
|
import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
11
|
-
import { closeRoleEndpoints } from "#server/better-auth/adapters/closeRoleEndpoints.ts";
|
|
12
11
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
13
12
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
14
13
|
import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
15
14
|
import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
16
15
|
import { mountedSessions } from "#server/better-auth/adapters/mountedSessions.ts";
|
|
17
|
-
import { mountSettings } from "#server/better-auth/adapters/mountSettings.ts";
|
|
18
16
|
import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
|
|
19
17
|
import { providerOnlyOptions } from "#server/better-auth/adapters/providerOnlyOptions.ts";
|
|
20
18
|
import { rateLimitStorage } from "#server/better-auth/adapters/rateLimitStorage.ts";
|
|
21
19
|
import { revokeUnadmitted } from "#server/better-auth/adapters/revokeUnadmitted.ts";
|
|
22
20
|
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
23
|
-
import { authRouteHandler } from "#server/better-auth/adapters/routeHandler.ts";
|
|
24
21
|
import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/adapters/signInGate.ts";
|
|
25
22
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
26
|
-
import {
|
|
23
|
+
import { changeHooks } from "#server/better-auth/changeHooks.ts";
|
|
24
|
+
import { closeRoleEndpoints } from "#server/better-auth/closeRoleEndpoints.ts";
|
|
27
25
|
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
28
26
|
import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
|
|
29
27
|
import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
28
|
+
import { mountSettings } from "#server/better-auth/mountSettings.ts";
|
|
30
29
|
import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
|
|
30
|
+
import { authRouteHandler } from "#server/better-auth/routeHandler.ts";
|
|
31
|
+
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
31
32
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
32
33
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
33
34
|
|
|
@@ -64,7 +65,8 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
64
65
|
const preferences =
|
|
65
66
|
mount.accountPreferences === true ? yield* accountPreferenceOptions(options).pipe(Effect.provide(accountPreferencesStore)) : options;
|
|
66
67
|
const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
|
|
67
|
-
const
|
|
68
|
+
const announced = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), changeHooks, runtime);
|
|
69
|
+
const hooked = effectHookOptions(announced, mount.databaseHooks, runtime);
|
|
68
70
|
const configured = mount.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), mount);
|
|
69
71
|
const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
|
|
70
72
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Config, Effect, Option, Redacted } from "effect";
|
|
3
|
-
import { PEER_IP_HEADER } from "#server/better-auth/
|
|
3
|
+
import { PEER_IP_HEADER } from "#server/better-auth/clientIpHeaders.ts";
|
|
4
4
|
|
|
5
5
|
export const mountSettings = Effect.fnUntraced(function* (options: BetterAuthOptions, clientIp?: "railway") {
|
|
6
6
|
const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
-
import { clientIpHeaders } from "#server/better-auth/adapters/clientIpHeaders.ts";
|
|
5
4
|
import { type MountedAuth, type MountRouteOptions, response } from "#server/better-auth/adapters/response.ts";
|
|
5
|
+
import { clientIpHeaders } from "#server/better-auth/clientIpHeaders.ts";
|
|
6
6
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
7
7
|
|
|
8
8
|
export function authRouteHandler(auth: MountedAuth, options: MountRouteOptions) {
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
3
3
|
import { Identity, SessionUser } from "#identity.ts";
|
|
4
|
-
import type { SeedOptions } from "#server/better-auth/adapters/SeedOptions.ts";
|
|
5
4
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
5
|
+
import type { SeedOptions } from "#server/better-auth/SeedOptions.ts";
|
|
6
6
|
import { UserProvisioning } from "#server/UserProvisioning.ts";
|
|
7
7
|
|
|
8
8
|
export const seedUsers = Effect.fn("Identity.seedUsers")(function* <TRole extends string, E, R>(options: SeedOptions<TRole, E, R>) {
|
|
@@ -46,6 +46,6 @@ export const revokeSession = Effect.fn("Identity.revokeSession")(function* (id:
|
|
|
46
46
|
});
|
|
47
47
|
const removed = yield* remove(id).pipe(Effect.mapError(unavailable));
|
|
48
48
|
if (Option.isNone(removed)) {
|
|
49
|
-
return yield* new NotFound({ message: "
|
|
49
|
+
return yield* new NotFound({ message: "This session has already ended." });
|
|
50
50
|
}
|
|
51
51
|
});
|
|
@@ -1,14 +1,25 @@
|
|
|
1
|
-
import { DateTime, Effect, Schema } from "effect";
|
|
1
|
+
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
2
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
5
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
6
|
+
import { sessionKeys } from "#signedInSessions.ts";
|
|
3
7
|
|
|
4
8
|
const SweepResult = Schema.Tuple([Schema.Struct({ removed: Schema.NumberFromString })]);
|
|
5
9
|
|
|
6
10
|
export const sweepExpiredSessions = Effect.gen(function* () {
|
|
7
11
|
const sql = yield* SqlClient.SqlClient;
|
|
8
12
|
const now = DateTime.toDateUtc(yield* DateTime.now);
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
14
|
+
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
15
|
+
return yield* Effect.gen(function* () {
|
|
16
|
+
const rows = yield* sql`with expired as (
|
|
17
|
+
delete from "session" where "expiresAt" <= ${now} returning 1
|
|
18
|
+
) select count(*)::text as removed from expired`;
|
|
19
|
+
const [result] = yield* Schema.decodeUnknownEffect(SweepResult)(rows);
|
|
20
|
+
if (result.removed > 0) {
|
|
21
|
+
yield* invalidateOnCommit(invalidationKeys([sessionKeys.list]));
|
|
22
|
+
}
|
|
23
|
+
return result.removed;
|
|
24
|
+
}).pipe(transact(), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
14
25
|
}).pipe(Effect.withSpan("Identity.sweepExpiredSessions"));
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DateTime, Effect, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
-
import { migrateBetterAuth } from "#server/better-auth/
|
|
3
|
+
import { migrateBetterAuth } from "#server/better-auth/migrate.ts";
|
|
4
4
|
|
|
5
5
|
const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
|
|
6
6
|
const RoleColumn = Schema.Struct({ default: Schema.NullOr(Schema.String), nullable: Schema.String, type: Schema.String });
|
|
@@ -21,6 +21,7 @@ export const authTestDatabase = Effect.gen(function* () {
|
|
|
21
21
|
Result: StoredSession,
|
|
22
22
|
});
|
|
23
23
|
return {
|
|
24
|
+
deleteSessions: sql`delete from "session"`.pipe(Effect.asVoid),
|
|
24
25
|
expireSessions: (userId?: string) =>
|
|
25
26
|
Effect.gen(function* () {
|
|
26
27
|
const expiredAt = DateTime.toDateUtc(DateTime.subtract(yield* DateTime.now, { seconds: 1 }));
|
|
@@ -3,8 +3,8 @@ import * as Reactivity from "effect/reactivity/Reactivity";
|
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
4
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
5
5
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
-
import type { AuthTableOptions } from "#server/better-auth/adapters/tables.ts";
|
|
7
6
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
7
|
+
import type { AuthTableOptions } from "#server/better-auth/tables.ts";
|
|
8
8
|
import { userDirectoryReads } from "#server/better-auth/userDirectoryReads.ts";
|
|
9
9
|
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
10
10
|
|
|
@@ -3,7 +3,7 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
5
|
import { keysetPage } from "@shivaedev/sql/keysetPage.ts";
|
|
6
|
-
import { type AuthTableOptions, tables } from "#server/better-auth/
|
|
6
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/tables.ts";
|
|
7
7
|
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
8
8
|
|
|
9
9
|
function unavailable() {
|
|
@@ -50,7 +50,7 @@ export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends str
|
|
|
50
50
|
names: (ids: readonly string[]) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
51
51
|
role: Effect.fn("UserDirectory.role")(function* (id: string) {
|
|
52
52
|
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
53
|
-
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "
|
|
53
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "This user no longer exists." });
|
|
54
54
|
}),
|
|
55
55
|
};
|
|
56
56
|
});
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Context, Effect, Option, Schema } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
3
|
+
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
3
4
|
import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
|
|
4
5
|
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
5
6
|
import type { SessionShape } from "#server/session.ts";
|
|
@@ -10,7 +11,7 @@ export const currentSessionContext = Effect.fnUntraced(function* <TSession exten
|
|
|
10
11
|
) {
|
|
11
12
|
const session = yield* lookup;
|
|
12
13
|
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
13
|
-
return yield*
|
|
14
|
+
return yield* unauthorized();
|
|
14
15
|
}
|
|
15
16
|
let context = yield* Effect.context<never>();
|
|
16
17
|
if (Option.isSome(Context.getOption(context, SessionUser))) {
|
|
@@ -10,7 +10,11 @@ export const sessionRequest = Effect.fnUntraced(function* (headers: Headers.Head
|
|
|
10
10
|
const policy = yield* SessionPolicy;
|
|
11
11
|
const request = yield* transportOriginRequest(headers, rpc);
|
|
12
12
|
if (!policy.origin(request)) {
|
|
13
|
-
|
|
13
|
+
const refused = Option.match(request.origin, { onNone: () => "a request without an Origin header", onSome: (origin) => `origin ${origin}` });
|
|
14
|
+
yield* Effect.logWarning(
|
|
15
|
+
`The session policy refused ${refused} calling ${rpc}. Add the origin to the policy's trusted origins if the application is served from it.`,
|
|
16
|
+
);
|
|
17
|
+
return yield* new Forbidden({ message: "Open this application from its own address to continue." });
|
|
14
18
|
}
|
|
15
19
|
return request;
|
|
16
20
|
});
|
|
@@ -8,7 +8,7 @@ export function resolveRole(roles: RoleSet, stored: unknown) {
|
|
|
8
8
|
Effect.logWarning(
|
|
9
9
|
"Stored user role is missing. Generate and apply an auth migration with defaultRole, then use assignRole for administrators.",
|
|
10
10
|
),
|
|
11
|
-
Effect.fail(new Forbidden({ message: "
|
|
11
|
+
Effect.fail(new Forbidden({ message: "Your account has no role yet. Ask an administrator to assign one." })),
|
|
12
12
|
);
|
|
13
13
|
}
|
|
14
14
|
return roles.resolve(stored).pipe(
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Effect, type Option } from "effect";
|
|
2
2
|
import { type Rpc, RpcSchema } from "effect/rpc";
|
|
3
3
|
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
-
import { currentSessionContext } from "#server/
|
|
4
|
+
import { currentSessionContext } from "#server/currentSessionContext.ts";
|
|
5
5
|
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
6
6
|
import type { SessionShape } from "#server/session.ts";
|
|
7
7
|
import { revalidateSession } from "#server/socketSession.ts";
|
package/src/server/session.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
3
4
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
|
-
import {
|
|
5
|
+
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
6
|
import {
|
|
6
7
|
Identity,
|
|
7
8
|
OptionalIdentity,
|
|
@@ -42,7 +43,7 @@ export function authenticatedLayer() {
|
|
|
42
43
|
Effect.gen(function* () {
|
|
43
44
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
44
45
|
if (Option.isNone(session)) {
|
|
45
|
-
return yield*
|
|
46
|
+
return yield* unauthorized();
|
|
46
47
|
}
|
|
47
48
|
const id = yield* identified(session.value.user.id);
|
|
48
49
|
return yield* effect.pipe(
|
|
@@ -87,7 +88,7 @@ export function withSessionUser(headers: Headers.Headers, operation: string) {
|
|
|
87
88
|
Effect.gen(function* () {
|
|
88
89
|
const session = yield* resolveSession(headers, operation);
|
|
89
90
|
if (Option.isNone(session)) {
|
|
90
|
-
return yield*
|
|
91
|
+
return yield* unauthorized();
|
|
91
92
|
}
|
|
92
93
|
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
93
94
|
const id = yield* identified(session.value.user.id);
|
|
@@ -128,7 +129,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
128
129
|
Effect.gen(function* () {
|
|
129
130
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
130
131
|
if (Option.isNone(session)) {
|
|
131
|
-
return yield*
|
|
132
|
+
return yield* unauthorized();
|
|
132
133
|
}
|
|
133
134
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
134
135
|
const { id } = user;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Context, Deferred, Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Rpc } from "effect/rpc";
|
|
3
3
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
4
5
|
import { DefinedModule } from "@shivaedev/contract/defineModule.ts";
|
|
5
6
|
import { operationKind } from "@shivaedev/contract/operationKind.ts";
|
|
6
7
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
7
8
|
import { subjectHeader } from "@shivaedev/contract/subjectHeader.ts";
|
|
8
|
-
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
9
9
|
import { Identity, SessionUser, SessionUserSchema } from "#identity.ts";
|
|
10
10
|
import type { IdentityFailures } from "#middleware.ts";
|
|
11
11
|
import { hasPermission } from "#permission.ts";
|
|
@@ -66,7 +66,7 @@ function guard<E>(policy: Policy<E>): SubjectMiddleware<E, SessionPolicy> {
|
|
|
66
66
|
Effect.gen(function* () {
|
|
67
67
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
68
68
|
if (Option.isNone(session)) {
|
|
69
|
-
return yield*
|
|
69
|
+
return yield* unauthorized();
|
|
70
70
|
}
|
|
71
71
|
const user = session.value.user;
|
|
72
72
|
// RPC merges each call's message headers over its transport's, so the call's own subject comes first and a subject set on the
|
|
@@ -99,7 +99,7 @@ export function subjectResolverLayer() {
|
|
|
99
99
|
return (effect, request) =>
|
|
100
100
|
Option.isSome(sessions)
|
|
101
101
|
? middleware(effect, request).pipe(Effect.provideService(SessionPolicy, sessions.value))
|
|
102
|
-
: Effect.fail(
|
|
102
|
+
: Effect.fail(unauthorized());
|
|
103
103
|
}
|
|
104
104
|
return {
|
|
105
105
|
account: <E>(permission: Permission, deny: (id: string) => E) => resolved({ deny, kind: "account", permission }),
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"changeEmail.d.ts","sourceRoot":"","sources":["../../../src/client/adapters/changeEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,gBAAgB,EAAY,MAAM,8BAA8B,CAAC;AAE/E,MAAM,WAAW,gBAAgB;IAChC,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;CAC1B;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,EAAE,MAAM,EAAE;IACxD,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,gBAAgB,EAAE,OAAO,EAAE;QAAE,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAA;KAAE,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAC9H,4KAEA"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"changeEmail.js","sourceRoot":"","sources":["../../../src/client/adapters/changeEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAQ/E,MAAM,UAAU,WAAW,CAAsB,MAEhD;IACA,OAAO,QAAQ,CAAC,CAAC,KAAuB,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;AAC7F,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"accountPreferencesMigration.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/accountPreferencesMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,2BAA2B,kFAQtC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"accountPreferencesMigration.js","sourceRoot":"","sources":["../../../src/server/adapters/accountPreferencesMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAC9D,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,KAAK,CAAC,CAAC,GAAG,CAAA;;;;;GAKR,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"currentSessionContext.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/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,oBAAoB,CAAC;AAEvD,eAAO,MAAM,qBAAqB,GAAgC,QAAQ,SAAS,YAAY,EAAE,CAAC,EAAE,CAAC,+JAgBnG,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"currentSessionContext.js","sourceRoot":"","sources":["../../../src/server/adapters/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,iCAAiC,CAAC;AAGvE,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC/D,EAAU,EACV,MAAoD;IAEpD,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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"machineTokenMigration.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/machineTokenMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,eAAO,MAAM,qBAAqB,kFAQhC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"machineTokenMigration.js","sourceRoot":"","sources":["../../../src/server/adapters/machineTokenMigration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,MAAM,CAAC,MAAM,qBAAqB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACxD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,KAAK,CAAC,CAAC,GAAG,CAAA;;;;;GAKR,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"trustedOrigins.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/trustedOrigins.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAiB,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE5F,wBAAgB,cAAc,CAAC,OAAO,EAAE,qBAAqB,GAAG,YAAY,CAW3E"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"trustedOrigins.js","sourceRoot":"","sources":["../../../src/server/adapters/trustedOrigins.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAG3D,MAAM,UAAU,cAAc,CAAC,OAA8B;IAC5D,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAClH,OAAO,MAAM,CAAC,MAAM,CACnB,CAAC,OAAsB,EAAE,EAAE,CAC1B,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;QAC5B,MAAM,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,OAAO,KAAK,OAAO;QACzC,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE,CACjB,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,IAAI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,IAAI;KAC5I,CAAC,EACH,EAAE,cAAc,EAAE,OAAO,CAAC,KAAK,EAAE,CACjC,CAAC;AACH,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"trustedProxyRanges.d.ts","sourceRoot":"","sources":["../../../src/server/adapters/trustedProxyRanges.ts"],"names":[],"mappings":"AAEA,wBAAgB,kBAAkB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAElE"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"trustedProxyRanges.js","sourceRoot":"","sources":["../../../src/server/adapters/trustedProxyRanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,MAAM,UAAU,kBAAkB,CAAC,YAAqB;IACvD,OAAO,YAAY,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SeedOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/SeedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,WAAW,CAAC,KAAK,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IACpD,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;KAAE,CAAC,EAAE,CAAC;CAC9E"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"SeedOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/SeedOptions.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"assertSchema.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/assertSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGxC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;;;;AAE9G,qBAAa,qBAAsB,SAAQ,0BAEzC;IACD,IAAa,OAAO,WAEnB;CACD;AAED,eAAO,MAAM,sBAAsB,sTASjC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"assertSchema.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/assertSchema.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,eAAe,EAAE,MAAM,6CAA6C,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAA0B,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAE9G,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CAAC,uBAAuB,EAAE;IAC/G,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;CACpC,CAAC;IACD,IAAa,OAAO;QACnB,OAAO,uCAAuC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACzE,CAAC;CACD;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAC3F,OAA4C,EAC5C,IAAwB;IAExB,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,CAAC,IAAI,qBAAqB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;AACF,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"assertSeedDatabase.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/assertSeedDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAQ,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;;;;AAEhD,qBAAa,oBAAqB,SAAQ,yBAAwC;IACjF,SAAkB,OAAO,2DAA2D;CACpF;AAED,eAAO,MAAM,kBAAkB,6FAQ7B,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"assertSeedDatabase.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/assertSeedDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAEhD,MAAM,OAAO,oBAAqB,SAAQ,IAAI,CAAC,WAAW,CAAC,sBAAsB,CAAC;IAC/D,OAAO,GAAG,uDAAuD,CAAC;CACpF;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAgC;IAC9F,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,IAAI,oBAAoB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC;IACtH,IACC,CAAC,CAAC,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,WAAW,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;WACjH,CAAC,GAAG,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,EACzG,CAAC;QACF,OAAO,KAAK,CAAC,CAAC,IAAI,oBAAoB,EAAE,CAAC;IAC1C,CAAC;AACF,CAAC,CAAC,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"clientIpHeaders.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/clientIpHeaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,eAAO,MAAM,cAAc,yBAAyB,CAAC;AAErD,wBAAgB,eAAe,CAAC,OAAO,EAAE;IACxC,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;;;+CA2BA"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"clientIpHeaders.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/clientIpHeaders.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,wCAAwC,CAAC;AAE5E,MAAM,CAAC,MAAM,cAAc,GAAG,sBAAsB,CAAC;AAErD,MAAM,UAAU,eAAe,CAAC,OAI/B;IACA,MAAM,WAAW,GAAG,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG;QAChB,SAAS,EAAE;YACV,gBAAgB,EAAE,CAAC,OAAO,CAAC,cAAc,CAAC;YAC1C,GAAG,CAAC,OAAO,CAAC,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC;YAC/E,cAAc,EAAE,kBAAkB,CAAC,OAAO,CAAC,YAAY,CAAC;SACxD;KACD,CAAC;IACF,MAAM,QAAQ,GAAG;QAChB,QAAQ,EAAE,EAAE,SAAS,EAAE,EAAE,GAAG,QAAQ,CAAC,SAAS,EAAE,gBAAgB,EAAE,CAAC,cAAc,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,EAAE;KAC1G,CAAC;IACF,OAAO,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,GAAY;QAC/C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC;QAC3D,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;QACnC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,WAAW,CAAC,CAAC;QAClE,MAAM,WAAW,GAAG,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACzG,IAAI,CAAC,OAAO,EAAE,CAAC;YACd,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YACtC,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;QAC5C,CAAC;QACD,MAAM,OAAO,GAAG,WAAW,IAAI,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC5E,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;YAC3B,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,OAAO,CAAC,CAAC;QAC1C,CAAC;QACD,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IAC/F,CAAC,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"closeRoleEndpoints.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/closeRoleEndpoints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAMlG"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"closeRoleEndpoints.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/closeRoleEndpoints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,MAAM,UAAU,kBAAkB,CAAqC,OAAiB;IACvF,OAAO;QACN,GAAG,OAAO;QACV,aAAa,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC;QAChH,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;KAC1H,CAAC;AACH,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"columnDrift.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/columnDrift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAoC3F,eAAO,MAAM,eAAe,iLA0B1B,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"columnDrift.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/columnDrift.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +0,0 @@
|
|
|
1
|
-
import { Config, Effect } from "effect";
|
|
2
|
-
import type { SeedOptions } from "#server/better-auth/adapters/SeedOptions.ts";
|
|
3
|
-
export declare function defineSeed<TRole extends string, E, R>(options: SeedOptions<TRole, E, R>): Effect.Effect<void, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError | import("../../../roles.ts").LastRoleAssigner | import("#server/better-auth/adapters/assertSeedDatabase.ts").NonLocalSeedDatabase | import("@shivaedev/errors/taxonomy.ts").NotFound | import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError | import("../UndeclaredDefaultRole.ts").UndeclaredDefaultRole | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<R, import("../../../identity.ts").Identity>, import("../../../identity.ts").SessionUser>, never>, import("../../UserProvisioning.ts").UserProvisioning>, import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>, import("effect/Scope").Scope>>;
|
|
4
|
-
//# sourceMappingURL=defineSeed.d.ts.map
|