@shivaedev/identity 0.12.0 → 0.13.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 +29 -0
- package/README.md +80 -9
- package/dist/server/better-auth/accountRoleSeed.d.ts +12 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.js +28 -0
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts +4 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.js +34 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -0
- package/dist/server/better-auth/allowedAccounts.d.ts +4 -0
- package/dist/server/better-auth/allowedAccounts.d.ts.map +1 -1
- package/dist/server/better-auth/allowedAccounts.js +2 -1
- package/dist/server/better-auth/allowedAccounts.js.map +1 -1
- package/dist/server/better-auth/assertSchema.d.ts +12 -0
- package/dist/server/better-auth/assertSchema.d.ts.map +1 -0
- package/dist/server/better-auth/assertSchema.js +19 -0
- package/dist/server/better-auth/assertSchema.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 +4 -1
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/columnDrift.d.ts +6 -0
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -0
- package/dist/server/better-auth/columnDrift.js +54 -0
- package/dist/server/better-auth/columnDrift.js.map +1 -0
- package/dist/server/better-auth/migrate.d.ts +1 -1
- package/dist/server/better-auth/migrate.d.ts.map +1 -1
- package/dist/server/better-auth/migrate.js +4 -14
- package/dist/server/better-auth/migrate.js.map +1 -1
- package/dist/server/better-auth/migrationPlan.d.ts +12 -0
- package/dist/server/better-auth/migrationPlan.d.ts.map +1 -0
- package/dist/server/better-auth/migrationPlan.js +37 -0
- package/dist/server/better-auth/migrationPlan.js.map +1 -0
- package/dist/server/better-auth/migrations/generate.d.ts +5 -0
- package/dist/server/better-auth/migrations/generate.d.ts.map +1 -0
- package/dist/server/better-auth/migrations/generate.js +8 -0
- package/dist/server/better-auth/migrations/generate.js.map +1 -0
- package/dist/server/better-auth/mount.d.ts +4 -1
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +4 -1
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/permissions.d.ts +6 -3
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/resolveRole.d.ts.map +1 -1
- package/dist/server/resolveRole.js +1 -1
- package/dist/server/resolveRole.js.map +1 -1
- package/dist/sessions.d.ts +4 -4
- package/dist/sessions.d.ts.map +1 -1
- package/package.json +8 -8
- package/src/server/better-auth/accountRoleSeed.ts +40 -0
- package/src/server/better-auth/adapters/roleSeedOptions.ts +39 -0
- package/src/server/better-auth/allowedAccounts.ts +4 -2
- package/src/server/better-auth/assertSchema.ts +24 -0
- package/src/server/better-auth/assignRole.ts +4 -1
- package/src/server/better-auth/columnDrift.ts +67 -0
- package/src/server/better-auth/migrate.ts +5 -14
- package/src/server/better-auth/migrationPlan.ts +43 -0
- package/src/server/better-auth/migrations/generate.ts +13 -0
- package/src/server/better-auth/mount.ts +9 -2
- package/src/server/permissions.ts +5 -3
- package/src/server/resolveRole.ts +3 -1
|
@@ -2,6 +2,7 @@ import { type BetterAuthOptions, betterAuth } from "better-auth";
|
|
|
2
2
|
import { Config, Effect, Option, Redacted } from "effect";
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
5
|
+
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
5
6
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
6
7
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
7
8
|
import { type BearerSessionsOptions, withBearerSessions } from "#server/better-auth/bearerSessions.ts";
|
|
@@ -10,6 +11,7 @@ import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
|
|
|
10
11
|
import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
11
12
|
import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
12
13
|
import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
|
|
14
|
+
import type { AccountRoleSeed } from "./accountRoleSeed.ts";
|
|
13
15
|
import { admittedSessions } from "./admittedSessions.ts";
|
|
14
16
|
import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
|
|
15
17
|
import { mountedSessions } from "./mountedSessions.ts";
|
|
@@ -18,7 +20,10 @@ export type BetterAuthMountOptions<E = never, R = never> = {
|
|
|
18
20
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
19
21
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
20
22
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
21
|
-
} & (
|
|
23
|
+
} & (
|
|
24
|
+
| { readonly roles?: undefined; readonly roleSeed?: undefined }
|
|
25
|
+
| (StoredRoleOptions & { readonly roles: RoleSet; readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R> })
|
|
26
|
+
);
|
|
22
27
|
|
|
23
28
|
export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
24
29
|
options: TOptions,
|
|
@@ -37,6 +42,8 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
|
|
|
37
42
|
const gate = yield* signInGate(policy);
|
|
38
43
|
const configured = mount.roles === undefined ? options : storedRoleOptions(closeRoleEndpoints(options), mount);
|
|
39
44
|
const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
|
|
45
|
+
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
46
|
+
const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
|
|
40
47
|
const rateLimit = options.rateLimit;
|
|
41
48
|
const customStorage =
|
|
42
49
|
rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
|
|
@@ -57,7 +64,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
|
|
|
57
64
|
allowedHosts: ["127.0.0.1:*", "localhost:*"],
|
|
58
65
|
protocol: "http" as const,
|
|
59
66
|
})),
|
|
60
|
-
databaseHooks:
|
|
67
|
+
databaseHooks: seeded.databaseHooks,
|
|
61
68
|
rateLimit: {
|
|
62
69
|
...rateLimit,
|
|
63
70
|
...(customStorage === undefined ? {} : { customStorage }),
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Effect, Layer, Option } from "effect";
|
|
1
|
+
import { type Context, Effect, Layer, Option } from "effect";
|
|
2
2
|
import { type HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
4
|
import type { RpcMiddleware } from "effect/rpc";
|
|
@@ -9,14 +9,16 @@ import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
|
9
9
|
import type { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
10
10
|
import { Identity, SessionUser } from "#identity.ts";
|
|
11
11
|
import type { IdentityFailures } from "#middleware.ts";
|
|
12
|
-
import { hasPermission
|
|
12
|
+
import { hasPermission } from "#permission.ts";
|
|
13
13
|
import { commandChanges } from "#server/commandChanges.ts";
|
|
14
14
|
import { recheckSession } from "./recheckSession.ts";
|
|
15
15
|
import { revalidateStream } from "./revalidateStream.ts";
|
|
16
16
|
import { type SessionPolicy, type UserSessionShape, withSessionUser } from "./session.ts";
|
|
17
17
|
|
|
18
18
|
export function permissionLayer<TMiddleware, TSession extends UserSessionShape>(
|
|
19
|
-
middleware:
|
|
19
|
+
middleware: Context.Key<TMiddleware, RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never>> & {
|
|
20
|
+
readonly permission: Permission;
|
|
21
|
+
},
|
|
20
22
|
policy: SessionPolicy<TSession>,
|
|
21
23
|
) {
|
|
22
24
|
const permission = middleware.permission;
|
|
@@ -5,7 +5,9 @@ import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
|
5
5
|
export function resolveRole(roles: RoleSet, stored: unknown) {
|
|
6
6
|
if (stored === undefined || stored === null) {
|
|
7
7
|
return Effect.andThen(
|
|
8
|
-
Effect.logWarning(
|
|
8
|
+
Effect.logWarning(
|
|
9
|
+
"Stored user role is missing. Generate and apply an auth migration with defaultRole, then use assignRole for administrators.",
|
|
10
|
+
),
|
|
9
11
|
Effect.fail(new Forbidden({ message: "User role is missing" })),
|
|
10
12
|
);
|
|
11
13
|
}
|