@shivaedev/identity 0.19.0 → 0.20.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +40 -0
- package/README.md +169 -77
- 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/testingCredentials.d.ts +4 -0
- package/dist/server/better-auth/adapters/testingCredentials.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/testingCredentials.js +8 -0
- package/dist/server/better-auth/adapters/testingCredentials.js.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts +7 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.js +20 -0
- package/dist/server/better-auth/adapters/userDirectory.js.map +1 -0
- package/dist/server/better-auth/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/testing.d.ts +13 -39
- package/dist/server/better-auth/testing.d.ts.map +1 -1
- package/dist/server/better-auth/testing.js +44 -12
- package/dist/server/better-auth/testing.js.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts +26 -0
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -0
- package/dist/server/better-auth/userDirectoryReads.js +42 -0
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -0
- package/dist/server/better-auth/userProfiles.d.ts +4 -6
- package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
- package/dist/server/better-auth/userProfiles.js +2 -11
- package/dist/server/better-auth/userProfiles.js.map +1 -1
- package/dist/server/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 +19 -3
- package/dist/sessions.d.ts.map +1 -1
- package/dist/users.d.ts +29 -0
- package/dist/users.d.ts.map +1 -0
- package/dist/users.js +18 -0
- package/dist/users.js.map +1 -0
- package/package.json +16 -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/testingCredentials.ts +9 -0
- 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/testing.ts +68 -18
- package/src/server/better-auth/userDirectoryReads.ts +47 -0
- package/src/server/better-auth/userProfiles.ts +6 -12
- package/src/server/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/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/commandChanges.ts +0 -63
- package/src/server/sessionKeys.ts +0 -42
|
@@ -2,6 +2,7 @@ import type { BetterAuthOptions, ValidateUserInfoResult, ValidateUserInfoSource
|
|
|
2
2
|
import { APIError } from "better-auth/api";
|
|
3
3
|
import { Effect, Exit } from "effect";
|
|
4
4
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
|
+
import { authRefusals } from "#authRefusal.ts";
|
|
5
6
|
import { fromStorage, type PolicyStorage, type SignInGate } from "#server/better-auth/signInGate.ts";
|
|
6
7
|
|
|
7
8
|
type SessionCreateBefore = NonNullable<NonNullable<NonNullable<NonNullable<BetterAuthOptions["databaseHooks"]>["session"]>["create"]>["before"]>;
|
|
@@ -9,8 +10,8 @@ type ValidateUserInfo = NonNullable<NonNullable<BetterAuthOptions["user"]>["vali
|
|
|
9
10
|
|
|
10
11
|
const REFUSED_MESSAGE = "This account may not sign in";
|
|
11
12
|
const UNAVAILABLE_MESSAGE = "Sign-in is temporarily unavailable";
|
|
12
|
-
const refused: ValidateUserInfoResult = { error:
|
|
13
|
-
const unavailable: ValidateUserInfoResult = { error:
|
|
13
|
+
const refused: ValidateUserInfoResult = { error: authRefusals.signInRefused.wire, errorDescription: REFUSED_MESSAGE };
|
|
14
|
+
const unavailable: ValidateUserInfoResult = { error: authRefusals.signInUnavailable.wire, errorDescription: UNAVAILABLE_MESSAGE };
|
|
14
15
|
|
|
15
16
|
function logged<A, E>(effect: Effect.Effect<A, E>) {
|
|
16
17
|
return Effect.tapCause(effect, (cause) => Effect.logError("Sign-in policy check failed", redact(cause)));
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { generateRandomString, makeSignature } from "better-auth/crypto";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
|
|
4
|
+
export const testUserEmail = Effect.sync(() => `test-${generateRandomString(8)}@example.com`);
|
|
5
|
+
|
|
6
|
+
export const signedSessionToken = Effect.fnUntraced(function* (token: string, secret: string) {
|
|
7
|
+
const signature = yield* Effect.promise(() => makeSignature(token, secret));
|
|
8
|
+
return `${token}.${signature}`;
|
|
9
|
+
});
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
5
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
7
|
+
import { userDirectoryReads } from "#server/better-auth/userDirectoryReads.ts";
|
|
8
|
+
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
9
|
+
import type { AuthTableOptions } from "./tables.ts";
|
|
10
|
+
|
|
11
|
+
export function betterAuthUserDirectory<TRole extends string>(
|
|
12
|
+
access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
|
|
13
|
+
options?: AuthTableOptions,
|
|
14
|
+
) {
|
|
15
|
+
return Layer.effect(UserDirectory)(
|
|
16
|
+
Effect.gen(function* () {
|
|
17
|
+
const sql = yield* SqlClient.SqlClient;
|
|
18
|
+
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
19
|
+
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
20
|
+
const reads = yield* userDirectoryReads(access, options);
|
|
21
|
+
return {
|
|
22
|
+
...reads,
|
|
23
|
+
assignRole: (userId: string, role: string) =>
|
|
24
|
+
Schema.decodeUnknownEffect(access.Role)(role).pipe(
|
|
25
|
+
Effect.mapError(() => new AuthUnavailable({ message: "User role is not declared by the application" })),
|
|
26
|
+
Effect.flatMap((declared) => assignRole(access, userId, declared, options)),
|
|
27
|
+
Effect.provideService(SqlClient.SqlClient, sql),
|
|
28
|
+
Effect.provideService(Reactivity.Reactivity, reactivity),
|
|
29
|
+
),
|
|
30
|
+
};
|
|
31
|
+
}),
|
|
32
|
+
);
|
|
33
|
+
}
|
|
@@ -2,10 +2,12 @@ import { Effect, Option, Schema } from "effect";
|
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
4
4
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
5
|
-
import {
|
|
5
|
+
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
6
6
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
7
7
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
8
|
+
import { AssignRoles, LastRoleAssigner } from "#roles.ts";
|
|
8
9
|
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
10
|
+
import { roleKeys, userKeys } from "#users.ts";
|
|
9
11
|
|
|
10
12
|
function unavailable() {
|
|
11
13
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
@@ -48,7 +50,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
|
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
yield* sql`update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
|
|
51
|
-
yield* invalidateOnCommit([
|
|
53
|
+
yield* invalidateOnCommit(invalidationKeys([userKeys.item(userId), roleKeys.item(userId)]));
|
|
52
54
|
return true;
|
|
53
55
|
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
54
56
|
});
|
|
@@ -1,18 +1,21 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type { Duration, Effect } from "effect";
|
|
1
|
+
import type { Duration, Effect, Redacted } from "effect";
|
|
3
2
|
import type { BetterAuthHookError } from "./databaseHooks.ts";
|
|
4
3
|
|
|
5
4
|
interface Message {
|
|
6
|
-
readonly url: string
|
|
7
|
-
readonly user:
|
|
5
|
+
readonly url: Redacted.Redacted<string>;
|
|
6
|
+
readonly user: {
|
|
7
|
+
id: string;
|
|
8
|
+
email: string;
|
|
9
|
+
name: string;
|
|
10
|
+
};
|
|
8
11
|
}
|
|
9
12
|
|
|
10
13
|
export type AuthEmail = Message &
|
|
11
14
|
(
|
|
12
|
-
| { readonly _tag: "ConfirmAccount"; readonly token: string }
|
|
13
|
-
| { readonly _tag: "ApproveEmailChange"; readonly token: string
|
|
14
|
-
| { readonly _tag: "ConfirmNewAddress"; readonly token: string
|
|
15
|
-
| { readonly _tag: "ResetPassword"; readonly token: string }
|
|
15
|
+
| { readonly _tag: "ConfirmAccount"; readonly token: Redacted.Redacted<string> }
|
|
16
|
+
| { readonly _tag: "ApproveEmailChange"; readonly token: Redacted.Redacted<string>; readonly newEmail: string }
|
|
17
|
+
| { readonly _tag: "ConfirmNewAddress"; readonly token: Redacted.Redacted<string>; readonly newEmail: string }
|
|
18
|
+
| { readonly _tag: "ResetPassword"; readonly token: Redacted.Redacted<string> }
|
|
16
19
|
| { readonly _tag: "AccountAlreadyExists" }
|
|
17
20
|
);
|
|
18
21
|
|
|
@@ -4,6 +4,7 @@ import { HttpRouter, type HttpServerError, type HttpServerRequest, type HttpServ
|
|
|
4
4
|
export class AuthRouteHandler extends Context.Service<
|
|
5
5
|
AuthRouteHandler,
|
|
6
6
|
{
|
|
7
|
+
readonly basePath?: `/${string}` | "" | undefined;
|
|
7
8
|
readonly handle: Effect.Effect<HttpServerResponse.HttpServerResponse, HttpServerError.RequestError, HttpServerRequest.HttpServerRequest>;
|
|
8
9
|
}
|
|
9
10
|
>()("@shivaedev/identity/AuthRouteHandler") {}
|
|
@@ -11,6 +12,6 @@ export class AuthRouteHandler extends Context.Service<
|
|
|
11
12
|
export const mountRoutes = HttpRouter.use((router) =>
|
|
12
13
|
Effect.gen(function* () {
|
|
13
14
|
const handler = yield* AuthRouteHandler;
|
|
14
|
-
yield* router.add("*", "/api/auth
|
|
15
|
+
yield* router.add("*", `${handler.basePath ?? "/api/auth"}/*`, handler.handle);
|
|
15
16
|
}),
|
|
16
17
|
);
|
|
@@ -1,37 +1,78 @@
|
|
|
1
1
|
import type { AuthContext } from "better-auth";
|
|
2
2
|
import type { testUtils } from "better-auth/plugins";
|
|
3
3
|
import { Clock, Effect } from "effect";
|
|
4
|
+
import { signedSessionToken, testUserEmail } from "#server/better-auth/adapters/testingCredentials.ts";
|
|
4
5
|
|
|
5
6
|
type TestContext = ReturnType<ReturnType<typeof testUtils>["init"]>["context"];
|
|
7
|
+
type UserFields = NonNullable<Parameters<TestContext["test"]["createUser"]>[0]>;
|
|
8
|
+
type Login = Awaited<ReturnType<TestContext["test"]["login"]>>;
|
|
6
9
|
type AccountContext = Pick<AuthContext, "internalAdapter">;
|
|
10
|
+
type SessionContext = AccountContext & Pick<AuthContext, "sessionConfig" | "secret" | "authCookies" | "baseURL">;
|
|
11
|
+
|
|
12
|
+
function saveUser(context: AccountContext, fields: UserFields) {
|
|
13
|
+
return Effect.flatMap(testUserEmail, (email) =>
|
|
14
|
+
Effect.promise(() =>
|
|
15
|
+
context.internalAdapter.createUser({ email, emailVerified: true, image: null, name: "Test User", ...fields }, { method: "test" }),
|
|
16
|
+
),
|
|
17
|
+
);
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
function cookieSameSite(value: string | undefined) {
|
|
21
|
+
switch (value?.toLowerCase()) {
|
|
22
|
+
case "strict":
|
|
23
|
+
return "Strict";
|
|
24
|
+
case "none":
|
|
25
|
+
return "None";
|
|
26
|
+
default:
|
|
27
|
+
return "Lax";
|
|
28
|
+
}
|
|
29
|
+
}
|
|
7
30
|
|
|
8
31
|
export const signedInUser = Effect.fnUntraced(function* (
|
|
9
|
-
auth: { readonly $context: Promise<
|
|
32
|
+
auth: { readonly $context: Promise<SessionContext> },
|
|
10
33
|
{
|
|
11
34
|
providerAccounts = [],
|
|
12
35
|
...fields
|
|
13
|
-
}:
|
|
36
|
+
}: UserFields & {
|
|
14
37
|
readonly providerAccounts?: readonly { readonly providerId: string; readonly accountId: string }[];
|
|
15
38
|
},
|
|
16
|
-
) {
|
|
17
|
-
const
|
|
18
|
-
const user = yield*
|
|
39
|
+
): Effect.fn.Return<Login> {
|
|
40
|
+
const context = yield* Effect.promise(() => auth.$context);
|
|
41
|
+
const user = yield* saveUser(context, fields);
|
|
19
42
|
for (const { providerId, accountId } of providerAccounts) {
|
|
20
|
-
yield* Effect.promise(() => internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
43
|
+
yield* Effect.promise(() => context.internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
21
44
|
}
|
|
22
45
|
return yield* signInAgain(auth, user.id);
|
|
23
46
|
});
|
|
24
47
|
|
|
25
48
|
export const signInAgain = Effect.fnUntraced(function* (
|
|
26
|
-
auth: { readonly $context: Promise<
|
|
49
|
+
auth: { readonly $context: Promise<SessionContext> },
|
|
27
50
|
userId: string,
|
|
28
|
-
) {
|
|
29
|
-
const {
|
|
51
|
+
): Effect.fn.Return<Login> {
|
|
52
|
+
const { internalAdapter, sessionConfig, authCookies, secret, baseURL } = yield* Effect.promise(() => auth.$context);
|
|
30
53
|
const now = yield* Clock.currentTimeMillis;
|
|
31
|
-
const
|
|
54
|
+
const session = yield* Effect.promise(() => internalAdapter.createSession(userId, false, {}, true));
|
|
32
55
|
const expiresAt = new Date(now + sessionConfig.expiresIn * 1000);
|
|
33
|
-
yield* Effect.promise(() => internalAdapter.updateSession(
|
|
34
|
-
|
|
56
|
+
yield* Effect.promise(() => internalAdapter.updateSession(session.token, { expiresAt }));
|
|
57
|
+
const user = yield* Effect.promise(() => internalAdapter.findUserById(userId));
|
|
58
|
+
if (user === null) {
|
|
59
|
+
return yield* Effect.die(`User not found: ${userId}`);
|
|
60
|
+
}
|
|
61
|
+
const value = yield* signedSessionToken(session.token, secret);
|
|
62
|
+
const { name, attributes } = authCookies.sessionToken;
|
|
63
|
+
const cookies: Login["cookies"] = [
|
|
64
|
+
{
|
|
65
|
+
domain: URL.canParse(baseURL) ? new URL(baseURL).hostname : "localhost",
|
|
66
|
+
httpOnly: attributes.httpOnly ?? true,
|
|
67
|
+
name,
|
|
68
|
+
path: attributes.path || "/",
|
|
69
|
+
sameSite: cookieSameSite(attributes.sameSite),
|
|
70
|
+
secure: attributes.secure ?? false,
|
|
71
|
+
value,
|
|
72
|
+
...(attributes.maxAge ? { expires: Math.floor(now / 1000) + attributes.maxAge } : {}),
|
|
73
|
+
},
|
|
74
|
+
];
|
|
75
|
+
return { cookies, headers: new Headers({ cookie: `${name}=${value}` }), session: { ...session, expiresAt }, token: session.token, user };
|
|
35
76
|
});
|
|
36
77
|
|
|
37
78
|
export async function storedProviderAccounts(auth: { readonly $context: Promise<AccountContext> }, userId: string) {
|
|
@@ -48,12 +89,21 @@ export async function storedProviderAccounts(auth: { readonly $context: Promise<
|
|
|
48
89
|
}
|
|
49
90
|
|
|
50
91
|
export const passwordUser = Effect.fnUntraced(function* (
|
|
51
|
-
auth: { readonly $context: Promise<
|
|
52
|
-
{
|
|
92
|
+
auth: { readonly $context: Promise<AccountContext & { readonly password: Pick<AuthContext["password"], "hash"> }> },
|
|
93
|
+
{
|
|
94
|
+
password,
|
|
95
|
+
passwordHash,
|
|
96
|
+
...fields
|
|
97
|
+
}: UserFields & { readonly email: string } & (
|
|
98
|
+
| { readonly password: string; readonly passwordHash?: never }
|
|
99
|
+
| { readonly passwordHash: string; readonly password?: never }
|
|
100
|
+
),
|
|
53
101
|
) {
|
|
54
|
-
const
|
|
55
|
-
const user = yield*
|
|
56
|
-
const hash = yield* Effect.promise(() =>
|
|
57
|
-
yield* Effect.promise(() =>
|
|
102
|
+
const context = yield* Effect.promise(() => auth.$context);
|
|
103
|
+
const user = yield* saveUser(context, fields);
|
|
104
|
+
const hash = passwordHash ?? (yield* Effect.promise(() => context.password.hash(password)));
|
|
105
|
+
yield* Effect.promise(() =>
|
|
106
|
+
context.internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id }),
|
|
107
|
+
);
|
|
58
108
|
return user;
|
|
59
109
|
});
|
|
@@ -0,0 +1,47 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
6
|
+
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
7
|
+
|
|
8
|
+
function unavailable() {
|
|
9
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends string>(
|
|
13
|
+
access: Pick<AccessPolicy<TRole>, "Role">,
|
|
14
|
+
options?: AuthTableOptions,
|
|
15
|
+
) {
|
|
16
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
17
|
+
const { user } = tables(options);
|
|
18
|
+
const readPage = SqlSchema.findAll({
|
|
19
|
+
execute: ({ cursor, limit }) => sql`select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
20
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
21
|
+
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
22
|
+
Request: UserListInput,
|
|
23
|
+
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
24
|
+
});
|
|
25
|
+
const readRole = SqlSchema.findOneOption({
|
|
26
|
+
execute: (id) => sql`select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
27
|
+
Request: Schema.String,
|
|
28
|
+
Result: Schema.Struct({ role: access.Role }),
|
|
29
|
+
});
|
|
30
|
+
const readNames = SqlSchema.findAll({
|
|
31
|
+
execute: (ids) => sql`select id, ${sql(user.name)} as name from ${sql(user.table)} where id in ${sql.in(ids)} order by id`,
|
|
32
|
+
Request: Schema.Array(Schema.String),
|
|
33
|
+
Result: AccountName,
|
|
34
|
+
});
|
|
35
|
+
return {
|
|
36
|
+
list: Effect.fn("UserDirectory.list")(function* (input: typeof UserListInput.Type) {
|
|
37
|
+
const rows = yield* readPage(input).pipe(Effect.mapError(unavailable));
|
|
38
|
+
const users = rows.slice(0, input.limit);
|
|
39
|
+
return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none<string>(), users };
|
|
40
|
+
}),
|
|
41
|
+
names: (ids: readonly string[]) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
42
|
+
role: Effect.fn("UserDirectory.role")(function* (id: string) {
|
|
43
|
+
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
44
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "User not found" });
|
|
45
|
+
}),
|
|
46
|
+
};
|
|
47
|
+
});
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
import type { Auth } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
-
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
3
|
|
|
6
4
|
export interface UserProfile {
|
|
7
5
|
readonly id: string;
|
|
@@ -9,22 +7,18 @@ export interface UserProfile {
|
|
|
9
7
|
readonly name: string;
|
|
10
8
|
}
|
|
11
9
|
|
|
10
|
+
export interface UserProfileStorage {
|
|
11
|
+
readonly findByIds: (userIds: readonly string[]) => Effect.Effect<readonly UserProfile[], AuthUnavailable>;
|
|
12
|
+
}
|
|
13
|
+
|
|
12
14
|
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (
|
|
13
|
-
|
|
15
|
+
storage: UserProfileStorage,
|
|
14
16
|
userIds: readonly string[],
|
|
15
17
|
): Effect.fn.Return<readonly UserProfile[], AuthUnavailable> {
|
|
16
18
|
const ids = [...new Set(userIds)];
|
|
17
19
|
if (ids.length === 0) {
|
|
18
20
|
return [];
|
|
19
21
|
}
|
|
20
|
-
const users = yield*
|
|
21
|
-
const { adapter } = await auth.$context;
|
|
22
|
-
return adapter.findMany<UserProfile>({
|
|
23
|
-
limit: ids.length,
|
|
24
|
-
model: "user",
|
|
25
|
-
select: ["id", "name", "image"],
|
|
26
|
-
where: [{ field: "id", operator: "in", value: ids }],
|
|
27
|
-
});
|
|
28
|
-
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
22
|
+
const users = yield* storage.findByIds(ids);
|
|
29
23
|
return users.map(({ id, name, image }) => ({ id, image: image ?? null, name }));
|
|
30
24
|
});
|
|
@@ -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 +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"}
|