@shivaedev/platform 0.33.0 → 0.34.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 +12 -0
- package/README.md +33 -46
- package/dist/rpc/identity.d.ts +2 -0
- package/dist/rpc/identity.d.ts.map +1 -1
- package/dist/rpc/identity.js.map +1 -1
- package/dist/rpc/middleware.d.ts +0 -6
- package/dist/rpc/middleware.d.ts.map +1 -1
- package/dist/rpc/middleware.js +0 -8
- package/dist/rpc/middleware.js.map +1 -1
- package/dist/rpc/permission.d.ts +11 -0
- package/dist/rpc/permission.d.ts.map +1 -0
- package/dist/rpc/permission.js +17 -0
- package/dist/rpc/permission.js.map +1 -0
- package/dist/rpc/userRoles.d.ts +8 -0
- package/dist/rpc/userRoles.d.ts.map +1 -1
- package/dist/rpc/userRoles.js +2 -0
- package/dist/rpc/userRoles.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +13 -0
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +28 -6
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts +2 -0
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +12 -1
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/mountedSessions.d.ts +15 -0
- package/dist/server/better-auth/mountedSessions.d.ts.map +1 -0
- package/dist/server/better-auth/mountedSessions.js +12 -0
- package/dist/server/better-auth/mountedSessions.js.map +1 -0
- package/dist/server/better-auth/sessionPermissions.d.ts +3 -0
- package/dist/server/better-auth/sessionPermissions.d.ts.map +1 -0
- package/dist/server/better-auth/sessionPermissions.js +16 -0
- package/dist/server/better-auth/sessionPermissions.js.map +1 -0
- package/dist/server/better-auth/users.d.ts +2 -2
- package/dist/server/better-auth/users.d.ts.map +1 -1
- package/dist/server/better-auth/users.js +4 -6
- package/dist/server/better-auth/users.js.map +1 -1
- package/dist/server/rpc-server/permissions.d.ts +9 -0
- package/dist/server/rpc-server/permissions.d.ts.map +1 -0
- package/dist/server/rpc-server/permissions.js +31 -0
- package/dist/server/rpc-server/permissions.js.map +1 -0
- package/dist/server/rpc-server/resolveRole.d.ts +11 -0
- package/dist/server/rpc-server/resolveRole.d.ts.map +1 -0
- package/dist/server/rpc-server/resolveRole.js +6 -0
- package/dist/server/rpc-server/resolveRole.js.map +1 -0
- package/dist/server/rpc-server/session.d.ts +8 -1
- package/dist/server/rpc-server/session.d.ts.map +1 -1
- package/dist/server/rpc-server/session.js +12 -10
- package/dist/server/rpc-server/session.js.map +1 -1
- package/dist/server/rpc-server/sessionProfile.d.ts +3 -0
- package/dist/server/rpc-server/sessionProfile.d.ts.map +1 -0
- package/dist/server/rpc-server/sessionProfile.js +4 -0
- package/dist/server/rpc-server/sessionProfile.js.map +1 -0
- package/package.json +2 -1
- package/src/rpc/identity.ts +2 -0
- package/src/rpc/middleware.ts +0 -16
- package/src/rpc/permission.ts +24 -0
- package/src/rpc/userRoles.ts +3 -0
- package/src/server/better-auth/mount.ts +37 -6
- package/src/server/better-auth/mountRoutes.ts +14 -1
- package/src/server/better-auth/mountedSessions.ts +21 -0
- package/src/server/better-auth/sessionPermissions.ts +18 -0
- package/src/server/better-auth/users.ts +4 -6
- package/src/server/rpc-server/permissions.ts +51 -0
- package/src/server/rpc-server/resolveRole.ts +7 -0
- package/src/server/rpc-server/session.ts +26 -18
- package/src/server/rpc-server/sessionProfile.ts +5 -0
- package/dist/rpc/hasRole.d.ts +0 -4
- package/dist/rpc/hasRole.d.ts.map +0 -1
- package/dist/rpc/hasRole.js +0 -4
- package/dist/rpc/hasRole.js.map +0 -1
- package/dist/rpc/requireAdmin.d.ts +0 -5
- package/dist/rpc/requireAdmin.d.ts.map +0 -1
- package/dist/rpc/requireAdmin.js +0 -12
- package/dist/rpc/requireAdmin.js.map +0 -1
- package/dist/server/rpc-server/roles.d.ts +0 -9
- package/dist/server/rpc-server/roles.d.ts.map +0 -1
- package/dist/server/rpc-server/roles.js +0 -38
- package/dist/server/rpc-server/roles.js.map +0 -1
- package/src/rpc/hasRole.ts +0 -3
- package/src/rpc/requireAdmin.ts +0 -12
- package/src/server/rpc-server/roles.ts +0 -55
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionPermissions.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAC;AAEhE,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAEvG,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,QAAkB,EAAE,KAAc;IAC1E,MAAM,OAAO,GAAG,MAAM,CAAC,iBAAiB,CAAC,cAAc,CAAC,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAChF,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;AAClH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { DateTime, Effect, Option } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
|
-
import { AuthUnavailable,
|
|
3
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
4
|
import { SessionUser } from "#rpc/identity.ts";
|
|
5
5
|
import { LastOwner } from "#rpc/userRoles.ts";
|
|
6
6
|
export declare const listUsers: (input: {
|
|
@@ -20,5 +20,5 @@ export declare const changeUserRole: (input: {
|
|
|
20
20
|
readonly grant: boolean;
|
|
21
21
|
readonly role: "admin" | "owner" | "user";
|
|
22
22
|
readonly userId: string;
|
|
23
|
-
}) => Effect.Effect<
|
|
23
|
+
}) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/effect-contract/errors/taxonomy.ts").Forbidden | LastOwner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SessionUser | SqlClient.SqlClient>;
|
|
24
24
|
//# sourceMappingURL=users.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAE1F,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAE/C,OAAO,EAAyC,SAAS,EAAsB,MAAM,mBAAmB,CAAC;AAazG,eAAO,MAAM,SAAS;;;;;;;;;;;;wCAepB,CAAC;AAEH,eAAO,MAAM,cAAc;;;;4NA8BzB,CAAC"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
-
import { AuthUnavailable,
|
|
3
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
4
|
import { invalidateOnCommit, transact } from "@shivaedev/effect-sql/transact.ts";
|
|
5
|
-
import { hasRole } from "#rpc/hasRole.ts";
|
|
6
5
|
import { SessionUser } from "#rpc/identity.ts";
|
|
7
|
-
import {
|
|
6
|
+
import { requirePermission } from "#rpc/permission.ts";
|
|
7
|
+
import { ChangeUserRoles, LastOwner } from "#rpc/userRoles.ts";
|
|
8
8
|
const StoredUser = Schema.Struct({
|
|
9
9
|
createdAt: Schema.Date,
|
|
10
10
|
email: Schema.String,
|
|
@@ -33,9 +33,7 @@ export const listUsers = Effect.fn("Platform.listUsers")(function* (input) {
|
|
|
33
33
|
});
|
|
34
34
|
export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (input) {
|
|
35
35
|
const actor = yield* SessionUser;
|
|
36
|
-
|
|
37
|
-
return yield* Effect.fail(new Forbidden({ message: "Owner role required" }));
|
|
38
|
-
}
|
|
36
|
+
yield* requirePermission(ChangeUserRoles);
|
|
39
37
|
const sql = yield* SqlClient.SqlClient;
|
|
40
38
|
const changed = yield* Effect.gen(function* () {
|
|
41
39
|
yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/server/better-auth/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../../src/server/better-auth/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Effect, Layer } from "effect";
|
|
2
|
+
import { type HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
|
+
import { Identity, type SessionUser } from "#rpc/identity.ts";
|
|
5
|
+
import { type permissionMiddleware } from "#rpc/permission.ts";
|
|
6
|
+
import { type SessionPolicy, type UserSessionShape } from "./session.ts";
|
|
7
|
+
export declare function permissionLayer<TMiddleware, TSession extends UserSessionShape>(middleware: ReturnType<ReturnType<typeof permissionMiddleware<TMiddleware>>>, policy: SessionPolicy<TSession>): Layer.Layer<TMiddleware, never, never>;
|
|
8
|
+
export declare function permissionRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>, permission: Permission): <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) => (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>>;
|
|
9
|
+
//# sourceMappingURL=permissions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEzE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAElE,OAAO,EAAE,QAAQ,EAAE,KAAK,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAiB,KAAK,oBAAoB,EAAqB,MAAM,oBAAoB,CAAC;AAGjG,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAmB,MAAM,cAAc,CAAC;AAE1G,wBAAgB,eAAe,CAAC,WAAW,EAAE,QAAQ,SAAS,gBAAgB,EAC7E,UAAU,EAAE,UAAU,CAAC,UAAU,CAAC,OAAO,oBAAoB,CAAC,WAAW,CAAC,CAAC,CAAC,EAC5E,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,0CAmB/B;AAQD,wBAAgB,eAAe,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,UAAU,IACjH,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC,eACxH,iBAAiB,CAAC,iBAAiB,KAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAQ5I"}
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { Effect, Layer, Option } from "effect";
|
|
2
|
+
import { HttpServerResponse } from "effect/http";
|
|
3
|
+
import { Forbidden } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
|
+
import { Identity } from "#rpc/identity.ts";
|
|
5
|
+
import { hasPermission, requirePermission } from "#rpc/permission.ts";
|
|
6
|
+
import { sessionCommandChanges } from "#server/commandChanges.ts";
|
|
7
|
+
import { revalidateStream } from "./revalidateStream.js";
|
|
8
|
+
import { resolveSession, withSessionUser } from "./session.js";
|
|
9
|
+
export function permissionLayer(middleware, policy) {
|
|
10
|
+
const permission = middleware.permission;
|
|
11
|
+
const guard = (effect, { headers, rpc, payload }) => {
|
|
12
|
+
const lookup = Effect.tap(resolveSession(policy, headers, rpc._tag), (session) => Option.isSome(session) && !hasPermission(session.value.user, permission)
|
|
13
|
+
? Effect.fail(new Forbidden({ message: `Permission required: ${permission.name} (${permission.strength})` }))
|
|
14
|
+
: Effect.void);
|
|
15
|
+
return sessionCommandChanges(effect, rpc, payload).pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id, lookup))), (invocation) => Effect.andThen(requirePermission(permission), invocation), withSessionUser(policy, headers, rpc._tag));
|
|
16
|
+
};
|
|
17
|
+
return Layer.succeed(middleware, guard);
|
|
18
|
+
}
|
|
19
|
+
function rejection(error) {
|
|
20
|
+
return HttpServerResponse.empty({
|
|
21
|
+
headers: { "cache-control": "private, no-store" },
|
|
22
|
+
status: { AuthUnavailable: 503, Forbidden: 403, Unauthorized: 401 }[error._tag],
|
|
23
|
+
});
|
|
24
|
+
}
|
|
25
|
+
export function permissionRoute(policy, permission) {
|
|
26
|
+
return (handler) => (request) => Effect.andThen(requirePermission(permission), Effect.context()).pipe(withSessionUser(policy, request.headers, request.url), Effect.matchEffect({
|
|
27
|
+
onFailure: (error) => Effect.succeed(rejection(error)),
|
|
28
|
+
onSuccess: (context) => Effect.provideContext(handler(request), context),
|
|
29
|
+
}));
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=permissions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../../src/server/rpc-server/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import { AuthUnavailable } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
|
+
export declare function resolveRole(roles: RoleSet, stored: unknown): Effect.Effect<{
|
|
5
|
+
permissions: {
|
|
6
|
+
name: string;
|
|
7
|
+
strength: "any" | "own";
|
|
8
|
+
}[];
|
|
9
|
+
role: string;
|
|
10
|
+
}, AuthUnavailable, never>;
|
|
11
|
+
//# sourceMappingURL=resolveRole.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveRole.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAEhF,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;;;;;;2BAE1D"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { AuthUnavailable } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
3
|
+
export function resolveRole(roles, stored) {
|
|
4
|
+
return roles.resolve(stored).pipe(Effect.mapError(() => new AuthUnavailable({ message: "Stored user role is not declared by the application" })));
|
|
5
|
+
}
|
|
6
|
+
//# sourceMappingURL=resolveRole.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolveRole.js","sourceRoot":"","sources":["../../../src/server/rpc-server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,+CAA+C,CAAC;AAEhF,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,MAAe;IAC1D,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,qDAAqD,EAAE,CAAC,CAAC,CAAC,CAAC;AACnJ,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Duration, Effect, Layer, Option } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
5
|
import { type AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
6
|
import { Identity, SessionUser, type SessionUserValue, type SessionUserWithProviderAccountsValue } from "#rpc/identity.ts";
|
|
5
7
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#rpc/middleware.ts";
|
|
@@ -15,9 +17,14 @@ export interface SessionProvider<TSession extends SessionShape> {
|
|
|
15
17
|
export interface SessionPolicy<TSession extends SessionShape> {
|
|
16
18
|
readonly origin: OriginPolicy;
|
|
17
19
|
readonly provider: SessionProvider<TSession>;
|
|
20
|
+
readonly roles?: RoleSet;
|
|
18
21
|
readonly streamRevalidationInterval?: Duration.Input | undefined;
|
|
19
22
|
}
|
|
20
|
-
export declare const resolveSession: <TSession extends SessionShape>(policy: SessionPolicy<TSession>, headers: Headers.Headers, rpc: string) => Effect.Effect<Option.Option<TSession
|
|
23
|
+
export declare const resolveSession: <TSession extends SessionShape>(policy: SessionPolicy<TSession>, headers: Headers.Headers, rpc: string) => Effect.Effect<Option.Option<TSession & {
|
|
24
|
+
readonly user: {
|
|
25
|
+
readonly permissions?: readonly Permission[];
|
|
26
|
+
};
|
|
27
|
+
}>, AuthUnavailable | Forbidden>;
|
|
21
28
|
export declare function authenticatedLayer<TSession extends SessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<Authenticated>;
|
|
22
29
|
export declare function maybeAuthenticatedLayer<TSession extends SessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<MaybeAuthenticated>;
|
|
23
30
|
export interface UserSessionShape extends SessionShape {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAQ,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,KAAK,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAC9G,OAAO,EACN,QAAQ,EAER,WAAW,EACX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAEjI,OAAO,EAAE,KAAK,YAAY,EAAiB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,21 @@ import { Identity, OptionalIdentity, SessionUser, SessionUserWithProviderAccount
|
|
|
4
4
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#rpc/middleware.ts";
|
|
5
5
|
import { sessionCommandChanges } from "#server/commandChanges.ts";
|
|
6
6
|
import { originRequest } from "./origin.js";
|
|
7
|
+
import { resolveRole } from "./resolveRole.js";
|
|
7
8
|
import { revalidateStream } from "./revalidateStream.js";
|
|
9
|
+
import { sessionProfile } from "./sessionProfile.js";
|
|
8
10
|
import { transportHeaders } from "./transportHeaders.js";
|
|
9
11
|
export const resolveSession = Effect.fn("PlatformRpc.resolveSession")(function* (policy, headers, rpc) {
|
|
10
12
|
const transport = yield* transportHeaders(headers);
|
|
11
13
|
if (!policy.origin(originRequest(transport, rpc))) {
|
|
12
14
|
return yield* new Forbidden({ message: "Origin not allowed" });
|
|
13
15
|
}
|
|
14
|
-
|
|
16
|
+
const session = yield* policy.provider.get(transport);
|
|
17
|
+
if (Option.isNone(session) || policy.roles === undefined) {
|
|
18
|
+
return session;
|
|
19
|
+
}
|
|
20
|
+
const access = yield* resolveRole(policy.roles, Reflect.get(session.value.user, "role"));
|
|
21
|
+
return Option.some({ ...session.value, user: { ...session.value.user, ...access } });
|
|
15
22
|
});
|
|
16
23
|
function identified(id) {
|
|
17
24
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
@@ -42,14 +49,9 @@ export function withSessionUser(policy, headers, operation) {
|
|
|
42
49
|
if (Option.isNone(session)) {
|
|
43
50
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
44
51
|
}
|
|
45
|
-
const
|
|
52
|
+
const user = sessionProfile(session.value.user);
|
|
46
53
|
const id = yield* identified(session.value.user.id);
|
|
47
|
-
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, {
|
|
48
|
-
email,
|
|
49
|
-
id,
|
|
50
|
-
name,
|
|
51
|
-
...(role === undefined ? {} : { role }),
|
|
52
|
-
}), Effect.annotateLogs({ userId: id }));
|
|
54
|
+
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.annotateLogs({ userId: id }));
|
|
53
55
|
});
|
|
54
56
|
}
|
|
55
57
|
export function authenticatedUserLayer(policy) {
|
|
@@ -61,9 +63,9 @@ export function authenticatedUserWithProviderAccountsLayer(policy) {
|
|
|
61
63
|
if (Option.isNone(session)) {
|
|
62
64
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
63
65
|
}
|
|
64
|
-
const { id,
|
|
66
|
+
const { id, providerAccounts } = session.value.user;
|
|
65
67
|
const accounts = yield* Effect.cachedWithTTL(Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))), (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero));
|
|
66
|
-
const user =
|
|
68
|
+
const user = sessionProfile(session.value.user);
|
|
67
69
|
yield* identified(id);
|
|
68
70
|
return yield* sessionCommandChanges(effect, rpc, payload).pipe(revalidateStream(policy, rpc, id, resolveSession(policy, headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts: accounts }), Effect.annotateLogs({ userId: id }));
|
|
69
71
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../src/server/rpc-server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAI/D,OAAO,EAAwB,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAC9G,OAAO,EACN,QAAQ,EACR,gBAAgB,EAChB,WAAW,EAEX,+BAA+B,GAE/B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACjI,OAAO,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,EAAqB,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAezD,MAAM,CAAC,MAAM,cAAc,GAK1B,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EAChD,MAA+B,EAC/B,OAAwB,EACxB,GAAW;IAEX,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QACnD,OAAO,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACtD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1D,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;IACzF,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,CAAC,CAAC;AACtF,CAAC,CAAC,CAAC;AACJ,SAAS,UAAU,CAAC,EAAU;IAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC;AACD,MAAM,UAAU,kBAAkB,CAAgC,MAA+B;IAChG,OAAO,KAAK,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CACzE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAC7D,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC5E,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EACvC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AACD,MAAM,UAAU,uBAAuB,CAAgC,MAA+B;IACrG,OAAO,KAAK,CAAC,OAAO,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CACrE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAC9E,CAAC;QACD,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC5E,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAC5D,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC;AAID,MAAM,UAAU,eAAe,CAAoC,MAA+B,EAAE,OAAwB,EAAE,SAAiB;IAC9I,OAAO,CAAU,MAA8B,EAAE,EAAE,CAClD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;QAClE,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EACvC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,EACxC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AACD,MAAM,UAAU,sBAAsB,CAAoC,MAA+B;IACxG,OAAO,KAAK,CAAC,OAAO,CAAC,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CAC7E,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAC/C,CAAC,UAAU,EAAE,EAAE,CACd,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EACpI,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAC1C,CACD,CAAC;AACH,CAAC;AAKD,MAAM,UAAU,0CAA0C,CACzD,MAA+B;IAE/B,OAAO,KAAK,CAAC,OAAO,CAAC,qCAAqC,EAAE,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,CACjG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,EAAE,EAAE,EAAE,gBAAgB,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC;QACpD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAC3C,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAChH,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CACpE,CAAC;QACF,MAAM,IAAI,GAAG,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,qBAAqB,CAAC,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,IAAI,CAC7D,gBAAgB,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC5E,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EACvC,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,EACxC,MAAM,CAAC,cAAc,CAAC,+BAA+B,EAAE,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,EAC/F,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionProfile.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/sessionProfile.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,wBAAgB,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,gBAAgB,GAAG,gBAAgB,CAEzG"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionProfile.js","sourceRoot":"","sources":["../../../src/server/rpc-server/sessionProfile.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,cAAc,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,WAAW,EAAoB;IACtF,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,CAAC;AAC5H,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/platform",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.34.0",
|
|
4
4
|
"description": "Opinionated Effect application infrastructure for ShivaeDev services",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/platform#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -40,6 +40,7 @@
|
|
|
40
40
|
"README.md"
|
|
41
41
|
],
|
|
42
42
|
"dependencies": {
|
|
43
|
+
"@shivaedev/access": "0.1.0",
|
|
43
44
|
"@shivaedev/effect-contract": "0.16.0",
|
|
44
45
|
"@shivaedev/effect-sql": "0.21.0",
|
|
45
46
|
"@shivaedev/local-postgres": "0.7.0",
|
package/src/rpc/identity.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Context, type Effect, type Option } from "effect";
|
|
2
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
2
3
|
import type { AuthUnavailable, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
3
4
|
export class RequestId extends Context.Service<RequestId, string>()("@shivaedev/platform/rpc/RequestId") {}
|
|
4
5
|
export interface IdentityValue {
|
|
@@ -13,6 +14,7 @@ export interface ProviderAccountValue {
|
|
|
13
14
|
export interface SessionUserValue extends IdentityValue {
|
|
14
15
|
readonly email: string;
|
|
15
16
|
readonly name: string;
|
|
17
|
+
readonly permissions?: readonly Permission[];
|
|
16
18
|
readonly role?: string | null | undefined;
|
|
17
19
|
}
|
|
18
20
|
export class SessionUser extends Context.Service<SessionUser, SessionUserValue>()("@shivaedev/platform/rpc/SessionUser") {}
|
package/src/rpc/middleware.ts
CHANGED
|
@@ -36,19 +36,3 @@ export class AuthenticatedUserWithProviderAccounts extends RpcMiddleware.Service
|
|
|
36
36
|
>()("@shivaedev/platform/rpc/AuthenticatedUserWithProviderAccounts", {
|
|
37
37
|
error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
|
|
38
38
|
}) {}
|
|
39
|
-
export class AuthenticatedAdmin extends RpcMiddleware.Service<
|
|
40
|
-
AuthenticatedAdmin,
|
|
41
|
-
{
|
|
42
|
-
provides: Identity | SessionUser;
|
|
43
|
-
}
|
|
44
|
-
>()("@shivaedev/platform/rpc/AuthenticatedAdmin", {
|
|
45
|
-
error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
|
|
46
|
-
}) {}
|
|
47
|
-
export class AuthenticatedOwner extends RpcMiddleware.Service<
|
|
48
|
-
AuthenticatedOwner,
|
|
49
|
-
{
|
|
50
|
-
provides: Identity | SessionUser;
|
|
51
|
-
}
|
|
52
|
-
>()("@shivaedev/platform/rpc/AuthenticatedOwner", {
|
|
53
|
-
error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
|
|
54
|
-
}) {}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import { RpcMiddleware } from "effect/rpc";
|
|
3
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
|
+
import { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
5
|
+
import { type Identity, SessionUser, type SessionUserValue } from "./identity.ts";
|
|
6
|
+
|
|
7
|
+
const Failures = Schema.Union([Unauthorized, AuthUnavailable, Forbidden]);
|
|
8
|
+
|
|
9
|
+
export function permissionMiddleware<TSelf>() {
|
|
10
|
+
return <const TName extends string>(name: TName, permission: Permission) =>
|
|
11
|
+
Object.assign(RpcMiddleware.Service<TSelf, { provides: Identity | SessionUser }>()(name, { error: Failures }), { permission });
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export function hasPermission(user: Pick<SessionUserValue, "id" | "permissions">, permission: Permission): boolean {
|
|
15
|
+
return user.permissions?.some((grant) => grant.name === permission.name && grant.strength === permission.strength) ?? false;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function requirePermission(permission: Permission) {
|
|
19
|
+
return Effect.flatMap(SessionUser, (user) =>
|
|
20
|
+
hasPermission(user, permission)
|
|
21
|
+
? Effect.succeed(user)
|
|
22
|
+
: Effect.fail(new Forbidden({ message: `Permission required: ${permission.name} (${permission.strength})` })),
|
|
23
|
+
);
|
|
24
|
+
}
|
package/src/rpc/userRoles.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
+
import { permission } from "@shivaedev/access/permission.ts";
|
|
2
3
|
|
|
3
4
|
export const UserRole = Schema.Literals(["user", "admin", "owner"]);
|
|
4
5
|
export type UserRole = typeof UserRole.Type;
|
|
@@ -18,3 +19,5 @@ export const UserListInput = Schema.Struct({
|
|
|
18
19
|
export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(AppUser) });
|
|
19
20
|
export const ChangeRoleInput = Schema.Struct({ grant: Schema.Boolean, role: UserRole, userId: Schema.String });
|
|
20
21
|
export class LastOwner extends Schema.TaggedError<LastOwner>()("LastOwner", { userId: Schema.String }) {}
|
|
22
|
+
|
|
23
|
+
export const ChangeUserRoles = permission("users.roles.change");
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type BetterAuthOptions, betterAuth } from "better-auth";
|
|
2
2
|
import { Config, Effect, Option, Redacted } from "effect";
|
|
3
3
|
import { Pool, type PoolClient, type PoolConfig } from "pg";
|
|
4
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
5
|
import { type BearerSessionsOptions, sessionHeaders, withBearerSessions } from "#server/better-auth/bearerSessions.ts";
|
|
5
6
|
import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
|
|
6
7
|
import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
@@ -10,9 +11,11 @@ import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
|
|
|
10
11
|
import type { GetSession } from "#server/rpc-server/adapters/betterAuthSessions.ts";
|
|
11
12
|
import { trustedProxyRanges } from "#server/rpc-server/local.ts";
|
|
12
13
|
import type { SessionShape } from "#server/rpc-server/session.ts";
|
|
14
|
+
import { mountedSessions } from "./mountedSessions.ts";
|
|
13
15
|
|
|
14
16
|
export interface BetterAuthMountOptions<E = never, R = never> {
|
|
15
17
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
18
|
+
readonly roles?: RoleSet;
|
|
16
19
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
17
20
|
}
|
|
18
21
|
|
|
@@ -49,14 +52,28 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
|
|
|
49
52
|
trustedProxies,
|
|
50
53
|
},
|
|
51
54
|
},
|
|
52
|
-
"baseURL":
|
|
55
|
+
"baseURL":
|
|
56
|
+
options.baseURL
|
|
57
|
+
?? Option.getOrElse(origin, () => ({
|
|
58
|
+
allowedHosts: ["127.0.0.1:*"],
|
|
59
|
+
protocol: "http" as const,
|
|
60
|
+
})),
|
|
53
61
|
databaseHooks: gate.active ? gated.databaseHooks : options.databaseHooks,
|
|
54
|
-
rateLimit: {
|
|
62
|
+
rateLimit: {
|
|
63
|
+
...rateLimit,
|
|
64
|
+
...(customStorage === undefined ? {} : { customStorage }),
|
|
65
|
+
enabled: rateLimitEnabled,
|
|
66
|
+
},
|
|
55
67
|
secret,
|
|
56
68
|
trustedOrigins: options.trustedOrigins ?? [Option.getOrElse(origin, () => "http://127.0.0.1:*")],
|
|
57
69
|
user: gate.active ? gated.user : options.user,
|
|
58
70
|
});
|
|
59
|
-
const
|
|
71
|
+
const authRoutes = mountRoutes(auth, {
|
|
72
|
+
bearerSessions: mount.bearerSessions,
|
|
73
|
+
clientIpHeader,
|
|
74
|
+
roles: mount.roles,
|
|
75
|
+
trustedProxy,
|
|
76
|
+
});
|
|
60
77
|
function admittedSessions<TSession extends SessionShape>(getSession: GetSession<TSession>): GetSession<TSession> {
|
|
61
78
|
if (!gate.active && mount.bearerSessions === undefined) {
|
|
62
79
|
return getSession;
|
|
@@ -84,7 +101,13 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
|
|
|
84
101
|
revokeUnadmitted(gate, () => auth.$context),
|
|
85
102
|
context,
|
|
86
103
|
);
|
|
87
|
-
|
|
104
|
+
const lookupSession = Reflect.get(auth.api, "getSession");
|
|
105
|
+
const sessions = mountedSessions(
|
|
106
|
+
(headers) => lookupSession({ asResponse: false, headers, query: { disableCookieCache: true }, returnHeaders: false }),
|
|
107
|
+
admittedSessions,
|
|
108
|
+
mount.roles,
|
|
109
|
+
);
|
|
110
|
+
return { admittedSessions, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
88
111
|
});
|
|
89
112
|
|
|
90
113
|
export const authDatabase = Effect.fn("Platform.authDatabase")(function* (
|
|
@@ -95,11 +118,19 @@ export const authDatabase = Effect.fn("Platform.authDatabase")(function* (
|
|
|
95
118
|
const run = Effect.runForkWith(yield* Effect.context<never>());
|
|
96
119
|
return yield* Effect.acquireRelease(
|
|
97
120
|
Effect.sync(() => {
|
|
98
|
-
const pool = new Pool({
|
|
121
|
+
const pool = new Pool({
|
|
122
|
+
...options,
|
|
123
|
+
connectionString: Redacted.value(url),
|
|
124
|
+
});
|
|
99
125
|
pool.on("connect", (client) => clients.add(client));
|
|
100
126
|
pool.on("remove", (client) => clients.delete(client));
|
|
101
127
|
pool.on("error", (error) => {
|
|
102
|
-
run(
|
|
128
|
+
run(
|
|
129
|
+
Effect.logDebug({
|
|
130
|
+
event: "auth_database_idle_client_failed",
|
|
131
|
+
message: error.message,
|
|
132
|
+
}),
|
|
133
|
+
);
|
|
103
134
|
});
|
|
104
135
|
return pool;
|
|
105
136
|
}),
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
4
|
import { type BearerSessionsOptions, cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/bearerSessions.ts";
|
|
4
5
|
import { trustedProxyPeer } from "#server/rpc-server/local.ts";
|
|
5
6
|
import { redact } from "#server/rpc-server/redact.ts";
|
|
7
|
+
import { sessionPermissions } from "./sessionPermissions.ts";
|
|
6
8
|
|
|
7
9
|
interface MountedAuth {
|
|
8
10
|
readonly $context: Promise<{ readonly authCookies: { readonly sessionToken: { readonly name: string } } }>;
|
|
@@ -11,6 +13,7 @@ interface MountedAuth {
|
|
|
11
13
|
interface MountRouteOptions {
|
|
12
14
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
13
15
|
readonly clientIpHeader: string;
|
|
16
|
+
readonly roles?: RoleSet | undefined;
|
|
14
17
|
readonly trustedProxy?: string | undefined;
|
|
15
18
|
}
|
|
16
19
|
function replacesSession(request: Request, response: Response, native: boolean) {
|
|
@@ -22,7 +25,7 @@ function replacesSession(request: Request, response: Response, native: boolean)
|
|
|
22
25
|
&& new URL(request.url).pathname.startsWith("/api/auth/sign-in/")
|
|
23
26
|
);
|
|
24
27
|
}
|
|
25
|
-
async function
|
|
28
|
+
async function providerResponse(auth: MountedAuth, web: Request, options: MountRouteOptions) {
|
|
26
29
|
if (options.bearerSessions === undefined) {
|
|
27
30
|
return auth.handler(web);
|
|
28
31
|
}
|
|
@@ -41,6 +44,16 @@ async function authResponse(auth: MountedAuth, web: Request, options: MountRoute
|
|
|
41
44
|
}
|
|
42
45
|
return native ? response : cookieSessionResponse(response);
|
|
43
46
|
}
|
|
47
|
+
async function authResponse(auth: MountedAuth, web: Request, options: MountRouteOptions) {
|
|
48
|
+
const sessionRequest = options.roles !== undefined && new URL(web.url).pathname === "/api/auth/get-session";
|
|
49
|
+
const url = new URL(web.url);
|
|
50
|
+
if (sessionRequest) {
|
|
51
|
+
url.searchParams.set("disableCookieCache", "true");
|
|
52
|
+
}
|
|
53
|
+
const request = sessionRequest ? new Request(url, web) : web;
|
|
54
|
+
const response = await providerResponse(auth, request, options);
|
|
55
|
+
return sessionRequest && response.ok && options.roles !== undefined ? sessionPermissions(response, options.roles) : response;
|
|
56
|
+
}
|
|
44
57
|
export function mountRoutes(auth: MountedAuth, options: MountRouteOptions) {
|
|
45
58
|
const isTrustedProxy = trustedProxyPeer(options.trustedProxy);
|
|
46
59
|
return HttpRouter.use((router) =>
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import { betterAuthSessions, type GetSession } from "#server/rpc-server/adapters/betterAuthSessions.ts";
|
|
4
|
+
import type { SessionShape } from "#server/rpc-server/session.ts";
|
|
5
|
+
|
|
6
|
+
const AuthSession = Schema.NullOr(
|
|
7
|
+
Schema.Struct({
|
|
8
|
+
user: Schema.Struct({ email: Schema.String, id: Schema.String, name: Schema.String, role: Schema.optionalKey(Schema.NullOr(Schema.String)) }),
|
|
9
|
+
}),
|
|
10
|
+
);
|
|
11
|
+
|
|
12
|
+
export function mountedSessions(
|
|
13
|
+
lookup: (headers: Headers) => Promise<unknown>,
|
|
14
|
+
admit: <TSession extends SessionShape>(getSession: GetSession<TSession>) => GetSession<TSession>,
|
|
15
|
+
roles?: RoleSet,
|
|
16
|
+
) {
|
|
17
|
+
return {
|
|
18
|
+
...(roles === undefined ? {} : { roles }),
|
|
19
|
+
provider: betterAuthSessions(admit(async (headers) => Schema.decodeUnknownSync(AuthSession)(await lookup(headers)))),
|
|
20
|
+
};
|
|
21
|
+
}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import { resolveRole } from "#server/rpc-server/resolveRole.ts";
|
|
4
|
+
|
|
5
|
+
const Fields = Schema.Record(Schema.String, Schema.Unknown);
|
|
6
|
+
const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user: Fields }), [Fields]));
|
|
7
|
+
|
|
8
|
+
export async function sessionPermissions(response: Response, roles: RoleSet): Promise<Response> {
|
|
9
|
+
const payload = Schema.decodeUnknownSync(SessionPayload)(await response.json());
|
|
10
|
+
if (payload === null) {
|
|
11
|
+
return Response.json(null, response);
|
|
12
|
+
}
|
|
13
|
+
const access = await Effect.runPromise(resolveRole(roles, payload.user.role));
|
|
14
|
+
const headers = new Headers(response.headers);
|
|
15
|
+
headers.delete("content-length");
|
|
16
|
+
headers.set("cache-control", "private, no-store");
|
|
17
|
+
return Response.json({ ...payload, user: { ...payload.user, ...access } }, { headers, status: response.status });
|
|
18
|
+
}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
-
import { AuthUnavailable,
|
|
3
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
4
|
import { invalidateOnCommit, transact } from "@shivaedev/effect-sql/transact.ts";
|
|
5
|
-
import { hasRole } from "#rpc/hasRole.ts";
|
|
6
5
|
import { SessionUser } from "#rpc/identity.ts";
|
|
7
|
-
import {
|
|
6
|
+
import { requirePermission } from "#rpc/permission.ts";
|
|
7
|
+
import { type ChangeRoleInput, ChangeUserRoles, LastOwner, type UserListInput } from "#rpc/userRoles.ts";
|
|
8
8
|
|
|
9
9
|
const StoredUser = Schema.Struct({
|
|
10
10
|
createdAt: Schema.Date,
|
|
@@ -36,9 +36,7 @@ export const listUsers = Effect.fn("Platform.listUsers")(function* (input: typeo
|
|
|
36
36
|
|
|
37
37
|
export const changeUserRole = Effect.fn("Platform.changeUserRole")(function* (input: typeof ChangeRoleInput.Type) {
|
|
38
38
|
const actor = yield* SessionUser;
|
|
39
|
-
|
|
40
|
-
return yield* Effect.fail(new Forbidden({ message: "Owner role required" }));
|
|
41
|
-
}
|
|
39
|
+
yield* requirePermission(ChangeUserRoles);
|
|
42
40
|
const sql = yield* SqlClient.SqlClient;
|
|
43
41
|
const changed = yield* Effect.gen(function* () {
|
|
44
42
|
yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|