@shivaedev/identity 0.19.0 → 0.21.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 +46 -0
- package/README.md +171 -80
- 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/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 +2 -2
- package/dist/server/better-auth/accountRoleSeed.d.ts.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/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/mount.d.ts +51 -40
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/mount.js +19 -6
- package/dist/server/better-auth/adapters/mount.js.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.js +17 -7
- package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -1
- package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthProvider.js +25 -2
- package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -1
- 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/response.d.ts +3 -1
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +8 -6
- 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/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/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/assignRole.d.ts +1 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +4 -2
- 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 +1 -0
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +1 -1
- package/dist/server/better-auth/mountRoutes.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/oauthGrants.d.ts +4 -1
- package/dist/server/oauthGrants.d.ts.map +1 -1
- package/dist/server/oauthGrants.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/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 +22 -6
- 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 +17 -17
- 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/better-auth/UndeclaredDefaultRole.ts +9 -0
- package/src/server/better-auth/adapters/acquire.ts +17 -0
- 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/adapters/mount.ts +38 -7
- package/src/server/better-auth/adapters/oauthGrants.ts +17 -7
- package/src/server/better-auth/adapters/oauthProvider.ts +32 -2
- 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/response.ts +15 -7
- package/src/server/better-auth/adapters/roleSeedOptions.ts +2 -1
- package/src/server/better-auth/adapters/signInPolicyOptions.ts +3 -2
- package/src/server/better-auth/adapters/userDirectory.ts +33 -0
- package/src/server/better-auth/assignRole.ts +4 -2
- package/src/server/better-auth/emails.ts +11 -8
- package/src/server/better-auth/mountRoutes.ts +2 -1
- package/src/server/better-auth/userDirectoryReads.ts +47 -0
- package/src/server/better-auth/userProfiles.ts +6 -12
- package/src/server/oauthGrants.ts +5 -1
- package/src/server/permissions.ts +2 -4
- package/src/server/resolveChanges.ts +24 -0
- 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/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/testing.d.ts +0 -90
- package/dist/server/better-auth/testing.d.ts.map +0 -1
- package/dist/server/better-auth/testing.js +0 -37
- package/dist/server/better-auth/testing.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/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/src/server/better-auth/emailWindow.ts +0 -27
- package/src/server/better-auth/testing.ts +0 -59
- package/src/server/commandChanges.ts +0 -63
- package/src/server/sessionKeys.ts +0 -42
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
6
|
+
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
7
|
+
|
|
8
|
+
function unavailable() {
|
|
9
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends string>(
|
|
13
|
+
access: Pick<AccessPolicy<TRole>, "Role">,
|
|
14
|
+
options?: AuthTableOptions,
|
|
15
|
+
) {
|
|
16
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
17
|
+
const { user } = tables(options);
|
|
18
|
+
const readPage = SqlSchema.findAll({
|
|
19
|
+
execute: ({ cursor, limit }) => sql`select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
20
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
21
|
+
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
22
|
+
Request: UserListInput,
|
|
23
|
+
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
24
|
+
});
|
|
25
|
+
const readRole = SqlSchema.findOneOption({
|
|
26
|
+
execute: (id) => sql`select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
27
|
+
Request: Schema.String,
|
|
28
|
+
Result: Schema.Struct({ role: access.Role }),
|
|
29
|
+
});
|
|
30
|
+
const readNames = SqlSchema.findAll({
|
|
31
|
+
execute: (ids) => sql`select id, ${sql(user.name)} as name from ${sql(user.table)} where id in ${sql.in(ids)} order by id`,
|
|
32
|
+
Request: Schema.Array(Schema.String),
|
|
33
|
+
Result: AccountName,
|
|
34
|
+
});
|
|
35
|
+
return {
|
|
36
|
+
list: Effect.fn("UserDirectory.list")(function* (input: typeof UserListInput.Type) {
|
|
37
|
+
const rows = yield* readPage(input).pipe(Effect.mapError(unavailable));
|
|
38
|
+
const users = rows.slice(0, input.limit);
|
|
39
|
+
return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
|
|
40
|
+
}),
|
|
41
|
+
names: (ids: readonly string[]) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
42
|
+
role: Effect.fn("UserDirectory.role")(function* (id: string) {
|
|
43
|
+
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
44
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "User not found" });
|
|
45
|
+
}),
|
|
46
|
+
};
|
|
47
|
+
});
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type { Auth } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
-
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
3
|
|
|
6
4
|
export interface UserProfile {
|
|
7
5
|
readonly id: string;
|
|
@@ -9,22 +7,18 @@ export interface UserProfile {
|
|
|
9
7
|
readonly name: string;
|
|
10
8
|
}
|
|
11
9
|
|
|
10
|
+
export interface UserProfileStorage {
|
|
11
|
+
readonly findByIds: (userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable>;
|
|
12
|
+
}
|
|
13
|
+
|
|
12
14
|
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (
|
|
13
|
-
|
|
15
|
+
storage: UserProfileStorage,
|
|
14
16
|
userIds: readonly string[],
|
|
15
17
|
): Effect.fn.Return<readonly UserProfile[], AuthUnavailable> {
|
|
16
18
|
const ids = [...new Set(userIds)];
|
|
17
19
|
if (ids.length === 0) {
|
|
18
20
|
return [];
|
|
19
21
|
}
|
|
20
|
-
const users = yield*
|
|
21
|
-
const { adapter } = await auth.$context;
|
|
22
|
-
return adapter.findMany<UserProfile>({
|
|
23
|
-
limit: ids.length,
|
|
24
|
-
model: "user",
|
|
25
|
-
select: ["id", "name", "image"],
|
|
26
|
-
where: [{ field: "id", operator: "in", value: ids }],
|
|
27
|
-
});
|
|
28
|
-
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
22
|
+
const users = yield* storage.findByIds(ids);
|
|
29
23
|
return users.map(({ id, name, image }) => ({ id, image: image ?? null, name }));
|
|
30
24
|
});
|
|
@@ -14,6 +14,10 @@ export class OauthGrants extends Context.Service<
|
|
|
14
14
|
) => Effect.Effect<readonly OauthGrant[], AuthUnavailable>;
|
|
15
15
|
readonly revokeClient: (userId: string, clientId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
16
16
|
readonly revokeAllClients: (userId: string) => Effect.Effect<void, AuthUnavailable>;
|
|
17
|
-
readonly
|
|
17
|
+
readonly resolveGrant: (
|
|
18
|
+
grantId: string,
|
|
19
|
+
userId: string,
|
|
20
|
+
clientId: string,
|
|
21
|
+
) => Effect.Effect<Option.Option<{ readonly user: SessionUserValue; readonly scopes: readonly string[] }>, AuthUnavailable>;
|
|
18
22
|
}
|
|
19
23
|
>()("@shivaedev/identity/OauthGrants") {}
|
|
@@ -5,12 +5,10 @@ import type { RpcMiddleware } from "effect/rpc";
|
|
|
5
5
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
6
6
|
import { forbidden } from "@shivaedev/access/refusal.ts";
|
|
7
7
|
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
8
|
-
import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
9
8
|
import type { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
10
9
|
import { Identity, SessionUser } from "#identity.ts";
|
|
11
10
|
import type { IdentityFailures } from "#middleware.ts";
|
|
12
11
|
import { hasPermission } from "#permission.ts";
|
|
13
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
14
12
|
import { recheckSession } from "./recheckSession.ts";
|
|
15
13
|
import { revalidateStream } from "./revalidateStream.ts";
|
|
16
14
|
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
@@ -25,11 +23,11 @@ export function permissionLayer<TMiddleware>(
|
|
|
25
23
|
return Layer.effect(
|
|
26
24
|
middleware,
|
|
27
25
|
Effect.map(SessionPolicy, (policy) => {
|
|
28
|
-
const guard: RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never> = (effect, { headers, rpc
|
|
26
|
+
const guard: RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never> = (effect, { headers, rpc }) => {
|
|
29
27
|
const lookup = Effect.tap(recheckSession(headers, rpc._tag), (session) =>
|
|
30
28
|
Option.isSome(session) && !hasPermission(session.value.user, permission) ? Effect.fail(forbidden(permission)) : Effect.void,
|
|
31
29
|
);
|
|
32
|
-
return
|
|
30
|
+
return effect.pipe(
|
|
33
31
|
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, lookup))),
|
|
34
32
|
(invocation) =>
|
|
35
33
|
Effect.andThen(
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import type { Rpc } from "effect/rpc";
|
|
3
|
+
import { type QuerySubscription, querySubscription } from "@shivaedev/contract/querySubscription.ts";
|
|
4
|
+
import { CurrentViewer, type PolicyChannels } from "@shivaedev/contract/readPolicy.ts";
|
|
5
|
+
import type { MissingReadPolicy, QueryReadDenied } from "@shivaedev/contract/readPolicyErrors.ts";
|
|
6
|
+
import type { QueryReference } from "@shivaedev/contract/serverMetadata.ts";
|
|
7
|
+
import { Identity } from "#identity.ts";
|
|
8
|
+
|
|
9
|
+
export function resolveChanges<TRpc extends Rpc.Any>(
|
|
10
|
+
rpc: TRpc,
|
|
11
|
+
references: readonly QueryReference[],
|
|
12
|
+
): Effect.Effect<
|
|
13
|
+
QuerySubscription<PolicyChannels<TRpc>["error"], PolicyChannels<TRpc>["services"]>,
|
|
14
|
+
PolicyChannels<TRpc>["error"] | MissingReadPolicy | QueryReadDenied,
|
|
15
|
+
PolicyChannels<TRpc>["services"]
|
|
16
|
+
>;
|
|
17
|
+
export function resolveChanges(rpc: Rpc.Any, references: readonly QueryReference[]) {
|
|
18
|
+
return Effect.fnUntraced(function* () {
|
|
19
|
+
const identity = yield* Effect.serviceOption(Identity);
|
|
20
|
+
const current = yield* CurrentViewer;
|
|
21
|
+
const viewer = Option.orElse(identity, () => current);
|
|
22
|
+
return yield* querySubscription(rpc, references, viewer);
|
|
23
|
+
})();
|
|
24
|
+
}
|
package/src/server/session.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
-
import {
|
|
3
|
+
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
4
|
import { type AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
5
5
|
import {
|
|
6
6
|
Identity,
|
|
@@ -12,7 +12,6 @@ import {
|
|
|
12
12
|
type SessionUserWithProviderAccountsValue,
|
|
13
13
|
} from "#identity.ts";
|
|
14
14
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
15
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
16
15
|
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
17
16
|
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
18
17
|
import { lookupSession, sessionRequest } from "./lookupSession.ts";
|
|
@@ -39,16 +38,17 @@ export function authenticatedLayer() {
|
|
|
39
38
|
Effect.map(
|
|
40
39
|
SessionPolicy,
|
|
41
40
|
(policy) =>
|
|
42
|
-
(effect, { headers, rpc
|
|
41
|
+
(effect, { headers, rpc }) =>
|
|
43
42
|
Effect.gen(function* () {
|
|
44
43
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
45
44
|
if (Option.isNone(session)) {
|
|
46
45
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
47
46
|
}
|
|
48
47
|
const id = yield* identified(session.value.user.id);
|
|
49
|
-
return yield*
|
|
48
|
+
return yield* effect.pipe(
|
|
50
49
|
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
51
50
|
Effect.provideService(Identity, { id }),
|
|
51
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
52
52
|
Effect.annotateLogs({ userId: id }),
|
|
53
53
|
);
|
|
54
54
|
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
@@ -61,17 +61,18 @@ export function maybeAuthenticatedLayer() {
|
|
|
61
61
|
Effect.map(
|
|
62
62
|
SessionPolicy,
|
|
63
63
|
(policy) =>
|
|
64
|
-
(effect, { headers, rpc
|
|
64
|
+
(effect, { headers, rpc }) =>
|
|
65
65
|
Effect.gen(function* () {
|
|
66
66
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
67
67
|
if (Option.isNone(session)) {
|
|
68
|
-
const invocation =
|
|
68
|
+
const invocation = effect.pipe(Effect.provideService(CurrentViewer, Option.none()));
|
|
69
69
|
return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
|
|
70
70
|
}
|
|
71
71
|
const id = yield* identified(session.value.user.id);
|
|
72
|
-
return yield*
|
|
72
|
+
return yield* effect.pipe(
|
|
73
73
|
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
74
74
|
Effect.provideService(OptionalIdentity, Option.some({ id })),
|
|
75
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
75
76
|
Effect.annotateLogs({ userId: id }),
|
|
76
77
|
);
|
|
77
78
|
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
@@ -92,6 +93,7 @@ export function withSessionUser(headers: Headers.Headers, operation: string) {
|
|
|
92
93
|
const id = yield* identified(session.value.user.id);
|
|
93
94
|
return yield* effect.pipe(
|
|
94
95
|
Effect.provideService(Identity, { id }),
|
|
96
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
95
97
|
Effect.provideService(SessionUser, user),
|
|
96
98
|
Effect.annotateLogs({ userId: id }),
|
|
97
99
|
);
|
|
@@ -103,8 +105,8 @@ export function authenticatedUserLayer() {
|
|
|
103
105
|
Effect.map(
|
|
104
106
|
SessionPolicy,
|
|
105
107
|
(policy) =>
|
|
106
|
-
(effect, { headers, rpc
|
|
107
|
-
|
|
108
|
+
(effect, { headers, rpc }) =>
|
|
109
|
+
effect.pipe(
|
|
108
110
|
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)))),
|
|
109
111
|
withSessionUser(headers, rpc._tag),
|
|
110
112
|
Effect.provideService(SessionPolicy, policy),
|
|
@@ -122,7 +124,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
122
124
|
Effect.map(
|
|
123
125
|
SessionPolicy,
|
|
124
126
|
(policy) =>
|
|
125
|
-
(effect, { headers, rpc
|
|
127
|
+
(effect, { headers, rpc }) =>
|
|
126
128
|
Effect.gen(function* () {
|
|
127
129
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
128
130
|
if (Option.isNone(session)) {
|
|
@@ -131,9 +133,10 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
131
133
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
132
134
|
const { id } = user;
|
|
133
135
|
yield* identified(id);
|
|
134
|
-
return yield*
|
|
136
|
+
return yield* effect.pipe(
|
|
135
137
|
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
136
138
|
Effect.provideService(Identity, { id }),
|
|
139
|
+
Effect.provideService(CurrentViewer, Option.some({ id })),
|
|
137
140
|
Effect.provideService(SessionUser, user),
|
|
138
141
|
Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts }),
|
|
139
142
|
Effect.annotateLogs({ userId: id }),
|
package/src/server/tracing.ts
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { Cause,
|
|
1
|
+
import { Cause, Effect, ErrorReporter, Exit, Layer, Option, Predicate, Random } from "effect";
|
|
2
2
|
import { Headers } from "effect/http";
|
|
3
|
-
import { KeyScope } from "@shivaedev/contract/serverMetadata.ts";
|
|
4
3
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
4
|
import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
|
|
6
5
|
import { isSensitiveKey, REDACTED, redactText, type SensitiveKey } from "@shivaedev/errors/sensitive.ts";
|
|
7
6
|
import { RequestId } from "#identity.ts";
|
|
8
|
-
import {
|
|
9
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
7
|
+
import { RequestTracing } from "#middleware.ts";
|
|
10
8
|
export interface RequestTracingOptions {
|
|
11
9
|
readonly header?: string;
|
|
12
10
|
readonly sensitive?: SensitiveKey;
|
|
@@ -61,11 +59,8 @@ export function requestTracingLayer(options: RequestTracingOptions = {}): Layer.
|
|
|
61
59
|
Effect.gen(function* () {
|
|
62
60
|
const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
|
|
63
61
|
yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
);
|
|
67
|
-
const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
|
|
68
|
-
return yield* invocation.pipe(
|
|
62
|
+
|
|
63
|
+
return yield* effect.pipe(
|
|
69
64
|
Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))),
|
|
70
65
|
Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)),
|
|
71
66
|
Effect.provideService(RequestId, requestId),
|
package/src/users.ts
ADDED
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { collection } from "@shivaedev/changes/keys.ts";
|
|
3
|
+
|
|
4
|
+
export const userKeys = collection("identity.users", Schema.String);
|
|
5
|
+
export const roleKeys = collection("identity.roles", Schema.String);
|
|
6
|
+
|
|
7
|
+
export const DirectoryUser = Schema.Struct({
|
|
8
|
+
createdAt: Schema.DateTimeUtcFromDate,
|
|
9
|
+
email: Schema.String,
|
|
10
|
+
id: Schema.String,
|
|
11
|
+
name: Schema.String,
|
|
12
|
+
role: Schema.String,
|
|
13
|
+
});
|
|
14
|
+
export const UserListInput = Schema.Struct({
|
|
15
|
+
cursor: Schema.optionalKey(Schema.String),
|
|
16
|
+
limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
|
|
17
|
+
});
|
|
18
|
+
export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(DirectoryUser) });
|
|
19
|
+
export const AccountName = Schema.Struct({ id: Schema.String, name: Schema.String });
|
|
@@ -1,3 +0,0 @@
|
|
|
1
|
-
import { Duration, Effect } from "effect";
|
|
2
|
-
export declare const emailWindow: (window?: Duration.Input | undefined) => Effect.Effect<(account: string, kind: string) => Effect.Effect<boolean, never, never>, never, import("effect/Scope").Scope>;
|
|
3
|
-
//# sourceMappingURL=emailWindow.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"emailWindow.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/emailWindow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEjD,eAAO,MAAM,WAAW,mEAMN,MAAM,QAAQ,MAAM,+EAkBpC,CAAC"}
|
|
@@ -1,23 +0,0 @@
|
|
|
1
|
-
import { Clock, Duration, Effect } from "effect";
|
|
2
|
-
export const emailWindow = Effect.fnUntraced(function* (window = "1 minute") {
|
|
3
|
-
const milliseconds = Duration.toMillis(Duration.fromInputUnsafe(window));
|
|
4
|
-
const entries = yield* Effect.acquireRelease(Effect.sync(() => new Map()), (map) => Effect.sync(() => map.clear()));
|
|
5
|
-
return (account, kind) => Effect.gen(function* () {
|
|
6
|
-
const now = yield* Clock.currentTimeMillis;
|
|
7
|
-
for (const [entryKey, expiry] of entries) {
|
|
8
|
-
if (expiry > now) {
|
|
9
|
-
break;
|
|
10
|
-
}
|
|
11
|
-
entries.delete(entryKey);
|
|
12
|
-
}
|
|
13
|
-
const key = `${account}:${kind}`;
|
|
14
|
-
const reservedUntil = entries.get(key);
|
|
15
|
-
if (reservedUntil !== undefined && reservedUntil > now) {
|
|
16
|
-
return false;
|
|
17
|
-
}
|
|
18
|
-
entries.delete(key);
|
|
19
|
-
entries.set(key, now + milliseconds);
|
|
20
|
-
return true;
|
|
21
|
-
});
|
|
22
|
-
});
|
|
23
|
-
//# sourceMappingURL=emailWindow.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"emailWindow.js","sourceRoot":"","sources":["../../../src/server/better-auth/emailWindow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEjD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAmB,UAAU;IAC1F,MAAM,YAAY,GAAG,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAC3C,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,GAAG,EAAkB,CAAC,EAC5C,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,CACvC,CAAC;IACF,OAAO,CAAC,OAAe,EAAE,IAAY,EAAE,EAAE,CACxC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC;QAC3C,KAAK,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,OAAO,EAAE,CAAC;YAC1C,IAAI,MAAM,GAAG,GAAG,EAAE,CAAC;gBAClB,MAAM;YACP,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAC1B,CAAC;QACD,MAAM,GAAG,GAAG,GAAG,OAAO,IAAI,IAAI,EAAE,CAAC;QACjC,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvC,IAAI,aAAa,KAAK,SAAS,IAAI,aAAa,GAAG,GAAG,EAAE,CAAC;YACxD,OAAO,KAAK,CAAC;QACd,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,GAAG,YAAY,CAAC,CAAC;QACrC,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1,90 +0,0 @@
|
|
|
1
|
-
import type { AuthContext } from "better-auth";
|
|
2
|
-
import type { testUtils } from "better-auth/plugins";
|
|
3
|
-
import { Effect } from "effect";
|
|
4
|
-
type TestContext = ReturnType<ReturnType<typeof testUtils>["init"]>["context"];
|
|
5
|
-
type AccountContext = Pick<AuthContext, "internalAdapter">;
|
|
6
|
-
export declare const signedInUser: (auth: {
|
|
7
|
-
readonly $context: Promise<TestContext & AccountContext & Pick<AuthContext, "sessionConfig">>;
|
|
8
|
-
}, args_1: Partial<{
|
|
9
|
-
id: string;
|
|
10
|
-
createdAt: Date;
|
|
11
|
-
updatedAt: Date;
|
|
12
|
-
email: string;
|
|
13
|
-
emailVerified: boolean;
|
|
14
|
-
name: string;
|
|
15
|
-
image?: string | null | undefined;
|
|
16
|
-
}> & Record<string, unknown> & {
|
|
17
|
-
readonly providerAccounts?: readonly {
|
|
18
|
-
readonly providerId: string;
|
|
19
|
-
readonly accountId: string;
|
|
20
|
-
}[];
|
|
21
|
-
}) => Effect.Effect<{
|
|
22
|
-
user: import("better-auth").User;
|
|
23
|
-
headers: Headers;
|
|
24
|
-
cookies: import("better-auth/plugins").TestCookie[];
|
|
25
|
-
token: string;
|
|
26
|
-
session: {
|
|
27
|
-
id: string;
|
|
28
|
-
createdAt: Date;
|
|
29
|
-
updatedAt: Date;
|
|
30
|
-
userId: string;
|
|
31
|
-
token: string;
|
|
32
|
-
ipAddress?: string | null | undefined;
|
|
33
|
-
userAgent?: string | null | undefined;
|
|
34
|
-
expiresAt: Date;
|
|
35
|
-
};
|
|
36
|
-
}, never, never>;
|
|
37
|
-
export declare const signInAgain: (auth: {
|
|
38
|
-
readonly $context: Promise<TestContext & AccountContext & Pick<AuthContext, "sessionConfig">>;
|
|
39
|
-
}, userId: string) => Effect.Effect<{
|
|
40
|
-
user: import("better-auth").User;
|
|
41
|
-
headers: Headers;
|
|
42
|
-
cookies: import("better-auth/plugins").TestCookie[];
|
|
43
|
-
token: string;
|
|
44
|
-
session: {
|
|
45
|
-
id: string;
|
|
46
|
-
createdAt: Date;
|
|
47
|
-
updatedAt: Date;
|
|
48
|
-
userId: string;
|
|
49
|
-
token: string;
|
|
50
|
-
ipAddress?: string | null | undefined;
|
|
51
|
-
userAgent?: string | null | undefined;
|
|
52
|
-
expiresAt: Date;
|
|
53
|
-
};
|
|
54
|
-
}, never, never>;
|
|
55
|
-
export declare function storedProviderAccounts(auth: {
|
|
56
|
-
readonly $context: Promise<AccountContext>;
|
|
57
|
-
}, userId: string): Promise<{
|
|
58
|
-
accountId: string;
|
|
59
|
-
hasAccessToken: boolean;
|
|
60
|
-
hasIdToken: boolean;
|
|
61
|
-
hasPassword: boolean;
|
|
62
|
-
hasRefreshToken: boolean;
|
|
63
|
-
providerId: string;
|
|
64
|
-
}[]>;
|
|
65
|
-
export declare const passwordUser: (auth: {
|
|
66
|
-
readonly $context: Promise<TestContext & AccountContext & {
|
|
67
|
-
readonly password: Pick<AuthContext["password"], "hash">;
|
|
68
|
-
}>;
|
|
69
|
-
}, args_1: Partial<{
|
|
70
|
-
id: string;
|
|
71
|
-
createdAt: Date;
|
|
72
|
-
updatedAt: Date;
|
|
73
|
-
email: string;
|
|
74
|
-
emailVerified: boolean;
|
|
75
|
-
name: string;
|
|
76
|
-
image?: string | null | undefined;
|
|
77
|
-
}> & Record<string, unknown> & {
|
|
78
|
-
readonly email: string;
|
|
79
|
-
readonly password: string;
|
|
80
|
-
}) => Effect.Effect<{
|
|
81
|
-
id: string;
|
|
82
|
-
createdAt: Date;
|
|
83
|
-
updatedAt: Date;
|
|
84
|
-
email: string;
|
|
85
|
-
emailVerified: boolean;
|
|
86
|
-
name: string;
|
|
87
|
-
image?: string | null | undefined;
|
|
88
|
-
}, never, never>;
|
|
89
|
-
export {};
|
|
90
|
-
//# sourceMappingURL=testing.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvC,KAAK,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC/E,KAAK,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAE3D,eAAO,MAAM,YAAY;uBACG,OAAO,CAAC,WAAW,GAAG,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;gCAKxE,SAAS;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE;;;;;;;;;;;;;;;;gBASlG,CAAC;AAEH,eAAO,MAAM,WAAW;uBACI,OAAO,CAAC,WAAW,GAAG,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;;;;;;;gBASpG,CAAC;AAEH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM;;;;;;;KAWhH;AAED,eAAO,MAAM,YAAY;uBACG,OAAO,CAAC,WAAW,GAAG,cAAc,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;;;;;;;;;;oBACjC,MAAM;uBAAqB,MAAM;;;;;;;;;gBAO9H,CAAC"}
|
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
import { Clock, Effect } from "effect";
|
|
2
|
-
export const signedInUser = Effect.fnUntraced(function* (auth, { providerAccounts = [], ...fields }) {
|
|
3
|
-
const { test, internalAdapter } = yield* Effect.promise(() => auth.$context);
|
|
4
|
-
const user = yield* Effect.promise(() => test.saveUser(test.createUser(fields)));
|
|
5
|
-
for (const { providerId, accountId } of providerAccounts) {
|
|
6
|
-
yield* Effect.promise(() => internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
7
|
-
}
|
|
8
|
-
return yield* signInAgain(auth, user.id);
|
|
9
|
-
});
|
|
10
|
-
export const signInAgain = Effect.fnUntraced(function* (auth, userId) {
|
|
11
|
-
const { test, internalAdapter, sessionConfig } = yield* Effect.promise(() => auth.$context);
|
|
12
|
-
const now = yield* Clock.currentTimeMillis;
|
|
13
|
-
const login = yield* Effect.promise(() => test.login({ userId }));
|
|
14
|
-
const expiresAt = new Date(now + sessionConfig.expiresIn * 1000);
|
|
15
|
-
yield* Effect.promise(() => internalAdapter.updateSession(login.token, { expiresAt }));
|
|
16
|
-
return { ...login, session: { ...login.session, expiresAt } };
|
|
17
|
-
});
|
|
18
|
-
export async function storedProviderAccounts(auth, userId) {
|
|
19
|
-
const { internalAdapter } = await auth.$context;
|
|
20
|
-
const accounts = await internalAdapter.findAccounts(userId);
|
|
21
|
-
return accounts.map(({ providerId, accountId, accessToken, refreshToken, idToken, password }) => ({
|
|
22
|
-
accountId,
|
|
23
|
-
hasAccessToken: Boolean(accessToken),
|
|
24
|
-
hasIdToken: Boolean(idToken),
|
|
25
|
-
hasPassword: Boolean(password),
|
|
26
|
-
hasRefreshToken: Boolean(refreshToken),
|
|
27
|
-
providerId,
|
|
28
|
-
}));
|
|
29
|
-
}
|
|
30
|
-
export const passwordUser = Effect.fnUntraced(function* (auth, { password, ...fields }) {
|
|
31
|
-
const { test, internalAdapter, password: credential } = yield* Effect.promise(() => auth.$context);
|
|
32
|
-
const user = yield* Effect.promise(() => test.saveUser(test.createUser(fields)));
|
|
33
|
-
const hash = yield* Effect.promise(() => credential.hash(password));
|
|
34
|
-
yield* Effect.promise(() => internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id }));
|
|
35
|
-
return user;
|
|
36
|
-
});
|
|
37
|
-
//# sourceMappingURL=testing.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"commandChanges.d.ts","sourceRoot":"","sources":["../../src/server/commandChanges.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAE3D,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAStC,wBAAgB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,YAAY,EAAE,OAAO,EAAE,OAAO,0BAmD9G"}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import { Context, Effect, Option, Schedule } from "effect";
|
|
2
|
-
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
-
import { SqlClient } from "effect/sql";
|
|
4
|
-
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
5
|
-
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
6
|
-
import { CommandInvalidation } from "@shivaedev/contract/serverMetadata.ts";
|
|
7
|
-
import { CommandRecovery } from "@shivaedev/sql/internal/CommandRecovery.ts";
|
|
8
|
-
import { ChangeObserver, invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
9
|
-
import { sessionKeyContext } from "#server/sessionKeys.ts";
|
|
10
|
-
export function commandChanges(effect, rpc, payload) {
|
|
11
|
-
const invalidates = Context.getOption(rpc.annotations, CommandInvalidation);
|
|
12
|
-
if (Option.isNone(invalidates)) {
|
|
13
|
-
return effect;
|
|
14
|
-
}
|
|
15
|
-
const declared = invalidates.value.invalidates;
|
|
16
|
-
return Effect.uninterruptibleMask((restore) => Effect.gen(function* () {
|
|
17
|
-
const context = yield* sessionKeyContext(rpc);
|
|
18
|
-
const sql = yield* Effect.serviceOption(SqlClient.SqlClient);
|
|
19
|
-
const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
20
|
-
if (Option.isNone(reactivity)) {
|
|
21
|
-
return yield* restore(effect);
|
|
22
|
-
}
|
|
23
|
-
const published = new Set();
|
|
24
|
-
const observer = yield* ChangeObserver;
|
|
25
|
-
const result = yield* restore(effect).pipe(Effect.provideService(ChangeObserver, (event) => {
|
|
26
|
-
if (event._tag === "Published") {
|
|
27
|
-
for (const key of event.changes) {
|
|
28
|
-
published.add(key);
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
return observer(event);
|
|
32
|
-
}));
|
|
33
|
-
const viewer = yield* CurrentViewer;
|
|
34
|
-
const keys = invalidationKeys(declared(payload, result, viewer), context).filter((key) => !published.has(key));
|
|
35
|
-
if (keys.length > 0) {
|
|
36
|
-
const announce = Option.isNone(sql)
|
|
37
|
-
? reactivity.value.invalidate(keys)
|
|
38
|
-
: invalidateOnCommit(keys).pipe(transact({ onSqlError: (error) => error }), Effect.provideService(SqlClient.SqlClient, sql.value), Effect.provideService(Reactivity.Reactivity, reactivity.value));
|
|
39
|
-
yield* announce.pipe(Effect.catchCause(Effect.fail), Effect.retry({ schedule: Schedule.exponential("50 millis"), times: 2 }), Effect.catch((cause) => Effect.gen(function* () {
|
|
40
|
-
yield* Effect.logError("Committed command invalidation failed; resynchronizing live streams", cause);
|
|
41
|
-
const recover = yield* CommandRecovery;
|
|
42
|
-
yield* recover;
|
|
43
|
-
})));
|
|
44
|
-
}
|
|
45
|
-
return result;
|
|
46
|
-
}));
|
|
47
|
-
}
|
|
48
|
-
//# sourceMappingURL=commandChanges.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"commandChanges.js","sourceRoot":"","sources":["../../src/server/commandChanges.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +0,0 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
import type { Rpc } from "effect/rpc";
|
|
3
|
-
import type { KeyContext } from "@shivaedev/changes/keys.ts";
|
|
4
|
-
import { type QuerySubscription } from "@shivaedev/contract/querySubscription.ts";
|
|
5
|
-
import { type PolicyChannels } from "@shivaedev/contract/readPolicy.ts";
|
|
6
|
-
import type { MissingReadPolicy, QueryReadDenied } from "@shivaedev/contract/readPolicyErrors.ts";
|
|
7
|
-
import { type QueryReference } from "@shivaedev/contract/serverMetadata.ts";
|
|
8
|
-
export declare function sessionKeyContext(rpc: Pick<Rpc.AnyWithProps, "annotations">): Effect.Effect<KeyContext | undefined>;
|
|
9
|
-
export declare function resolveChanges<TRpc extends Rpc.Any>(rpc: TRpc, references: readonly QueryReference[]): Effect.Effect<{
|
|
10
|
-
readonly context: KeyContext | undefined;
|
|
11
|
-
readonly subscription: QuerySubscription<PolicyChannels<TRpc>["error"], PolicyChannels<TRpc>["services"]>;
|
|
12
|
-
}, PolicyChannels<TRpc>["error"] | MissingReadPolicy | QueryReadDenied, PolicyChannels<TRpc>["services"]>;
|
|
13
|
-
//# sourceMappingURL=sessionKeys.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sessionKeys.d.ts","sourceRoot":"","sources":["../../src/server/sessionKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,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,EAAY,KAAK,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAGtF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,YAAY,EAAE,aAAa,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,GAAG,SAAS,CAAC,CAWnH;AAED,wBAAgB,cAAc,CAAC,IAAI,SAAS,GAAG,CAAC,GAAG,EAClD,GAAG,EAAE,IAAI,EACT,UAAU,EAAE,SAAS,cAAc,EAAE,GACnC,MAAM,CAAC,MAAM,CACf;IACC,QAAQ,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;CAC1G,EACD,cAAc,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,iBAAiB,GAAG,eAAe,EACnE,cAAc,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,CAChC,CAAC"}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { Context, Effect, Option } from "effect";
|
|
2
|
-
import { querySubscription } from "@shivaedev/contract/querySubscription.ts";
|
|
3
|
-
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
|
-
import { KeyScope } from "@shivaedev/contract/serverMetadata.ts";
|
|
5
|
-
import { Identity } from "#identity.ts";
|
|
6
|
-
export function sessionKeyContext(rpc) {
|
|
7
|
-
if (Option.isNone(Context.getOption(rpc.annotations, KeyScope))) {
|
|
8
|
-
return Effect.succeed(undefined);
|
|
9
|
-
}
|
|
10
|
-
return Effect.gen(function* () {
|
|
11
|
-
const identity = yield* Effect.serviceOption(Identity);
|
|
12
|
-
if (Option.isNone(identity)) {
|
|
13
|
-
return yield* Effect.die(new Error("Session-scoped contract keys require request-local Identity"));
|
|
14
|
-
}
|
|
15
|
-
return { scope: identity.value.id };
|
|
16
|
-
});
|
|
17
|
-
}
|
|
18
|
-
export function resolveChanges(rpc, references) {
|
|
19
|
-
return Effect.fnUntraced(function* () {
|
|
20
|
-
const identity = yield* Effect.serviceOption(Identity);
|
|
21
|
-
const current = yield* CurrentViewer;
|
|
22
|
-
const viewer = Option.orElse(identity, () => current);
|
|
23
|
-
const subscription = yield* querySubscription(rpc, references, viewer);
|
|
24
|
-
return { context: yield* sessionKeyContext(rpc), subscription };
|
|
25
|
-
})();
|
|
26
|
-
}
|
|
27
|
-
//# sourceMappingURL=sessionKeys.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"sessionKeys.js","sourceRoot":"","sources":["../../src/server/sessionKeys.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGjD,OAAO,EAA0B,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AACrG,OAAO,EAAE,aAAa,EAAuB,MAAM,mCAAmC,CAAC;AAEvF,OAAO,EAAE,QAAQ,EAAuB,MAAM,uCAAuC,CAAC;AACtF,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAExC,MAAM,UAAU,iBAAiB,CAAC,GAA0C;IAC3E,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC,EAAE,CAAC;QACjE,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAC;QACvD,IAAI,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC,CAAC;QACpG,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;IACrC,CAAC,CAAC,CAAC;AACJ,CAAC;AAaD,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,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC;QACvE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,YAAY,EAAE,CAAC;IACjE,CAAC,CAAC,EAAE,CAAC;AACN,CAAC"}
|
|
@@ -1,27 +0,0 @@
|
|
|
1
|
-
import { Clock, Duration, Effect } from "effect";
|
|
2
|
-
|
|
3
|
-
export const emailWindow = Effect.fnUntraced(function* (window: Duration.Input = "1 minute") {
|
|
4
|
-
const milliseconds = Duration.toMillis(Duration.fromInputUnsafe(window));
|
|
5
|
-
const entries = yield* Effect.acquireRelease(
|
|
6
|
-
Effect.sync(() => new Map<string, number>()),
|
|
7
|
-
(map) => Effect.sync(() => map.clear()),
|
|
8
|
-
);
|
|
9
|
-
return (account: string, kind: string) =>
|
|
10
|
-
Effect.gen(function* () {
|
|
11
|
-
const now = yield* Clock.currentTimeMillis;
|
|
12
|
-
for (const [entryKey, expiry] of entries) {
|
|
13
|
-
if (expiry > now) {
|
|
14
|
-
break;
|
|
15
|
-
}
|
|
16
|
-
entries.delete(entryKey);
|
|
17
|
-
}
|
|
18
|
-
const key = `${account}:${kind}`;
|
|
19
|
-
const reservedUntil = entries.get(key);
|
|
20
|
-
if (reservedUntil !== undefined && reservedUntil > now) {
|
|
21
|
-
return false;
|
|
22
|
-
}
|
|
23
|
-
entries.delete(key);
|
|
24
|
-
entries.set(key, now + milliseconds);
|
|
25
|
-
return true;
|
|
26
|
-
});
|
|
27
|
-
});
|