@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,51 @@
|
|
|
1
|
+
import { Effect, Layer, Option } from "effect";
|
|
2
|
+
import { type HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import type { RpcMiddleware } from "effect/rpc";
|
|
4
|
+
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
5
|
+
import { type AuthUnavailable, Forbidden, type Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
6
|
+
import { Identity, type SessionUser } from "#rpc/identity.ts";
|
|
7
|
+
import { hasPermission, type permissionMiddleware, requirePermission } from "#rpc/permission.ts";
|
|
8
|
+
import { sessionCommandChanges } from "#server/commandChanges.ts";
|
|
9
|
+
import { revalidateStream } from "./revalidateStream.ts";
|
|
10
|
+
import { resolveSession, type SessionPolicy, type UserSessionShape, withSessionUser } from "./session.ts";
|
|
11
|
+
|
|
12
|
+
export function permissionLayer<TMiddleware, TSession extends UserSessionShape>(
|
|
13
|
+
middleware: ReturnType<ReturnType<typeof permissionMiddleware<TMiddleware>>>,
|
|
14
|
+
policy: SessionPolicy<TSession>,
|
|
15
|
+
) {
|
|
16
|
+
const permission = middleware.permission;
|
|
17
|
+
const guard: RpcMiddleware.RpcMiddleware<Identity | SessionUser, Unauthorized | AuthUnavailable | Forbidden, never> = (
|
|
18
|
+
effect,
|
|
19
|
+
{ headers, rpc, payload },
|
|
20
|
+
) => {
|
|
21
|
+
const lookup = Effect.tap(resolveSession(policy, headers, rpc._tag), (session) =>
|
|
22
|
+
Option.isSome(session) && !hasPermission(session.value.user, permission)
|
|
23
|
+
? Effect.fail(new Forbidden({ message: `Permission required: ${permission.name} (${permission.strength})` }))
|
|
24
|
+
: Effect.void,
|
|
25
|
+
);
|
|
26
|
+
return sessionCommandChanges(effect, rpc, payload).pipe(
|
|
27
|
+
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id, lookup))),
|
|
28
|
+
(invocation) => Effect.andThen(requirePermission(permission), invocation),
|
|
29
|
+
withSessionUser(policy, headers, rpc._tag),
|
|
30
|
+
);
|
|
31
|
+
};
|
|
32
|
+
return Layer.succeed(middleware, guard);
|
|
33
|
+
}
|
|
34
|
+
function rejection(error: Unauthorized | Forbidden | AuthUnavailable) {
|
|
35
|
+
return HttpServerResponse.empty({
|
|
36
|
+
headers: { "cache-control": "private, no-store" },
|
|
37
|
+
status: { AuthUnavailable: 503, Forbidden: 403, Unauthorized: 401 }[error._tag],
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export function permissionRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>, permission: Permission) {
|
|
42
|
+
return <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) =>
|
|
43
|
+
(request: HttpServerRequest.HttpServerRequest): Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>> =>
|
|
44
|
+
Effect.andThen(requirePermission(permission), Effect.context<Identity | SessionUser>()).pipe(
|
|
45
|
+
withSessionUser(policy, request.headers, request.url),
|
|
46
|
+
Effect.matchEffect({
|
|
47
|
+
onFailure: (error) => Effect.succeed(rejection(error)),
|
|
48
|
+
onSuccess: (context) => Effect.provideContext(handler(request), context),
|
|
49
|
+
}),
|
|
50
|
+
);
|
|
51
|
+
}
|
|
@@ -0,0 +1,7 @@
|
|
|
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
|
+
|
|
5
|
+
export function resolveRole(roles: RoleSet, stored: unknown) {
|
|
6
|
+
return roles.resolve(stored).pipe(Effect.mapError(() => new AuthUnavailable({ message: "Stored user role is not declared by the application" })));
|
|
7
|
+
}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Duration, Effect, Exit, 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 {
|
|
5
7
|
Identity,
|
|
@@ -12,7 +14,9 @@ import {
|
|
|
12
14
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#rpc/middleware.ts";
|
|
13
15
|
import { sessionCommandChanges } from "#server/commandChanges.ts";
|
|
14
16
|
import { type OriginPolicy, originRequest } from "./origin.ts";
|
|
17
|
+
import { resolveRole } from "./resolveRole.ts";
|
|
15
18
|
import { revalidateStream } from "./revalidateStream.ts";
|
|
19
|
+
import { sessionProfile } from "./sessionProfile.ts";
|
|
16
20
|
import { transportHeaders } from "./transportHeaders.ts";
|
|
17
21
|
export interface SessionShape {
|
|
18
22
|
readonly user: {
|
|
@@ -25,21 +29,30 @@ export interface SessionProvider<TSession extends SessionShape> {
|
|
|
25
29
|
export interface SessionPolicy<TSession extends SessionShape> {
|
|
26
30
|
readonly origin: OriginPolicy;
|
|
27
31
|
readonly provider: SessionProvider<TSession>;
|
|
32
|
+
readonly roles?: RoleSet;
|
|
28
33
|
readonly streamRevalidationInterval?: Duration.Input | undefined;
|
|
29
34
|
}
|
|
30
35
|
export const resolveSession: <TSession extends SessionShape>(
|
|
31
36
|
policy: SessionPolicy<TSession>,
|
|
32
37
|
headers: Headers.Headers,
|
|
33
38
|
rpc: string,
|
|
34
|
-
) => Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden> =
|
|
35
|
-
TSession extends SessionShape
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
});
|
|
39
|
+
) => Effect.Effect<Option.Option<TSession & { readonly user: { readonly permissions?: readonly Permission[] } }>, AuthUnavailable | Forbidden> =
|
|
40
|
+
Effect.fn("PlatformRpc.resolveSession")(function* <TSession extends SessionShape>(
|
|
41
|
+
policy: SessionPolicy<TSession>,
|
|
42
|
+
headers: Headers.Headers,
|
|
43
|
+
rpc: string,
|
|
44
|
+
) {
|
|
45
|
+
const transport = yield* transportHeaders(headers);
|
|
46
|
+
if (!policy.origin(originRequest(transport, rpc))) {
|
|
47
|
+
return yield* new Forbidden({ message: "Origin not allowed" });
|
|
48
|
+
}
|
|
49
|
+
const session = yield* policy.provider.get(transport);
|
|
50
|
+
if (Option.isNone(session) || policy.roles === undefined) {
|
|
51
|
+
return session;
|
|
52
|
+
}
|
|
53
|
+
const access = yield* resolveRole(policy.roles, Reflect.get(session.value.user, "role"));
|
|
54
|
+
return Option.some({ ...session.value, user: { ...session.value.user, ...access } });
|
|
55
|
+
});
|
|
43
56
|
function identified(id: string) {
|
|
44
57
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
45
58
|
}
|
|
@@ -85,16 +98,11 @@ export function withSessionUser<TSession extends UserSessionShape>(policy: Sessi
|
|
|
85
98
|
if (Option.isNone(session)) {
|
|
86
99
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
87
100
|
}
|
|
88
|
-
const
|
|
101
|
+
const user = sessionProfile(session.value.user);
|
|
89
102
|
const id = yield* identified(session.value.user.id);
|
|
90
103
|
return yield* effect.pipe(
|
|
91
104
|
Effect.provideService(Identity, { id }),
|
|
92
|
-
Effect.provideService(SessionUser,
|
|
93
|
-
email,
|
|
94
|
-
id,
|
|
95
|
-
name,
|
|
96
|
-
...(role === undefined ? {} : { role }),
|
|
97
|
-
}),
|
|
105
|
+
Effect.provideService(SessionUser, user),
|
|
98
106
|
Effect.annotateLogs({ userId: id }),
|
|
99
107
|
);
|
|
100
108
|
});
|
|
@@ -121,12 +129,12 @@ export function authenticatedUserWithProviderAccountsLayer<TSession extends Prov
|
|
|
121
129
|
if (Option.isNone(session)) {
|
|
122
130
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
123
131
|
}
|
|
124
|
-
const { id,
|
|
132
|
+
const { id, providerAccounts } = session.value.user;
|
|
125
133
|
const accounts = yield* Effect.cachedWithTTL(
|
|
126
134
|
Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))),
|
|
127
135
|
(exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero),
|
|
128
136
|
);
|
|
129
|
-
const user =
|
|
137
|
+
const user = sessionProfile(session.value.user);
|
|
130
138
|
yield* identified(id);
|
|
131
139
|
return yield* sessionCommandChanges(effect, rpc, payload).pipe(
|
|
132
140
|
revalidateStream(policy, rpc, id, resolveSession(policy, headers, rpc._tag)),
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { SessionUserValue } from "#rpc/identity.ts";
|
|
2
|
+
|
|
3
|
+
export function sessionProfile({ id, name, email, role, permissions }: SessionUserValue): SessionUserValue {
|
|
4
|
+
return { email, id, name, ...(role === undefined ? {} : { role }), ...(permissions === undefined ? {} : { permissions }) };
|
|
5
|
+
}
|
package/dist/rpc/hasRole.d.ts
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hasRole.d.ts","sourceRoot":"","sources":["../../src/rpc/hasRole.ts"],"names":[],"mappings":"AAAA,wBAAgB,OAAO,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CAAE,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAElG"}
|
package/dist/rpc/hasRole.js
DELETED
package/dist/rpc/hasRole.js.map
DELETED
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"hasRole.js","sourceRoot":"","sources":["../../src/rpc/hasRole.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,OAAO,CAAC,IAAmD,EAAE,IAAY;IACxF,OAAO,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC;AACtD,CAAC"}
|
|
@@ -1,5 +0,0 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
import { Forbidden } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
3
|
-
import { SessionUser, type SessionUserValue } from "./identity.ts";
|
|
4
|
-
export declare const requireAdmin: Effect.Effect<SessionUserValue, Forbidden, SessionUser>;
|
|
5
|
-
//# sourceMappingURL=requireAdmin.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"requireAdmin.d.ts","sourceRoot":"","sources":["../../src/rpc/requireAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEnE,eAAO,MAAM,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,EAAE,WAAW,CAM/E,CAAC"}
|
package/dist/rpc/requireAdmin.js
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
import { Forbidden } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
3
|
-
import { hasRole } from "./hasRole.js";
|
|
4
|
-
import { SessionUser } from "./identity.js";
|
|
5
|
-
export const requireAdmin = Effect.gen(function* () {
|
|
6
|
-
const user = yield* SessionUser;
|
|
7
|
-
if (!hasRole(user, "admin")) {
|
|
8
|
-
return yield* new Forbidden({ message: "Administrator role required" });
|
|
9
|
-
}
|
|
10
|
-
return user;
|
|
11
|
-
});
|
|
12
|
-
//# sourceMappingURL=requireAdmin.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"requireAdmin.js","sourceRoot":"","sources":["../../src/rpc/requireAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,+CAA+C,CAAC;AAC1E,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,WAAW,EAAyB,MAAM,eAAe,CAAC;AAEnE,MAAM,CAAC,MAAM,YAAY,GAA4D,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACxG,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;IAChC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,6BAA6B,EAAE,CAAC,CAAC;IACzE,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CAAC,CAAC"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import { Effect, Layer } from "effect";
|
|
2
|
-
import { type HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
-
import { Identity, SessionUser } from "#rpc/identity.ts";
|
|
4
|
-
import { AuthenticatedAdmin, AuthenticatedOwner } from "#rpc/middleware.ts";
|
|
5
|
-
import { type SessionPolicy, type UserSessionShape } from "./session.ts";
|
|
6
|
-
export declare function authenticatedAdminLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedAdmin>;
|
|
7
|
-
export declare function adminRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) => (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>>;
|
|
8
|
-
export declare function authenticatedOwnerLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedOwner>;
|
|
9
|
-
//# sourceMappingURL=roles.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"roles.d.ts","sourceRoot":"","sources":["../../../src/server/rpc-server/roles.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;AAIzE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAyB,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAI5E,OAAO,EAAkB,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAmB,MAAM,cAAc,CAAC;AAqB1G,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAE3I;AAQD,wBAAgB,UAAU,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,IACpF,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;AACD,wBAAgB,uBAAuB,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAE3I"}
|
|
@@ -1,38 +0,0 @@
|
|
|
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 { hasRole } from "#rpc/hasRole.ts";
|
|
5
|
-
import { Identity, SessionUser } from "#rpc/identity.ts";
|
|
6
|
-
import { AuthenticatedAdmin, AuthenticatedOwner } from "#rpc/middleware.ts";
|
|
7
|
-
import { requireAdmin } from "#rpc/requireAdmin.ts";
|
|
8
|
-
import { sessionCommandChanges } from "#server/commandChanges.ts";
|
|
9
|
-
import { revalidateStream } from "./revalidateStream.js";
|
|
10
|
-
import { resolveSession, withSessionUser } from "./session.js";
|
|
11
|
-
function requiringRole(policy, role, message) {
|
|
12
|
-
function permitted(user) {
|
|
13
|
-
return hasRole(user, role) ? Effect.void : Effect.fail(new Forbidden({ message }));
|
|
14
|
-
}
|
|
15
|
-
return (effect, { headers, rpc, payload }) => {
|
|
16
|
-
const lookup = Effect.tap(resolveSession(policy, headers, rpc._tag), (session) => Option.isSome(session) ? permitted(session.value.user) : Effect.void);
|
|
17
|
-
return sessionCommandChanges(effect, rpc, payload).pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id, lookup))), (invocation) => Effect.andThen(Effect.flatMap(SessionUser, permitted), invocation), withSessionUser(policy, headers, rpc._tag));
|
|
18
|
-
};
|
|
19
|
-
}
|
|
20
|
-
export function authenticatedAdminLayer(policy) {
|
|
21
|
-
return Layer.succeed(AuthenticatedAdmin, requiringRole(policy, "admin", "Administrator role required"));
|
|
22
|
-
}
|
|
23
|
-
function adminRejection(error) {
|
|
24
|
-
return HttpServerResponse.empty({
|
|
25
|
-
headers: { "cache-control": "private, no-store" },
|
|
26
|
-
status: { AuthUnavailable: 503, Forbidden: 403, Unauthorized: 401 }[error._tag],
|
|
27
|
-
});
|
|
28
|
-
}
|
|
29
|
-
export function adminRoute(policy) {
|
|
30
|
-
return (handler) => (request) => Effect.andThen(requireAdmin, Effect.context()).pipe(withSessionUser(policy, request.headers, request.url), Effect.matchEffect({
|
|
31
|
-
onFailure: (error) => Effect.succeed(adminRejection(error)),
|
|
32
|
-
onSuccess: (context) => Effect.provideContext(handler(request), context),
|
|
33
|
-
}));
|
|
34
|
-
}
|
|
35
|
-
export function authenticatedOwnerLayer(policy) {
|
|
36
|
-
return Layer.succeed(AuthenticatedOwner, requiringRole(policy, "owner", "Owner role required"));
|
|
37
|
-
}
|
|
38
|
-
//# sourceMappingURL=roles.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../../src/server/rpc-server/roles.ts"],"names":[],"mappings":"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"}
|
package/src/rpc/hasRole.ts
DELETED
package/src/rpc/requireAdmin.ts
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
import { Forbidden } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
3
|
-
import { hasRole } from "./hasRole.ts";
|
|
4
|
-
import { SessionUser, type SessionUserValue } from "./identity.ts";
|
|
5
|
-
|
|
6
|
-
export const requireAdmin: Effect.Effect<SessionUserValue, Forbidden, SessionUser> = Effect.gen(function* () {
|
|
7
|
-
const user = yield* SessionUser;
|
|
8
|
-
if (!hasRole(user, "admin")) {
|
|
9
|
-
return yield* new Forbidden({ message: "Administrator role required" });
|
|
10
|
-
}
|
|
11
|
-
return user;
|
|
12
|
-
});
|
|
@@ -1,55 +0,0 @@
|
|
|
1
|
-
import { Effect, Layer, Option } from "effect";
|
|
2
|
-
import { type HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
-
import type { RpcMiddleware } from "effect/rpc";
|
|
4
|
-
import { type AuthUnavailable, Forbidden, type Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
5
|
-
import { hasRole } from "#rpc/hasRole.ts";
|
|
6
|
-
import { Identity, SessionUser, type SessionUserValue } from "#rpc/identity.ts";
|
|
7
|
-
import { AuthenticatedAdmin, AuthenticatedOwner } from "#rpc/middleware.ts";
|
|
8
|
-
import { requireAdmin } from "#rpc/requireAdmin.ts";
|
|
9
|
-
import { sessionCommandChanges } from "#server/commandChanges.ts";
|
|
10
|
-
import { revalidateStream } from "./revalidateStream.ts";
|
|
11
|
-
import { resolveSession, type SessionPolicy, type UserSessionShape, withSessionUser } from "./session.ts";
|
|
12
|
-
|
|
13
|
-
function requiringRole<TSession extends UserSessionShape>(
|
|
14
|
-
policy: SessionPolicy<TSession>,
|
|
15
|
-
role: string,
|
|
16
|
-
message: string,
|
|
17
|
-
): RpcMiddleware.RpcMiddleware<Identity | SessionUser, Unauthorized | AuthUnavailable | Forbidden, never> {
|
|
18
|
-
function permitted(user: SessionUserValue) {
|
|
19
|
-
return hasRole(user, role) ? Effect.void : Effect.fail(new Forbidden({ message }));
|
|
20
|
-
}
|
|
21
|
-
return (effect, { headers, rpc, payload }) => {
|
|
22
|
-
const lookup = Effect.tap(resolveSession(policy, headers, rpc._tag), (session) =>
|
|
23
|
-
Option.isSome(session) ? permitted(session.value.user) : Effect.void,
|
|
24
|
-
);
|
|
25
|
-
return sessionCommandChanges(effect, rpc, payload).pipe(
|
|
26
|
-
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(policy, rpc, id, lookup))),
|
|
27
|
-
(invocation) => Effect.andThen(Effect.flatMap(SessionUser, permitted), invocation),
|
|
28
|
-
withSessionUser(policy, headers, rpc._tag),
|
|
29
|
-
);
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
export function authenticatedAdminLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedAdmin> {
|
|
33
|
-
return Layer.succeed(AuthenticatedAdmin, requiringRole(policy, "admin", "Administrator role required"));
|
|
34
|
-
}
|
|
35
|
-
function adminRejection(error: Unauthorized | Forbidden | AuthUnavailable) {
|
|
36
|
-
return HttpServerResponse.empty({
|
|
37
|
-
headers: { "cache-control": "private, no-store" },
|
|
38
|
-
status: { AuthUnavailable: 503, Forbidden: 403, Unauthorized: 401 }[error._tag],
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
export function adminRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>) {
|
|
43
|
-
return <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) =>
|
|
44
|
-
(request: HttpServerRequest.HttpServerRequest): Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>> =>
|
|
45
|
-
Effect.andThen(requireAdmin, Effect.context<Identity | SessionUser>()).pipe(
|
|
46
|
-
withSessionUser(policy, request.headers, request.url),
|
|
47
|
-
Effect.matchEffect({
|
|
48
|
-
onFailure: (error) => Effect.succeed(adminRejection(error)),
|
|
49
|
-
onSuccess: (context) => Effect.provideContext(handler(request), context),
|
|
50
|
-
}),
|
|
51
|
-
);
|
|
52
|
-
}
|
|
53
|
-
export function authenticatedOwnerLayer<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<AuthenticatedOwner> {
|
|
54
|
-
return Layer.succeed(AuthenticatedOwner, requiringRole(policy, "owner", "Owner role required"));
|
|
55
|
-
}
|