@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
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.34.0 - 2026-10-26
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Access role sets resolve stored role strings into their decoded role and declared permissions.
|
|
8
|
+
- Platform resolves application roles per request, exposes grants to handlers and the client session, and enforces declared permissions on RPCs and HTTP routes.
|
|
9
|
+
|
|
10
|
+
### Breaking
|
|
11
|
+
|
|
12
|
+
- Platform removes `requireAdmin`, `hasRole`, `AuthenticatedAdmin`, `AuthenticatedOwner`, their Layers, and `adminRoute`. Declare roles and permissions with `@shivaedev/access`, pass the role set once in `betterAuthMount(options, { roles })` and reuse its returned `sessions`, or configure `sessions.roles` for another provider. Replace role middleware with a class extending `permissionMiddleware<Self>()(id, permission)`, provide `permissionLayer(Middleware, sessions)`, and use `permissionRoute(sessions, permission)` for HTTP routes. Read `SessionUser.permissions` or the client session's `user.permissions` with `hasPermission`; use the application's access policy for record ownership. Unknown stored roles fail visibly and must be migrated to declared strings.
|
|
13
|
+
- Admin pages require `AdminPermission` from `@shivaedev/admin/permissions.ts`. Grant its `OpenAdmin` permission to the application's operator roles and provide `permissionLayer(AdminPermission, sessions)`. User role writes and controls require Platform's `ChangeUserRoles` permission. The existing admin role-list editor and last-owner invariant retain their storage format; declare its stored combinations in the application role set until migrating that editor.
|
|
14
|
+
|
|
3
15
|
## 0.33.0 - 2026-10-26
|
|
4
16
|
|
|
5
17
|
### Added
|
package/README.md
CHANGED
|
@@ -162,7 +162,7 @@ For self-only features, declare `contract("preferences", { keyScope: "session",
|
|
|
162
162
|
|
|
163
163
|
The host's generated `$changes` handler accepts `{ queries: [{ query: "get", payload: { id: "theme" } }] }`, resolves the declared query dependencies during that subscription invocation, and passes the authenticated scope to the change stream. It does not accept physical subscription keys or a caller-selected scope. Missing request-local `Identity` on a session-scoped subscription is a configuration defect, with no unscoped fallback.
|
|
164
164
|
|
|
165
|
-
`authenticatedLayer`, `authenticatedUserLayer`, `authenticatedUserWithProviderAccountsLayer
|
|
165
|
+
`authenticatedLayer`, `authenticatedUserLayer`, `authenticatedUserWithProviderAccountsLayer` and `permissionLayer` run scoped command invalidation inside the authenticated invocation. Successful commands publish their scoped keys after commit and omit keys the handler's transactions already published. A rejected transaction publishes no keys.
|
|
166
166
|
|
|
167
167
|
Hosted applications use `Api.application.toLayer(...)` and let `appHost` own `$changes`. When migrating a custom change handler, accept query references and resolve them inside `Stream.unwrap`, after authentication has provided `Identity`:
|
|
168
168
|
|
|
@@ -397,68 +397,56 @@ const sessions = {
|
|
|
397
397
|
|
|
398
398
|
An `AuthUnavailable` failure during revalidation leaves the stream running and the next interval checks again. During a session-store outage, the sign-out delivery window extends until a lookup succeeds. Initial session lookup failures still reject the subscription. Unary calls resolve their session once per call. `MaybeAuthenticated` streams that start anonymous continue without a session monitor; a signed-in optional stream ends with `Unauthorized` when its session is removed. Callers can subscribe again to continue anonymously.
|
|
399
399
|
|
|
400
|
-
### Requiring a
|
|
400
|
+
### Requiring a permission
|
|
401
401
|
|
|
402
|
-
|
|
402
|
+
Declare application roles with `@shivaedev/access`. Each user row stores one declared role string. Supply the role set once through the existing auth configuration and reuse its returned session policy:
|
|
403
403
|
|
|
404
|
-
|
|
404
|
+
```ts
|
|
405
|
+
import { permission } from "@shivaedev/access/permission.ts";
|
|
406
|
+
import { role } from "@shivaedev/access/role.ts";
|
|
407
|
+
import { roleSet } from "@shivaedev/access/roleSet.ts";
|
|
408
|
+
import { betterAuthMount } from "@shivaedev/platform/server/better-auth/mount.ts";
|
|
409
|
+
|
|
410
|
+
const UseTools = permission("tools.use");
|
|
411
|
+
const Access = roleSet(role("member", []), role("operator", [UseTools]));
|
|
412
|
+
const mounted = yield* betterAuthMount(authOptions, { roles: Access });
|
|
413
|
+
const sessions = { ...mounted.sessions, origin: trustedOrigins({ allow: ["https://app.example.com"], missing: "reject" }) };
|
|
414
|
+
```
|
|
415
|
+
|
|
416
|
+
For another session provider, put `roles: Access` alongside `provider` and `origin` in the host's existing `sessions` policy. The provider must read the current stored role on every invocation. `betterAuthMount`'s returned provider and its existing `/api/auth/get-session` endpoint bypass the cookie cache. That endpoint adds `user.permissions`, an array of `{ name, strength }` grants, and the request-local `SessionUser` exposes the same decoded role and grants. An undeclared stored role fails with `AuthUnavailable` instead of silently granting an empty role.
|
|
417
|
+
|
|
418
|
+
Declare a native middleware service for each required permission and provide its Layer beside the handlers:
|
|
405
419
|
|
|
406
420
|
```ts
|
|
407
421
|
import { Effect, Layer, Schema } from "effect";
|
|
408
422
|
import { Rpc, RpcGroup } from "effect/rpc";
|
|
409
423
|
import { SessionUser } from "@shivaedev/platform/rpc/identity.ts";
|
|
410
|
-
import {
|
|
411
|
-
import {
|
|
424
|
+
import { permissionMiddleware } from "@shivaedev/platform/rpc/permission.ts";
|
|
425
|
+
import { permissionLayer } from "@shivaedev/platform/server/rpc-server/permissions.ts";
|
|
412
426
|
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
427
|
+
class ToolsPermission extends permissionMiddleware<ToolsPermission>()("app/ToolsPermission", UseTools) {}
|
|
428
|
+
const Tools = RpcGroup.make(Rpc.make("tools", { success: Schema.String }).middleware(ToolsPermission));
|
|
429
|
+
const handlers = Tools.toLayer({ tools: () => Effect.map(SessionUser, (user) => user.email) }).pipe(
|
|
430
|
+
Layer.provideMerge(permissionLayer(ToolsPermission, sessions)),
|
|
416
431
|
);
|
|
417
|
-
|
|
418
|
-
export const AdminServer = Admin.toLayer({
|
|
419
|
-
AdminTools: () => Effect.map(SessionUser, (user) => `Admin tools for ${user.email}`),
|
|
420
|
-
TransferOwnership: () => Effect.map(SessionUser, (user) => `Owner ${user.email}`),
|
|
421
|
-
}).pipe(Layer.provideMerge(Layer.merge(authenticatedAdminLayer(sessions), authenticatedOwnerLayer(sessions))));
|
|
422
432
|
```
|
|
423
433
|
|
|
424
|
-
|
|
434
|
+
The middleware resolves and checks the session on every request before invoking the handler. It provides `Identity` and `SessionUser`, rejects signed-out callers with `Unauthorized`, and rejects missing grants with `Forbidden` in its declared error channel. A permission checks an exact name and strength; an `any` grant does not imply the corresponding `own` grant. Open streams recheck their required permission at the session revalidation interval and end with `Forbidden` after its removal.
|
|
425
435
|
|
|
426
|
-
|
|
436
|
+
For HTTP routes, use `permissionRoute(sessions, UseTools)` around the handler. It uses the same transport session and Origin policy, returns 401 for missing sessions, 403 for missing grants or refused Origins, and 503 for `AuthUnavailable`. Those rejections carry `Cache-Control: private, no-store`. The handler's response and typed failures pass through unchanged.
|
|
427
437
|
|
|
428
438
|
```ts
|
|
429
|
-
import { Effect } from "effect";
|
|
430
439
|
import { HttpRouter, HttpServerResponse } from "effect/http";
|
|
431
|
-
import {
|
|
432
|
-
import { adminRoute } from "@shivaedev/platform/server/rpc-server/roles.ts";
|
|
440
|
+
import { permissionRoute } from "@shivaedev/platform/server/rpc-server/permissions.ts";
|
|
433
441
|
|
|
434
442
|
const routes = HttpRouter.use((router) =>
|
|
435
|
-
router.add("GET", "/
|
|
436
|
-
Effect.map(SessionUser, (user) => HttpServerResponse.text(
|
|
443
|
+
router.add("GET", "/tools", permissionRoute(sessions, UseTools)(() =>
|
|
444
|
+
Effect.map(SessionUser, (user) => HttpServerResponse.text(user.email)),
|
|
437
445
|
)),
|
|
438
446
|
);
|
|
439
447
|
```
|
|
440
448
|
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
For an admin SPA, guard its HTML fallback as well as its endpoints and assets. Register a guarded `/admin/*` route in `appHost({ routes, assets: { root: "dist", spa: true }, ... })`; the native wildcard also matches `/admin` and takes precedence over the general static SPA route:
|
|
444
|
-
|
|
445
|
-
```ts
|
|
446
|
-
import { NodeHttpPlatform, NodeServices } from "@effect/platform-node";
|
|
447
|
-
import { Effect, Layer } from "effect";
|
|
448
|
-
import { HttpRouter, HttpServerRespondable, HttpStaticServer } from "effect/http";
|
|
449
|
-
import { adminRoute } from "@shivaedev/platform/server/rpc-server/roles.ts";
|
|
450
|
-
|
|
451
|
-
const routes = HttpRouter.use((router) => Effect.gen(function* () {
|
|
452
|
-
const spa = yield* HttpStaticServer.make({ root: "dist", spa: true });
|
|
453
|
-
yield* router.add("*", "/admin/*", adminRoute(sessions)(() =>
|
|
454
|
-
spa.pipe(Effect.catch(HttpServerRespondable.toResponse)),
|
|
455
|
-
));
|
|
456
|
-
})).pipe(Layer.orDie, Layer.provide(NodeHttpPlatform.layer), Layer.provide(NodeServices.layer));
|
|
457
|
-
```
|
|
458
|
-
|
|
459
|
-
The admin handler serves existing files under `dist/admin` and falls back to `dist/index.html` for unknown HTML paths. Other application routes and the public SPA stay outside this mount. Admin RPCs on the shared `/rpc` endpoint still declare `AuthenticatedAdmin`; the HTTP route guard protects the admin document, while native RPC middleware protects each operation.
|
|
460
|
-
|
|
461
|
-
`withSessionUser(policy, headers, operation)` resolves the session through the existing transport-header and Origin policy path and provides `Identity` and `SessionUser` only around the supplied Effect. It is also the boundary used by `authenticatedUserLayer`. Both the guard and identity boundary use public provider data, without reading Better Auth's tables or internal services. Keep Better Auth's cookie cache disabled for database-backed role removal to take effect on the next request, as in the starter.
|
|
449
|
+
An operation on one record reads that record's owner and uses the application's access policy. With a request-local user, `const { role } = yield* Access.resolve(user.role)` recovers the application's closed role type; `yield* Access.requireAccess({ id: user.id, role }, UseTools, record.ownerId)` then permits an explicit `any` grant or an `own` grant for that owner. Keep these resource decisions in the handler or domain service. Browser interfaces can use `hasPermission(user, permission)` from `rpc/permission.ts` over the client session's grants; the server always resolves its own grants.
|
|
462
450
|
|
|
463
451
|
### Transport headers and request ids
|
|
464
452
|
|
|
@@ -880,14 +868,13 @@ Import the module that defines the name; there is no package-root entry. Paths b
|
|
|
880
868
|
| Module | Names and purpose |
|
|
881
869
|
| --- | --- |
|
|
882
870
|
| `rpc/identity.ts` | `RequestId`, `Identity`, `OptionalIdentity`, `SessionUser`, `SessionUserWithProviderAccounts`: request-local services. |
|
|
883
|
-
| `rpc/middleware.ts` | `RequestTracing`, `Authenticated`, `AuthenticatedUser`, `AuthenticatedUserWithProviderAccounts`, `
|
|
884
|
-
| `rpc/
|
|
885
|
-
| `rpc/
|
|
871
|
+
| `rpc/middleware.ts` | `RequestTracing`, `Authenticated`, `AuthenticatedUser`, `AuthenticatedUserWithProviderAccounts`, `MaybeAuthenticated`: native RPC middleware declarations. |
|
|
872
|
+
| `rpc/permission.ts` | Native permission middleware declarations and predicates over resolved grants. |
|
|
873
|
+
| `server/rpc-server/permissions.ts` | Permission middleware Layers and HTTP route guards. |
|
|
886
874
|
| `server/appHost.ts` | `appHost`, `appDatabase`, `AppChanges`: scoped HTTP and PostgreSQL composition with loopback defaults and optional proxy trust. |
|
|
887
875
|
| `server/boundedBody.ts` | `readBoundedBody`, `RequestBodyTooLarge`: bounded body bytes and a typed HTTP 413 failure. |
|
|
888
876
|
| `server/otlpTracing.ts` | `otlpTracing`: opt-in Effect OTLP trace export for worker Layers. |
|
|
889
877
|
| `server/rpc-server/session.ts` | `authenticatedLayer`, `maybeAuthenticatedLayer`, `authenticatedUserLayer`, `authenticatedUserWithProviderAccountsLayer`, `withSessionUser`, `resolveSession`: session middleware implementations and the identity boundary. |
|
|
890
|
-
| `server/rpc-server/roles.ts` | `authenticatedAdminLayer`, `authenticatedOwnerLayer`: role middleware implementations; `adminRoute`: admin guard for host HTTP handlers. |
|
|
891
878
|
| `server/rpc-server/adapters/betterAuthSessions.ts` | `betterAuthSessions(getSession, getProviderAccounts?)`: a session provider from Better Auth lookups. |
|
|
892
879
|
| `server/rpc-server/origin.ts` | `trustedOrigins({ allow, missing })`: an exact Origin allowlist. |
|
|
893
880
|
| `server/rpc-server/local.ts` | `localRpcGuard`, `loopbackOnly`, `sameOrigin`, `trustedProxyPeer`, `trustedProxyRanges`: loopback and proxy guards. |
|
package/dist/rpc/identity.d.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
|
declare const RequestId_base: Context.ServiceClass<RequestId, "@shivaedev/platform/rpc/RequestId", string>;
|
|
4
5
|
export declare class RequestId extends RequestId_base {
|
|
@@ -19,6 +20,7 @@ export interface ProviderAccountValue {
|
|
|
19
20
|
export interface SessionUserValue extends IdentityValue {
|
|
20
21
|
readonly email: string;
|
|
21
22
|
readonly name: string;
|
|
23
|
+
readonly permissions?: readonly Permission[];
|
|
22
24
|
readonly role?: string | null | undefined;
|
|
23
25
|
}
|
|
24
26
|
declare const SessionUser_base: Context.ServiceClass<SessionUser, "@shivaedev/platform/rpc/SessionUser", SessionUserValue>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/rpc/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;;AACnG,qBAAa,SAAU,SAAQ,cAAyE;CAAG;AAC3G,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACpB;;AACD,qBAAa,QAAS,SAAQ,aAA8E;CAAG;;AAC/G,qBAAa,gBAAiB,SAAQ,qBAA6G;CAAG;AACtJ,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AACD,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC1C;;AACD,qBAAa,WAAY,SAAQ,gBAAuF;CAAG;AAC3H,MAAM,WAAW,oCAAqC,SAAQ,gBAAgB;IAC7E,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,EAAE,eAAe,GAAG,YAAY,CAAC,CAAC;CAC1G;;AACD,qBAAa,+BAAgC,SAAQ,oCAEpD;CAAG"}
|
|
1
|
+
{"version":3,"file":"identity.d.ts","sourceRoot":"","sources":["../../src/rpc/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC3D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;;AACnG,qBAAa,SAAU,SAAQ,cAAyE;CAAG;AAC3G,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;CACpB;;AACD,qBAAa,QAAS,SAAQ,aAA8E;CAAG;;AAC/G,qBAAa,gBAAiB,SAAQ,qBAA6G;CAAG;AACtJ,MAAM,WAAW,oBAAoB;IACpC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC5B;AACD,MAAM,WAAW,gBAAiB,SAAQ,aAAa;IACtD,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,UAAU,EAAE,CAAC;IAC7C,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CAC1C;;AACD,qBAAa,WAAY,SAAQ,gBAAuF;CAAG;AAC3H,MAAM,WAAW,oCAAqC,SAAQ,gBAAgB;IAC7E,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,EAAE,eAAe,GAAG,YAAY,CAAC,CAAC;CAC1G;;AACD,qBAAa,+BAAgC,SAAQ,oCAEpD;CAAG"}
|
package/dist/rpc/identity.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/rpc/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4B,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"identity.js","sourceRoot":"","sources":["../../src/rpc/identity.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA4B,MAAM,QAAQ,CAAC;AAG3D,MAAM,OAAO,SAAU,SAAQ,OAAO,CAAC,OAAO,EAAqB,CAAC,mCAAmC,CAAC;CAAG;AAI3G,MAAM,OAAO,QAAS,SAAQ,OAAO,CAAC,OAAO,EAA2B,CAAC,kCAAkC,CAAC;CAAG;AAC/G,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,OAAO,EAAkD,CAAC,0CAA0C,CAAC;CAAG;AAWtJ,MAAM,OAAO,WAAY,SAAQ,OAAO,CAAC,OAAO,EAAiC,CAAC,qCAAqC,CAAC;CAAG;AAI3H,MAAM,OAAO,+BAAgC,SAAQ,OAAO,CAAC,OAAO,EAAyE,CAC5I,yDAAyD,CACzD;CAAG"}
|
package/dist/rpc/middleware.d.ts
CHANGED
|
@@ -17,11 +17,5 @@ export declare class AuthenticatedUser extends AuthenticatedUser_base {
|
|
|
17
17
|
declare const AuthenticatedUserWithProviderAccounts_base: RpcMiddleware.ServiceClass<AuthenticatedUserWithProviderAccounts, "@shivaedev/platform/rpc/AuthenticatedUserWithProviderAccounts", Identity | SessionUser | SessionUserWithProviderAccounts, Schema.Union<readonly [typeof Unauthorized, typeof AuthUnavailable, typeof Forbidden]>, never, never, false>;
|
|
18
18
|
export declare class AuthenticatedUserWithProviderAccounts extends AuthenticatedUserWithProviderAccounts_base {
|
|
19
19
|
}
|
|
20
|
-
declare const AuthenticatedAdmin_base: RpcMiddleware.ServiceClass<AuthenticatedAdmin, "@shivaedev/platform/rpc/AuthenticatedAdmin", Identity | SessionUser, Schema.Union<readonly [typeof Unauthorized, typeof AuthUnavailable, typeof Forbidden]>, never, never, false>;
|
|
21
|
-
export declare class AuthenticatedAdmin extends AuthenticatedAdmin_base {
|
|
22
|
-
}
|
|
23
|
-
declare const AuthenticatedOwner_base: RpcMiddleware.ServiceClass<AuthenticatedOwner, "@shivaedev/platform/rpc/AuthenticatedOwner", Identity | SessionUser, Schema.Union<readonly [typeof Unauthorized, typeof AuthUnavailable, typeof Forbidden]>, never, never, false>;
|
|
24
|
-
export declare class AuthenticatedOwner extends AuthenticatedOwner_base {
|
|
25
|
-
}
|
|
26
20
|
export {};
|
|
27
21
|
//# sourceMappingURL=middleware.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/rpc/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;;AACzH,qBAAa,cAAe,SAAQ,mBAKS;CAAG;;AAChD,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;AACL,qBAAa,kBAAmB,SAAQ,uBAK8E;CAAG;;AACzH,qBAAa,iBAAkB,SAAQ,sBAOrC;CAAG;;AACL,qBAAa,qCAAsC,SAAQ,0CAKzD;CAAG
|
|
1
|
+
{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../../src/rpc/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,KAAK,EAAE,QAAQ,EAAE,gBAAgB,EAAE,SAAS,EAAE,WAAW,EAAE,+BAA+B,EAAE,MAAM,eAAe,CAAC;;AACzH,qBAAa,cAAe,SAAQ,mBAKS;CAAG;;AAChD,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;AACL,qBAAa,kBAAmB,SAAQ,uBAK8E;CAAG;;AACzH,qBAAa,iBAAkB,SAAQ,sBAOrC;CAAG;;AACL,qBAAa,qCAAsC,SAAQ,0CAKzD;CAAG"}
|
package/dist/rpc/middleware.js
CHANGED
|
@@ -17,12 +17,4 @@ export class AuthenticatedUserWithProviderAccounts extends RpcMiddleware.Service
|
|
|
17
17
|
error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
|
|
18
18
|
}) {
|
|
19
19
|
}
|
|
20
|
-
export class AuthenticatedAdmin extends RpcMiddleware.Service()("@shivaedev/platform/rpc/AuthenticatedAdmin", {
|
|
21
|
-
error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
|
|
22
|
-
}) {
|
|
23
|
-
}
|
|
24
|
-
export class AuthenticatedOwner extends RpcMiddleware.Service()("@shivaedev/platform/rpc/AuthenticatedOwner", {
|
|
25
|
-
error: Schema.Union([Unauthorized, AuthUnavailable, Forbidden]),
|
|
26
|
-
}) {
|
|
27
|
-
}
|
|
28
20
|
//# sourceMappingURL=middleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/rpc/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAEzG,MAAM,OAAO,cAAe,SAAQ,aAAa,CAAC,OAAO,EAKtD,CAAC,wCAAwC,CAAC;CAAG;AAChD,MAAM,OAAO,aAAc,SAAQ,aAAa,CAAC,OAAO,EAKrD,CAAC,uCAAuC,EAAE;IAC5C,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;CAC/D,CAAC;CAAG;AACL,MAAM,OAAO,kBAAmB,SAAQ,aAAa,CAAC,OAAO,EAK1D,CAAC,4CAA4C,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;CAAG;AACzH,MAAM,OAAO,iBAAkB,SAAQ,aAAa,CAAC,OAAO,EAKzD,CAAC,2CAA2C,EAAE;IAChD,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;CAC/D,CAAC;CAAG;AACL,MAAM,OAAO,qCAAsC,SAAQ,aAAa,CAAC,OAAO,EAG7E,CAAC,+DAA+D,EAAE;IACpE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;CAC/D,CAAC;CAAG
|
|
1
|
+
{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../../src/rpc/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AAEzG,MAAM,OAAO,cAAe,SAAQ,aAAa,CAAC,OAAO,EAKtD,CAAC,wCAAwC,CAAC;CAAG;AAChD,MAAM,OAAO,aAAc,SAAQ,aAAa,CAAC,OAAO,EAKrD,CAAC,uCAAuC,EAAE;IAC5C,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;CAC/D,CAAC;CAAG;AACL,MAAM,OAAO,kBAAmB,SAAQ,aAAa,CAAC,OAAO,EAK1D,CAAC,4CAA4C,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;CAAG;AACzH,MAAM,OAAO,iBAAkB,SAAQ,aAAa,CAAC,OAAO,EAKzD,CAAC,2CAA2C,EAAE;IAChD,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;CAC/D,CAAC;CAAG;AACL,MAAM,OAAO,qCAAsC,SAAQ,aAAa,CAAC,OAAO,EAG7E,CAAC,+DAA+D,EAAE;IACpE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC;CAC/D,CAAC;CAAG"}
|
|
@@ -0,0 +1,11 @@
|
|
|
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
|
+
export declare function permissionMiddleware<TSelf>(): <const TName extends string>(name: TName, permission: Permission) => RpcMiddleware.ServiceClass<TSelf, TName, Identity | SessionUser, Schema.Union<readonly [typeof Unauthorized, typeof AuthUnavailable, typeof Forbidden]>, never, never, false> & {
|
|
7
|
+
permission: Permission;
|
|
8
|
+
};
|
|
9
|
+
export declare function hasPermission(user: Pick<SessionUserValue, "id" | "permissions">, permission: Permission): boolean;
|
|
10
|
+
export declare function requirePermission(permission: Permission): Effect.Effect<SessionUserValue, Forbidden, SessionUser>;
|
|
11
|
+
//# sourceMappingURL=permission.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission.d.ts","sourceRoot":"","sources":["../../src/rpc/permission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,EAAE,KAAK,QAAQ,EAAE,WAAW,EAAE,KAAK,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAIlF,wBAAgB,oBAAoB,CAAC,KAAK,MACjC,KAAK,CAAC,KAAK,SAAS,MAAM,QAAQ,KAAK,cAAc,UAAU;;EAEvE;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,aAAa,CAAC,EAAE,UAAU,EAAE,UAAU,GAAG,OAAO,CAEjH;AAED,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,UAAU,2DAMvD"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import { RpcMiddleware } from "effect/rpc";
|
|
3
|
+
import { AuthUnavailable, Forbidden, Unauthorized } from "@shivaedev/effect-contract/errors/taxonomy.ts";
|
|
4
|
+
import { SessionUser } from "./identity.js";
|
|
5
|
+
const Failures = Schema.Union([Unauthorized, AuthUnavailable, Forbidden]);
|
|
6
|
+
export function permissionMiddleware() {
|
|
7
|
+
return (name, permission) => Object.assign(RpcMiddleware.Service()(name, { error: Failures }), { permission });
|
|
8
|
+
}
|
|
9
|
+
export function hasPermission(user, permission) {
|
|
10
|
+
return user.permissions?.some((grant) => grant.name === permission.name && grant.strength === permission.strength) ?? false;
|
|
11
|
+
}
|
|
12
|
+
export function requirePermission(permission) {
|
|
13
|
+
return Effect.flatMap(SessionUser, (user) => hasPermission(user, permission)
|
|
14
|
+
? Effect.succeed(user)
|
|
15
|
+
: Effect.fail(new Forbidden({ message: `Permission required: ${permission.name} (${permission.strength})` })));
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=permission.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"permission.js","sourceRoot":"","sources":["../../src/rpc/permission.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAE3C,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,+CAA+C,CAAC;AACzG,OAAO,EAAiB,WAAW,EAAyB,MAAM,eAAe,CAAC;AAElF,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,EAAE,eAAe,EAAE,SAAS,CAAC,CAAC,CAAC;AAE1E,MAAM,UAAU,oBAAoB;IACnC,OAAO,CAA6B,IAAW,EAAE,UAAsB,EAAE,EAAE,CAC1E,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,EAA+C,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;AACjI,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAkD,EAAE,UAAsB;IACvG,OAAO,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,KAAK,UAAU,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC;AAC7H,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,UAAsB;IACvD,OAAO,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAC3C,aAAa,CAAC,IAAI,EAAE,UAAU,CAAC;QAC9B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC;QACtB,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,wBAAwB,UAAU,CAAC,IAAI,KAAK,UAAU,CAAC,QAAQ,GAAG,EAAE,CAAC,CAAC,CAC9G,CAAC;AACH,CAAC"}
|
package/dist/rpc/userRoles.d.ts
CHANGED
|
@@ -32,5 +32,13 @@ declare const LastOwner_base: Schema.Class<LastOwner, Schema.TaggedStruct<"LastO
|
|
|
32
32
|
}>, import("effect/Cause").YieldableError>;
|
|
33
33
|
export declare class LastOwner extends LastOwner_base {
|
|
34
34
|
}
|
|
35
|
+
export declare const ChangeUserRoles: {
|
|
36
|
+
readonly any: {
|
|
37
|
+
readonly name: "users.roles.change";
|
|
38
|
+
readonly strength: "any";
|
|
39
|
+
};
|
|
40
|
+
readonly name: "users.roles.change";
|
|
41
|
+
readonly strength: "own";
|
|
42
|
+
};
|
|
35
43
|
export {};
|
|
36
44
|
//# sourceMappingURL=userRoles.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userRoles.d.ts","sourceRoot":"","sources":["../../src/rpc/userRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"userRoles.d.ts","sourceRoot":"","sources":["../../src/rpc/userRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,QAAQ,sDAA8C,CAAC;AACpE,MAAM,MAAM,QAAQ,GAAG,OAAO,QAAQ,CAAC,IAAI,CAAC;AAE5C,eAAO,MAAM,OAAO;;;;;;EAMlB,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAgG,CAAC;AACtH,eAAO,MAAM,eAAe;;;;EAAkF,CAAC;;;;AAC/G,qBAAa,SAAU,SAAQ,cAAuE;CAAG;AAEzG,eAAO,MAAM,eAAe;;;;;;;CAAmC,CAAC"}
|
package/dist/rpc/userRoles.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
+
import { permission } from "@shivaedev/access/permission.ts";
|
|
2
3
|
export const UserRole = Schema.Literals(["user", "admin", "owner"]);
|
|
3
4
|
export const AppUser = Schema.Struct({
|
|
4
5
|
createdAt: Schema.DateTimeUtcFromString,
|
|
@@ -15,4 +16,5 @@ export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.Str
|
|
|
15
16
|
export const ChangeRoleInput = Schema.Struct({ grant: Schema.Boolean, role: UserRole, userId: Schema.String });
|
|
16
17
|
export class LastOwner extends Schema.TaggedError()("LastOwner", { userId: Schema.String }) {
|
|
17
18
|
}
|
|
19
|
+
export const ChangeUserRoles = permission("users.roles.change");
|
|
18
20
|
//# sourceMappingURL=userRoles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userRoles.js","sourceRoot":"","sources":["../../src/rpc/userRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"userRoles.js","sourceRoot":"","sources":["../../src/rpc/userRoles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAE7D,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC;AAGpE,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,qBAAqB;IACvC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;CAClC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AACtH,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAC/G,MAAM,OAAO,SAAU,SAAQ,MAAM,CAAC,WAAW,EAAa,CAAC,WAAW,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG;AAEzG,MAAM,CAAC,MAAM,eAAe,GAAG,UAAU,CAAC,oBAAoB,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Config, Effect, Redacted } from "effect";
|
|
3
3
|
import { Pool, type PoolConfig } from "pg";
|
|
4
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
5
|
import { type BearerSessionsOptions } from "#server/better-auth/bearerSessions.ts";
|
|
5
6
|
import { type RevokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
6
7
|
import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
|
|
@@ -8,6 +9,7 @@ import type { GetSession } from "#server/rpc-server/adapters/betterAuthSessions.
|
|
|
8
9
|
import type { SessionShape } from "#server/rpc-server/session.ts";
|
|
9
10
|
export interface BetterAuthMountOptions<E = never, R = never> {
|
|
10
11
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
12
|
+
readonly roles?: RoleSet;
|
|
11
13
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
12
14
|
}
|
|
13
15
|
export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
@@ -247,6 +249,17 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
|
|
|
247
249
|
}>;
|
|
248
250
|
revokeUnadmitted: RevokeUnadmitted<E>;
|
|
249
251
|
routes: import("effect/Layer").Layer<never, never, import("effect/http/HttpRouter").HttpRouter>;
|
|
252
|
+
sessions: {
|
|
253
|
+
roles?: RoleSet;
|
|
254
|
+
provider: import("#server/rpc-server/session.ts").SessionProvider<{
|
|
255
|
+
readonly user: {
|
|
256
|
+
readonly email: string;
|
|
257
|
+
readonly id: string;
|
|
258
|
+
readonly name: string;
|
|
259
|
+
readonly role?: string | null;
|
|
260
|
+
};
|
|
261
|
+
}>;
|
|
262
|
+
};
|
|
250
263
|
}, Config.ConfigError, R | import("effect/Scope").Scope>;
|
|
251
264
|
export declare const authDatabase: (url: Redacted.Redacted<string>, options?: Pick<PoolConfig, "application_name" | "max"> | undefined) => Effect.Effect<Pool, never, import("effect/Scope").Scope>;
|
|
252
265
|
//# sourceMappingURL=mount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAmB,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAsC,MAAM,uCAAuC,CAAC;AAGvH,OAAO,EAAE,KAAK,gBAAgB,EAAoB,MAAM,yCAAyC,CAAC;AAClG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAEtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAEpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAmB,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAsC,MAAM,uCAAuC,CAAC;AAGvH,OAAO,EAAE,KAAK,gBAAgB,EAAoB,MAAM,yCAAyC,CAAC;AAClG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAEtG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mDAAmD,CAAC;AAEpF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAGlE,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IAC3D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD;AAED,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;uBAuD3G,QAAQ,SAAS,YAAY,cAAc,UAAU,CAAC,QAAQ,CAAC,KAAG,UAAU,CAAC,QAAQ,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wDAkC/G,CAAC;AAEH,eAAO,MAAM,YAAY,kKAgCvB,CAAC"}
|
|
@@ -8,6 +8,7 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
|
8
8
|
import { signInGate } from "#server/better-auth/signInGate.ts";
|
|
9
9
|
import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
|
|
10
10
|
import { trustedProxyRanges } from "#server/rpc-server/local.ts";
|
|
11
|
+
import { mountedSessions } from "./mountedSessions.js";
|
|
11
12
|
export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (options, mount = {}) {
|
|
12
13
|
const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
|
|
13
14
|
const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
|
|
@@ -37,14 +38,27 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
37
38
|
trustedProxies,
|
|
38
39
|
},
|
|
39
40
|
},
|
|
40
|
-
"baseURL": options.baseURL
|
|
41
|
+
"baseURL": options.baseURL
|
|
42
|
+
?? Option.getOrElse(origin, () => ({
|
|
43
|
+
allowedHosts: ["127.0.0.1:*"],
|
|
44
|
+
protocol: "http",
|
|
45
|
+
})),
|
|
41
46
|
databaseHooks: gate.active ? gated.databaseHooks : options.databaseHooks,
|
|
42
|
-
rateLimit: {
|
|
47
|
+
rateLimit: {
|
|
48
|
+
...rateLimit,
|
|
49
|
+
...(customStorage === undefined ? {} : { customStorage }),
|
|
50
|
+
enabled: rateLimitEnabled,
|
|
51
|
+
},
|
|
43
52
|
secret,
|
|
44
53
|
trustedOrigins: options.trustedOrigins ?? [Option.getOrElse(origin, () => "http://127.0.0.1:*")],
|
|
45
54
|
user: gate.active ? gated.user : options.user,
|
|
46
55
|
});
|
|
47
|
-
const
|
|
56
|
+
const authRoutes = mountRoutes(auth, {
|
|
57
|
+
bearerSessions: mount.bearerSessions,
|
|
58
|
+
clientIpHeader,
|
|
59
|
+
roles: mount.roles,
|
|
60
|
+
trustedProxy,
|
|
61
|
+
});
|
|
48
62
|
function admittedSessions(getSession) {
|
|
49
63
|
if (!gate.active && mount.bearerSessions === undefined) {
|
|
50
64
|
return getSession;
|
|
@@ -66,17 +80,25 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
66
80
|
}));
|
|
67
81
|
}
|
|
68
82
|
const revoke = Effect.provideContext(revokeUnadmitted(gate, () => auth.$context), context);
|
|
69
|
-
|
|
83
|
+
const lookupSession = Reflect.get(auth.api, "getSession");
|
|
84
|
+
const sessions = mountedSessions((headers) => lookupSession({ asResponse: false, headers, query: { disableCookieCache: true }, returnHeaders: false }), admittedSessions, mount.roles);
|
|
85
|
+
return { admittedSessions, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
70
86
|
});
|
|
71
87
|
export const authDatabase = Effect.fn("Platform.authDatabase")(function* (url, options = {}) {
|
|
72
88
|
const clients = new Set();
|
|
73
89
|
const run = Effect.runForkWith(yield* Effect.context());
|
|
74
90
|
return yield* Effect.acquireRelease(Effect.sync(() => {
|
|
75
|
-
const pool = new Pool({
|
|
91
|
+
const pool = new Pool({
|
|
92
|
+
...options,
|
|
93
|
+
connectionString: Redacted.value(url),
|
|
94
|
+
});
|
|
76
95
|
pool.on("connect", (client) => clients.add(client));
|
|
77
96
|
pool.on("remove", (client) => clients.delete(client));
|
|
78
97
|
pool.on("error", (error) => {
|
|
79
|
-
run(Effect.logDebug({
|
|
98
|
+
run(Effect.logDebug({
|
|
99
|
+
event: "auth_database_idle_client_failed",
|
|
100
|
+
message: error.message,
|
|
101
|
+
}));
|
|
80
102
|
});
|
|
81
103
|
return pool;
|
|
82
104
|
}), (pool) => Effect.promise(async () => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,UAAU,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAoC,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,UAAU,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAoC,MAAM,IAAI,CAAC;AAE5D,OAAO,EAA8B,cAAc,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AACvH,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAyB,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAClG,OAAO,EAAyC,UAAU,EAAE,MAAM,mCAAmC,CAAC;AACtG,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAQvD,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC7E,OAAiB,EACjB,KAAK,GAAiC,EAAE;IAExC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC9F,MAAM,SAAS,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACtE,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAC1D,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IACtG,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAAC,CAAC,CAAC;IACjH,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC;IACzG,MAAM,cAAc,GAAG,kBAAkB,CAAC,YAAY,CAAC,CAAC;IACxD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC;IAC3C,MAAM,GAAG,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,MAAM,GAAG,KAAK,CAAC,MAAM,IAAI,EAAE,CAAC;IAClC,IAAI,MAAM,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC;IACxB,CAAC;IACD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,KAAK,GAAG,mBAAmB,CAAC,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,GAA2B,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACnG,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAC;IACpC,MAAM,aAAa,GAClB,SAAS,EAAE,aAAa,IAAI,CAAC,SAAS,EAAE,OAAO,KAAK,SAAS,IAAI,SAAS,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;IACvI,MAAM,IAAI,GAAG,UAAU,CAAC;QACvB,GAAG,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,cAAc,KAAK,SAAS,CAAC;QAClE,QAAQ,EAAE;YACT,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,KAAK,CAAC,QAAQ,KAAK,QAAQ;YACnF,GAAG,OAAO,CAAC,QAAQ;YACnB,SAAS,EAAE;gBACV,GAAG,OAAO,CAAC,QAAQ,EAAE,SAAS;gBAC9B,gBAAgB,EAAE,cAAc,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;gBACrE,cAAc;aACd;SACD;QACD,SAAS,EACR,OAAO,CAAC,OAAO;eACZ,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;gBAClC,YAAY,EAAE,CAAC,aAAa,CAAC;gBAC7B,QAAQ,EAAE,MAAe;aACzB,CAAC,CAAC;QACJ,aAAa,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa;QACxE,SAAS,EAAE;YACV,GAAG,SAAS;YACZ,GAAG,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,CAAC;YACzD,OAAO,EAAE,gBAAgB;SACzB;QACD,MAAM;QACN,cAAc,EAAE,OAAO,CAAC,cAAc,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,CAAC;QAChG,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI;KAC7C,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,EAAE;QACpC,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,cAAc;QACd,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,YAAY;KACZ,CAAC,CAAC;IACH,SAAS,gBAAgB,CAAgC,UAAgC;QACxF,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,KAAK,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;YACxD,OAAO,UAAU,CAAC;QACnB,CAAC;QACD,OAAO,CAAC,OAAO,EAAE,EAAE,CAClB,GAAG,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACnE,MAAM,QAAQ,GAAG,KAAK,CAAC,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;YACvH,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;YACrE,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBACtC,OAAO,OAAO,CAAC;YAChB,CAAC;YACD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC9D,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;gBACtD,OAAO,OAAO,CAAC;YAChB,CAAC;YACD,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC,kBAAkB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC5F,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,8CAA8C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;YAC7H,OAAO,IAAI,CAAC;QACb,CAAC,CAAC,CACF,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAwB,MAAM,CAAC,cAAc,CACxD,gBAAgB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,EAC3C,OAAO,CACP,CAAC;IACF,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;IAC1D,MAAM,QAAQ,GAAG,eAAe,CAC/B,CAAC,OAAO,EAAE,EAAE,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,kBAAkB,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EACrH,gBAAgB,EAChB,KAAK,CAAC,KAAK,CACX,CAAC;IACF,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,gBAAgB,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC;AAC3F,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,EACvE,GAA8B,EAC9B,OAAO,GAAiD,EAAE;IAE1D,MAAM,OAAO,GAAG,IAAI,GAAG,EAAc,CAAC;IACtC,MAAM,GAAG,GAAG,MAAM,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAS,CAAC,CAAC;IAC/D,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAClC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QAChB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;YACrB,GAAG,OAAO;YACV,gBAAgB,EAAE,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC;SACrC,CAAC,CAAC;QACH,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACpD,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACtD,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE;YAC1B,GAAG,CACF,MAAM,CAAC,QAAQ,CAAC;gBACf,KAAK,EAAE,kCAAkC;gBACzC,OAAO,EAAE,KAAK,CAAC,OAAO;aACtB,CAAC,CACF,CAAC;QACH,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACb,CAAC,CAAC,EACF,CAAC,IAAI,EAAE,EAAE,CACR,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE;QACzB,gEAAgE;QAChE,MAAM,YAAY,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;QAC/G,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC;QACjB,MAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;IACjC,CAAC,CAAC,CACH,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { HttpRouter } from "effect/http";
|
|
2
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
2
3
|
import { type BearerSessionsOptions } from "#server/better-auth/bearerSessions.ts";
|
|
3
4
|
interface MountedAuth {
|
|
4
5
|
readonly $context: Promise<{
|
|
@@ -13,6 +14,7 @@ interface MountedAuth {
|
|
|
13
14
|
interface MountRouteOptions {
|
|
14
15
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
15
16
|
readonly clientIpHeader: string;
|
|
17
|
+
readonly roles?: RoleSet | undefined;
|
|
16
18
|
readonly trustedProxy?: string | undefined;
|
|
17
19
|
}
|
|
18
20
|
export declare function mountRoutes(auth: MountedAuth, options: MountRouteOptions): import("effect/Layer").Layer<never, never, HttpRouter.HttpRouter>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAChF,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,uCAAuC,CAAC;
|
|
1
|
+
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,uCAAuC,CAAC;AAK5I,UAAU,WAAW;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,YAAY,EAAE;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3G,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC1D;AACD,UAAU,iBAAiB;IAC1B,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AAuCD,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,qEAkBxE"}
|
|
@@ -3,6 +3,7 @@ import { HttpRouter, HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
|
3
3
|
import { cookieSessionResponse, hasSessionCookie, sessionHeaders } from "#server/better-auth/bearerSessions.ts";
|
|
4
4
|
import { trustedProxyPeer } from "#server/rpc-server/local.ts";
|
|
5
5
|
import { redact } from "#server/rpc-server/redact.ts";
|
|
6
|
+
import { sessionPermissions } from "./sessionPermissions.js";
|
|
6
7
|
function replacesSession(request, response, native) {
|
|
7
8
|
return (native
|
|
8
9
|
&& response.ok
|
|
@@ -10,7 +11,7 @@ function replacesSession(request, response, native) {
|
|
|
10
11
|
&& request.headers.has("authorization")
|
|
11
12
|
&& new URL(request.url).pathname.startsWith("/api/auth/sign-in/"));
|
|
12
13
|
}
|
|
13
|
-
async function
|
|
14
|
+
async function providerResponse(auth, web, options) {
|
|
14
15
|
if (options.bearerSessions === undefined) {
|
|
15
16
|
return auth.handler(web);
|
|
16
17
|
}
|
|
@@ -29,6 +30,16 @@ async function authResponse(auth, web, options) {
|
|
|
29
30
|
}
|
|
30
31
|
return native ? response : cookieSessionResponse(response);
|
|
31
32
|
}
|
|
33
|
+
async function authResponse(auth, web, options) {
|
|
34
|
+
const sessionRequest = options.roles !== undefined && new URL(web.url).pathname === "/api/auth/get-session";
|
|
35
|
+
const url = new URL(web.url);
|
|
36
|
+
if (sessionRequest) {
|
|
37
|
+
url.searchParams.set("disableCookieCache", "true");
|
|
38
|
+
}
|
|
39
|
+
const request = sessionRequest ? new Request(url, web) : web;
|
|
40
|
+
const response = await providerResponse(auth, request, options);
|
|
41
|
+
return sessionRequest && response.ok && options.roles !== undefined ? sessionPermissions(response, options.roles) : response;
|
|
42
|
+
}
|
|
32
43
|
export function mountRoutes(auth, options) {
|
|
33
44
|
const isTrustedProxy = trustedProxyPeer(options.trustedProxy);
|
|
34
45
|
return HttpRouter.use((router) => router.add("*", "/api/auth/*", (request) => Effect.gen(function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
2
|
+
import { type GetSession } from "#server/rpc-server/adapters/betterAuthSessions.ts";
|
|
3
|
+
import type { SessionShape } from "#server/rpc-server/session.ts";
|
|
4
|
+
export declare function mountedSessions(lookup: (headers: Headers) => Promise<unknown>, admit: <TSession extends SessionShape>(getSession: GetSession<TSession>) => GetSession<TSession>, roles?: RoleSet): {
|
|
5
|
+
roles?: RoleSet;
|
|
6
|
+
provider: import("#server/rpc-server/session.ts").SessionProvider<{
|
|
7
|
+
readonly user: {
|
|
8
|
+
readonly email: string;
|
|
9
|
+
readonly id: string;
|
|
10
|
+
readonly name: string;
|
|
11
|
+
readonly role?: string | null;
|
|
12
|
+
};
|
|
13
|
+
}>;
|
|
14
|
+
};
|
|
15
|
+
//# sourceMappingURL=mountedSessions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mountedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountedSessions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,mDAAmD,CAAC;AACxG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAQlE,wBAAgB,eAAe,CAC9B,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,OAAO,CAAC,EAC9C,KAAK,EAAE,CAAC,QAAQ,SAAS,YAAY,EAAE,UAAU,EAAE,UAAU,CAAC,QAAQ,CAAC,KAAK,UAAU,CAAC,QAAQ,CAAC,EAChG,KAAK,CAAC,EAAE,OAAO;;;;;;;;;;EAMf"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { betterAuthSessions } from "#server/rpc-server/adapters/betterAuthSessions.ts";
|
|
3
|
+
const AuthSession = Schema.NullOr(Schema.Struct({
|
|
4
|
+
user: Schema.Struct({ email: Schema.String, id: Schema.String, name: Schema.String, role: Schema.optionalKey(Schema.NullOr(Schema.String)) }),
|
|
5
|
+
}));
|
|
6
|
+
export function mountedSessions(lookup, admit, roles) {
|
|
7
|
+
return {
|
|
8
|
+
...(roles === undefined ? {} : { roles }),
|
|
9
|
+
provider: betterAuthSessions(admit(async (headers) => Schema.decodeUnknownSync(AuthSession)(await lookup(headers)))),
|
|
10
|
+
};
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=mountedSessions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mountedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,kBAAkB,EAAmB,MAAM,mDAAmD,CAAC;AAGxG,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAChC,MAAM,CAAC,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;CAC7I,CAAC,CACF,CAAC;AAEF,MAAM,UAAU,eAAe,CAC9B,MAA8C,EAC9C,KAAgG,EAChG,KAAe;IAEf,OAAO;QACN,GAAG,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC;QACzC,QAAQ,EAAE,kBAAkB,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,MAAM,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;KACpH,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sessionPermissions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionPermissions.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAM5D,wBAAsB,kBAAkB,CAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAU9F"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import { resolveRole } from "#server/rpc-server/resolveRole.ts";
|
|
3
|
+
const Fields = Schema.Record(Schema.String, Schema.Unknown);
|
|
4
|
+
const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user: Fields }), [Fields]));
|
|
5
|
+
export async function sessionPermissions(response, roles) {
|
|
6
|
+
const payload = Schema.decodeUnknownSync(SessionPayload)(await response.json());
|
|
7
|
+
if (payload === null) {
|
|
8
|
+
return Response.json(null, response);
|
|
9
|
+
}
|
|
10
|
+
const access = await Effect.runPromise(resolveRole(roles, payload.user.role));
|
|
11
|
+
const headers = new Headers(response.headers);
|
|
12
|
+
headers.delete("content-length");
|
|
13
|
+
headers.set("cache-control", "private, no-store");
|
|
14
|
+
return Response.json({ ...payload, user: { ...payload.user, ...access } }, { headers, status: response.status });
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=sessionPermissions.js.map
|